automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复更新器无法下载MAA的异常

Browse Source
This commit is contained in:
DLmaster
2025-04-13 16:46:54 +08:00
parent 4da4b7d552
commit 7e502420fa
8 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/config.py
View File

@@ -599,7 +599,7 @@ class MaaUserConfig(QConfig):
class AppConfig(GlobalConfig):
VERSION = "4.3.2.0"
VERSION = "4.3.3.0"
gameid_refreshed = Signal()
PASSWORD_refreshed = Signal()

1
app/ui/main_window.py
View File

@@ -241,7 +241,6 @@ class AUTO_MAA(MSFluentWindow):
# 清理临时更新器
if (Config.app_path / "AUTO_Updater.active.exe").exists():
try:
System.kill_process(Config.app_path / "AUTO_Updater.active.exe")
(Config.app_path / "AUTO_Updater.active.exe").unlink()
except Exception:
pass

7
app/ui/member_manager.py
View File

@@ -340,7 +340,7 @@ class MemberManager(QWidget):
for _ in range(3):
try:
response = requests.get(
"https://mirrorchyan.com/api/resources/MAA/latest?user_agent=MaaWpfGui&os=win&arch=x64&channel=stable"
"https://mirrorchyan.com/api/resources/MAA/latest?user_agent=AutoMaaGui&os=win&arch=x64&channel=stable"
)
maa_info = response.json()
break
@@ -372,7 +372,10 @@ class MemberManager(QWidget):
Path(folder),
"MAA",
maa_version,
{"thread_numb": Config.get(Config.update_ThreadNumb)},
{
"mode": "Proxy",
"thread_numb": Config.get(Config.update_ThreadNumb),
},
)
self.downloader.show()
self.downloader.run()

5
app/ui/setting.py
View File

@@ -271,7 +271,7 @@ class Setting(QWidget):
for _ in range(3):
try:
response = requests.get(
f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?current_version={version_text(current_version)}&cdk={Crypto.win_decryptor(Config.get(Config.update_MirrorChyanCDK))}&channel={Config.get(Config.update_UpdateType)}"
f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?user_agent=AutoMaaGui&current_version={version_text(current_version)}&cdk={Crypto.win_decryptor(Config.get(Config.update_MirrorChyanCDK))}&channel={Config.get(Config.update_UpdateType)}"
)
version_info: Dict[str, Union[int, str, Dict[str, str]]] = (
response.json()
@@ -404,8 +404,7 @@ class Setting(QWidget):
shell=True,
creationflags=subprocess.CREATE_NO_WINDOW,
)
self.close()
QApplication.quit()
self.window().close()
# 无版本更新
else:

8
app/utils/downloader.py
View File

@@ -507,16 +507,16 @@ class DownloadManager(QDialog):
self.zip_loop.exec()
self.update_info("正在删除已弃用的文件")
if (app_path / "changes.json").exists():
if (self.app_path / "changes.json").exists():
with (app_path / "changes.json").open(mode="r", encoding="utf-8") as f:
with (self.app_path / "changes.json").open(mode="r", encoding="utf-8") as f:
info: Dict[str, List[str]] = json.load(f)
if "deleted" in info:
for file_path in info:
(self.app_path / file_path).unlink()
(app_path / "changes.json").unlink()
(self.app_path / "changes.json").unlink()
self.update_info("正在删除临时文件")
self.update_progress(0, 0, 0)
@@ -661,7 +661,7 @@ if __name__ == "__main__":
for _ in range(3):
try:
response = requests.get(
f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?current_version={version_text(current_version)}&cdk={mirrorchyan_CDK}&channel={update_type}"
f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?user_agent=AutoMaaDownloader&current_version={version_text(current_version)}&cdk={mirrorchyan_CDK}&channel={update_type}"
)
version_info: Dict[str, Union[int, str, Dict[str, str]]] = response.json()
break