sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 06:18:21 +08:00
Code Activity

Merge pull request #1258 from hgjazhgj/dev

Browse Source 
Fix: Misspelling & Line-end spaces
This commit is contained in:
LmeSzinc
2022-06-25 21:13:24 +08:00
committed by GitHub
parent 079a3a8c61 e779fd7e64
commit 5adb54b929
37 changed files with 79 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/webui/app.py
View File

@@ -373,7 +373,7 @@ class AlasGUI(Frame):
self.task_handler.add(switch_scheduler.g(), 1, True)
self.task_handler.add(switch_log_scroll.g(), 1, True)
self.task_handler.add(self.alas_update_overiew_task, 10, True)
self.task_handler.add(self.alas_update_overview_task, 10, True)
self.task_handler.add(log.put_log(self.alas), 0.25, True)
def _alas_thread_wait_config_change(self) -> None:
@@ -457,7 +457,7 @@ class AlasGUI(Frame):
invalid.clear()
break
def alas_update_overiew_task(self) -> None:
def alas_update_overview_task(self) -> None:
if not self.visible:
return
self.alas_config.load()
@@ -628,10 +628,10 @@ class AlasGUI(Frame):
# ).style(f'--menu-Raise--')
def _force_restart():
if State.researt_event is not None:
if State.restart_event is not None:
toast("Alas will restart in 3 seconds", duration=0, color="error")
clearup()
State.researt_event.set()
State.restart_event.set()
else:
toast("Reload not enabled", color="error")
@@ -651,7 +651,7 @@ class AlasGUI(Frame):
self.init_menu(name="Update")
self.set_title(t("Gui.MenuDevelop.Update"))
if State.researt_event is None:
if State.restart_event is None:
put_warning(t("Gui.Update.DisabledWarn"))
put_row(
@@ -995,7 +995,7 @@ class AlasGUI(Frame):
status={
True: [
lambda: self.__setattr__("visible", True),
lambda: self.alas_update_overiew_task()
lambda: self.alas_update_overview_task()
if self.page == "Overview"
else 0,
lambda: self.task_handler._task.__setattr__("delay", 15),

2
module/webui/setting.py
View File

@@ -16,7 +16,7 @@ class State:
deploy_config = DeployConfig()
config_updater = ConfigUpdater()
researt_event: threading.Event = None
restart_event: threading.Event = None
manager: SyncManager = None
electron: bool = False
theme: str = "default"

2
module/webui/translate.py
View File

@@ -34,7 +34,7 @@ def translate():
"en-US": {},
"ja-JP": {},
}
list_path = [] # Menu.Task.name
list_group = [] # Menu
list_arg = [] # Task

10
module/webui/updater.py
View File

@@ -90,7 +90,7 @@ class Updater(DeployConfig, GitManager, PipManager):
sha1, _, _, message = self.get_commit(f"..{source}/{self.Branch}")
if sha1:
logger.info(f"New update avaliable")
logger.info(f"New update available")
logger.info(f"{sha1[:8]} - {message}")
return True
else:
@@ -164,7 +164,7 @@ class Updater(DeployConfig, GitManager, PipManager):
)
return 0
logger.info(f"Update {sha[:8]} avaliable")
logger.info(f"Update {sha[:8]} available")
return 1
def check_update(self):
@@ -228,7 +228,7 @@ class Updater(DeployConfig, GitManager, PipManager):
logger.info("All alas stopped, start updating")
if self.update():
if State.researt_event is not None:
if State.restart_event is not None:
self.state = "reload"
with open("./config/reloadalas", mode="w") as f:
f.writelines(names)
@@ -251,7 +251,7 @@ class Updater(DeployConfig, GitManager, PipManager):
# with open("./config/reloadflag", mode="w"):
# # app ended here and uvicorn will restart whole app
# pass
State.researt_event.set()
State.restart_event.set()
timer = threading.Timer(delay, trigger)
timer.start()
@@ -270,7 +270,7 @@ class Updater(DeployConfig, GitManager, PipManager):
th._task.delay = get_next_time(self.schedule_time)
yield
continue
if State.researt_event is None:
if State.restart_event is None:
yield
continue
if not self.run_update():