From f8404edd9e9c45b688f854065fdae0b6a624c291 Mon Sep 17 00:00:00 2001 From: YoursFunny Date: Tue, 21 Nov 2023 23:15:06 +0800 Subject: [PATCH] fix: set repo of build-in update --- deploy/Windows/config.py | 9 ++++++--- module/webui/updater.py | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/deploy/Windows/config.py b/deploy/Windows/config.py index 78d4bf6..8ab28c2 100644 --- a/deploy/Windows/config.py +++ b/deploy/Windows/config.py @@ -77,6 +77,12 @@ class DeployConfig(ConfigModel): self.config_template = {} self.read() + self.set_repo() + + self.write() + self.show_config() + + def set_repo(self): # Bypass webui.config.DeployConfig.__setattr__() # Don't write these into deploy.yaml if self.Repository == 'cn': @@ -84,9 +90,6 @@ class DeployConfig(ConfigModel): if self.Repository == 'global': super().__setattr__('Repository', 'https://github.com/TheFunny/ArisuAutoSweeper') - self.write() - self.show_config() - def show_config(self): logger.hr("Show deploy config", 1) for k, v in self.config.items(): diff --git a/module/webui/updater.py b/module/webui/updater.py index a580703..16e434c 100644 --- a/module/webui/updater.py +++ b/module/webui/updater.py @@ -5,6 +5,7 @@ import time from typing import Generator, List, Tuple import requests + from deploy.Windows.config import ExecutionError from deploy.Windows.git import GitManager from deploy.Windows.pip import PipManager @@ -20,6 +21,7 @@ from module.webui.utils import TaskHandler, get_next_time class Updater(DeployConfig, GitManager, PipManager): def __init__(self, file=DEPLOY_CONFIG): super().__init__(file=file) + self.set_repo() self.state = 0 self.event: threading.Event = None