Merge branch 'updater' into develop
This commit is contained in:
6
model.py
6
model.py
@@ -1,6 +1,4 @@
|
|||||||
import gc
|
import gc
|
||||||
import tempfile
|
|
||||||
from zipfile import ZipFile
|
|
||||||
from subprocess import Popen
|
from subprocess import Popen
|
||||||
from os import makedirs as os_makedirs
|
from os import makedirs as os_makedirs
|
||||||
from os import path as os_path
|
from os import path as os_path
|
||||||
@@ -11,9 +9,7 @@ from time import sleep
|
|||||||
from queue import Queue
|
from queue import Queue
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
from requests import get as requests_get
|
from requests import get as requests_get
|
||||||
import webbrowser
|
|
||||||
|
|
||||||
from typing import Callable
|
|
||||||
from flashtext import KeywordProcessor
|
from flashtext import KeywordProcessor
|
||||||
from models.translation.translation_translator import Translator
|
from models.translation.translation_translator import Translator
|
||||||
from models.transcription.transcription_utils import getInputDevices, getOutputDevices
|
from models.transcription.transcription_utils import getInputDevices, getOutputDevices
|
||||||
@@ -335,6 +331,8 @@ class Model:
|
|||||||
traceback.print_exc(file=f)
|
traceback.print_exc(file=f)
|
||||||
# run updater
|
# run updater
|
||||||
Popen(program_name, cwd=current_directory)
|
Popen(program_name, cwd=current_directory)
|
||||||
|
while True:
|
||||||
|
sleep(1)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def reStartSoftware():
|
def reStartSoftware():
|
||||||
|
|||||||
5
view.py
5
view.py
@@ -1784,10 +1784,11 @@ class View():
|
|||||||
|
|
||||||
self._hideConfirmationModal()
|
self._hideConfirmationModal()
|
||||||
vrct_gui.withdraw()
|
vrct_gui.withdraw()
|
||||||
vrct_gui.updating_window.showUpdatingWindow()
|
# vrct_gui.updating_window.showUpdatingWindow()
|
||||||
|
|
||||||
def func(**kwargs):
|
def func(**kwargs):
|
||||||
vrct_gui.updating_window.updateDownloadProgress(**kwargs)
|
pass
|
||||||
|
# vrct_gui.updating_window.updateDownloadProgress(**kwargs)
|
||||||
callFunctionIfCallable(self.view_variable.CALLBACK_UPDATE_SOFTWARE, func)
|
callFunctionIfCallable(self.view_variable.CALLBACK_UPDATE_SOFTWARE, func)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user