every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix_AutoUpdate' into UI_2.0

Browse Source
This commit is contained in:
misyaguziya
2023-10-13 07:04:21 +09:00
parent bdb9023f89 94c3b72a52
commit 5678fec290
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
model.py
View File

@@ -1,8 +1,8 @@
import sys import sys
from zipfile import ZipFile from zipfile import ZipFile
from subprocess import Popen from subprocess import Popen
from os import makedirs from os import makedirs as os_makedirs
from os import path as os_path, rename as os_rename, mkdir as os_mkdir from os import path as os_path, rename as os_rename
from shutil import rmtree from shutil import rmtree
from datetime import datetime from datetime import datetime
from logging import getLogger, FileHandler, Formatter, INFO from logging import getLogger, FileHandler, Formatter, INFO
@@ -10,6 +10,7 @@ from time import sleep
from queue import Queue from queue import Queue
from threading import Thread, Event from threading import Thread, Event
from requests import get as requests_get from requests import get as requests_get
import webbrowser
from flashtext import KeywordProcessor from flashtext import KeywordProcessor
from models.translation.translation_translator import Translator from models.translation.translation_translator import Translator
@@ -97,7 +98,7 @@ class Model:
return result return result
def startLogger(self): def startLogger(self):
makedirs(os_path.join(os_path.dirname(sys.argv[0]), "logs"), exist_ok=True) os_makedirs(os_path.join(os_path.dirname(sys.argv[0]), "logs"), exist_ok=True)
logger = getLogger() logger = getLogger()
logger.setLevel(INFO) logger.setLevel(INFO)
file_name = os_path.join(os_path.dirname(sys.argv[0]), "logs", f"{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}.log") file_name = os_path.join(os_path.dirname(sys.argv[0]), "logs", f"{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}.log")
@@ -245,19 +246,22 @@ class Model:
current_directory = os_path.dirname(sys.argv[0]) current_directory = os_path.dirname(sys.argv[0])
program_directory = os_path.dirname(__file__) program_directory = os_path.dirname(__file__)
os_mkdir(os_path.join(current_directory, tmp_directory_name)) try:
res = requests_get(config.GITHUB_URL) res = requests_get(config.GITHUB_URL)
url = res.json()['assets'][0]['browser_download_url'] url = res.json()['assets'][0]['browser_download_url']
res = requests_get(url, stream=True) res = requests_get(url, stream=True)
with open(os_path.join(current_directory, tmp_directory_name, filename), 'wb') as file: os_makedirs(os_path.join(current_directory, tmp_directory_name), exist_ok=True)
for chunk in res.iter_content(chunk_size=1024): with open(os_path.join(current_directory, tmp_directory_name, filename), 'wb') as file:
file.write(chunk) for chunk in res.iter_content(chunk_size=1024):
with ZipFile(os_path.join(current_directory, tmp_directory_name, filename)) as zf: file.write(chunk)
zf.extract(program_name, os_path.join(current_directory, tmp_directory_name)) with ZipFile(os_path.join(current_directory, tmp_directory_name, filename)) as zf:
os_rename(os_path.join(current_directory, tmp_directory_name, program_name), os_path.join(current_directory, temporary_name)) zf.extract(program_name, os_path.join(current_directory, tmp_directory_name))
rmtree(os_path.join(current_directory, tmp_directory_name)) os_rename(os_path.join(current_directory, tmp_directory_name, program_name), os_path.join(current_directory, temporary_name))
command = [os_path.join(program_directory, "batch", batch_name), program_name, temporary_name, str(restart)] rmtree(os_path.join(current_directory, tmp_directory_name))
Popen(command) command = [os_path.join(program_directory, "batch", batch_name), program_name, temporary_name, str(restart)]
Popen(command)
except:
webbrowser.open(config.BOOTH_URL, new=2, autoraise=True)
@staticmethod @staticmethod
def reStartSoftware(): def reStartSoftware():