version: Update to 1.3.2

feat:优化代码&更清晰的图标

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: ['https://afdian.com/a/ikun0014']

.github/workflows/release.yml

@@ -14,18 +14,16 @@ jobs:
     - name: Check out git repository
       uses: actions/checkout@v4
 
-    # Push tag to GitHub if package.json version's tag is not tagged
     - name: Get package version
       shell: powershell
       run: |
         $version = (Get-Content package.json | ConvertFrom-Json).version
         echo "PACKAGE_VERSION=$version" >> $env:GITHUB_ENV
   
-
-    - name: Set up Python 3.11
+    - name: Set up Python 3.12
       uses: actions/setup-python@v3
       with:
-        python-version: 3.11.9
+        python-version: 3.12
 
     - name: Install dependencies
       run: |
@@ -62,28 +60,26 @@ jobs:
         git_commit_sha: ${{ github.sha }}
         git_tag_prefix: "v"
 
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: Onekey_v${{ env.PACKAGE_VERSION }}.exe
+        path: build/Onekey_v${{ env.PACKAGE_VERSION }}.exe
+
     - name: Release
       uses: softprops/action-gh-release@v2
       with:
-        prerelease: false
-        draft: false
         tag_name: v${{ env.PACKAGE_VERSION }}
-        files: |
-          build/Onekey---v${{ env.PACKAGE_VERSION }}.exe
+        files: build/Onekey---v${{ env.PACKAGE_VERSION }}.exe
+        prerelease: false
+        draft: true
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      
+
     - name: Upload to Telegram Channel
-      uses: appleboy/telegram-action@master
-      with:
-        to: ${{ secrets.TELEGRAM_TO }}
-        token: ${{ secrets.TELEGRAM_TOKEN }}
-        message: |
-          ${{ github.actor }} created commit:
-          Commit message: ${{ github.event.commits[0].message }}
-        
-          Repository: ${{ github.repository }}
-        
-          See changes: https://github.com/${{ github.repository }}/commit/${{github.sha}}
-        document: |
-          build/Onekey---v${{ env.PACKAGE_VERSION }}.exe
+      run: |
+        & curl -F "chat_id=${{ secrets.TELEGRAM_TO }}" `
+            -F "document=@build/Onekey---v${{ env.PACKAGE_VERSION }}.exe" `
+            -F "caption=Onekey's New Update ${{ env.PACKAGE_VERSION }}" `
+            -F "parse_mode=Markdown" `
+            "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendDocument"

.gitignore

@@ -170,3 +170,5 @@ config.json
 *.exe
 *.dll
 /main.dist
+/.vscode
+/.vs

.idea/.gitignore

@@ -0,0 +1,3 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml

.idea/Onekey.iml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

README.md

@@ -11,10 +11,11 @@
 
 
 ## Onekey
- Onekey Steam Depot Manifest Downloader
+Onekey Steam Depot Manifest Downloader
 
 ## 使用方法
- 先去Release下最新发布，然后去steamtools官网下steamtools，日志会有点石介意别用
+去Releases处下载最新的发布，并且安装好SteamTools或者GreenLuma  
+然后打开Onekey输入App ID即可使用
 
 ## 开发
 本程序使用Python编程语言开发   
@@ -66,6 +67,4 @@ pip install -r requirements.txt
 ## 社区和支持
 加入我们的社区，参与讨论和支持：
 - [GitHub Discussions](https://github.com/ikunshare/Onekey/discussions)
-- [Gitter Chat](https://gitter.im/ikunshare/Onekey)
-- [QQ](https://qm.qq.com/q/d7sWovfAGI)
-- [Telegram](https://t.me/ikunshare_group)
+- [Telegram](https://t.me/ikunshare_qun)

common/check.py

@@ -1,30 +1,37 @@
 import time
 import ujson as json
-from aiohttp import ClientError
+from aiohttp import ClientError, ConnectionTimeoutError
 from .log import log
 from .stack_error import stack_error
 
+
 async def check_github_api_rate_limit(headers, session):
     url = 'https://api.github.com/rate_limit'
-    
+
     try:
         async with session.get(url, headers=headers, ssl=False) as r:
-            r_json = await r.json()
+            r_json = json.loads(await r.read())
 
             if r.status == 200:
                 rate_limit = r_json.get('rate', {})
                 remaining_requests = rate_limit.get('remaining', 0)
                 reset_time = rate_limit.get('reset', 0)
-                reset_time_formatted = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(reset_time))
-                
-                log.info(f' 🔄 剩余请求次数: {remaining_requests}')
+                reset_time_formatted = time.strftime(
+                    '%Y-%m-%d %H:%M:%S', time.localtime(reset_time))
+
+                log.info(f'剩余请求次数: {remaining_requests}')
 
                 if remaining_requests == 0:
-                    log.warning(f'⚠ GitHub API 请求数已用尽，将在 {reset_time_formatted} 重置，建议生成一个填在配置文件里')
+                    log.warning(f'GitHub API 请求数已用尽, 将在 {
+                                reset_time_formatted} 重置,建议生成一个填在配置文件里')
             else:
-                log.error('⚠ Github请求数检查失败，网络错误')
-    
+                log.error('Github请求数检查失败, 网络错误')
+
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except ClientError as e:
-        log.error(f'⚠ 检查Github API 请求数失败，{stack_error(e)}')
+        log.error(f'检查Github API 请求数失败,{stack_error(e)}')
+    except ConnectionTimeoutError as e:
+        log.error(f'检查Github API 请求数超时: {stack_error(e)}')
     except Exception as e:
-        log.error(f'⚠ 发生错误: {stack_error(e)}')
+        log.error(f'发生错误: {stack_error(e)}')

common/checkcn.py

@@ -0,0 +1,28 @@
+import os
+import aiohttp
+import ujson as json
+from .log import log
+from .stack_error import stack_error
+
+
+async def checkcn(client) -> bool:
+    try:
+        req = await client.get('https://mips.kugou.com/check/iscn?&format=json')
+        body = json.loads(await req.read())
+        scn = bool(body['flag'])
+        if not scn:
+            log.info(
+                f"您在非中国大陆地区({body['country']})上使用了项目, 已自动切换回Github官方下载CDN")
+            os.environ['IS_CN'] = 'no'
+            return False
+        else:
+            os.environ['IS_CN'] = 'yes'
+            return True
+
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
+    except aiohttp.ClientError as e:
+        os.environ['IS_CN'] = 'yes'
+        log.warning('检查服务器位置失败，已忽略，自动认为你在中国大陆')
+        log.warning(stack_error(e))
+        return False

common/config.py

@@ -13,22 +13,18 @@ DEFAULT_CONFIG = {
     "教程": "https://ikunshare.com/Onekey_tutorial"
 }
 
-def validate_config(config):
-    # 检查配置文件的有效性
-    required_keys = DEFAULT_CONFIG.keys()
-    for key in required_keys:
-        if key not in config:
-            return False
-    return True
 
 async def gen_config_file():
     try:
         async with aiofiles.open("./config.json", mode="w", encoding="utf-8") as f:
             await f.write(json.dumps(DEFAULT_CONFIG, indent=2, ensure_ascii=False, escape_forward_slashes=False))
-        
-        log.info('🖱️ 程序可能为第一次启动或配置重置，请填写配置文件后重新启动程序')
+
+        log.info('🖱️ 程序可能为第一次启动或配置重置,请填写配置文件后重新启动程序')
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except Exception as e:
-        log.error(f'❌ 配置文件生成失败，{stack_error(e)}')
+        log.error(f'配置文件生成失败,{stack_error(e)}')
+
 
 async def load_config():
     if not os.path.exists('./config.json'):
@@ -39,16 +35,11 @@ async def load_config():
     try:
         async with aiofiles.open("./config.json", mode="r", encoding="utf-8") as f:
             config = json.loads(await f.read())
-
-            if not validate_config(config):
-                log.error("配置文件格式无效，正在重置为默认配置...")
-                await gen_config_file()
-                os.system('pause')
-                sys.exit()
-
             return config
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except Exception as e:
-        log.error(f"配置文件加载失败，原因: {stack_error(e)}")
+        log.error(f"配置文件加载失败，原因: {stack_error(e)},重置配置文件中...")
         os.remove("./config.json")
         await gen_config_file()
         os.system('pause')

common/dkey_merge.py

@@ -6,35 +6,39 @@ from .log import log
 
 lock = asyncio.Lock()
 
+
 async def depotkey_merge(config_path: Path, depots_config: dict) -> bool:
     if not config_path.exists():
         async with lock:
-            log.error('👋 Steam默认配置不存在，可能是没有登录账号')
+            log.error('Steam默认配置不存在, 可能是没有登录账号')
         return False
 
     try:
         async with aiofiles.open(config_path, encoding='utf-8') as f:
             content = await f.read()
-        
+
         config = vdf.loads(content)
         steam = config.get('InstallConfigStore', {}).get('Software', {}).get('Valve') or \
-                config.get('InstallConfigStore', {}).get('Software', {}).get('valve')
+            config.get('InstallConfigStore', {}).get(
+                'Software', {}).get('valve')
 
         if steam is None:
-            log.error('⚠ 找不到Steam配置，请检查配置文件')
+            log.error('找不到Steam配置, 请检查配置文件')
             return False
-        
+
         depots = steam.setdefault('depots', {})
         depots.update(depots_config.get('depots', {}))
-        
+
         async with aiofiles.open(config_path, mode='w', encoding='utf-8') as f:
             new_context = vdf.dumps(config, pretty=True)
             await f.write(new_context)
 
-        log.info('✅ 成功合并')
+        log.info('成功合并')
         return True
-        
+
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except Exception as e:
         async with lock:
-            log.error(f'❌ 合并失败，原因: {e}')
+            log.error(f'合并失败, 原因: {e}')
         return False

common/dl.py

@@ -0,0 +1,54 @@
+import os
+from aiohttp import ClientError, ConnectionTimeoutError
+from rich.progress import Progress, BarColumn, TextColumn, TimeElapsedColumn
+from .log import log
+
+async def get(sha: str, path: str, repo: str, session, chunk_size: int = 1024) -> bytearray:
+    if os.environ.get('IS_CN') == 'yes':
+        url_list = [
+            f'https://jsdelivr.pai233.top/gh/{repo}@{sha}/{path}',
+            f'https://cdn.jsdmirror.com/gh/{repo}@{sha}/{path}',
+            f'https://raw.gitmirror.com/{repo}/{sha}/{path}',
+            f'https://raw.dgithub.xyz/{repo}/{sha}/{path}',
+            f'https://gh.akass.cn/{repo}/{sha}/{path}'
+        ]
+    else:
+        url_list = [
+            f'https://raw.githubusercontent.com/{repo}/{sha}/{path}'
+        ]
+    retry = 3
+    while retry > 0:
+        for url in url_list:
+            try:
+                async with session.get(url, ssl=False) as response:
+                    if response.status == 200:
+                        total_size = int(response.headers.get('Content-Length', 0))
+                        content = bytearray()
+
+                        with Progress(
+                            TextColumn("[progress.description]{task.description}", style="#66CCFF"),
+                            BarColumn(style="#66CCFF", complete_style="#4CE49F", finished_style="#2FE9D9"),
+                            TextColumn("[progress.percentage]{task.percentage:>3.0f}%", style="#66CCFF"),
+                            TimeElapsedColumn(),
+                        ) as progress:
+                            task = progress.add_task(f"下载{path}中...", total=total_size)
+
+                            async for chunk in response.content.iter_chunked(chunk_size):
+                                content.extend(chunk)
+                                progress.update(task, advance=len(chunk))
+
+                        return content
+                    else:
+                        log.error(f'获取失败: {path} - 状态码: {response.status}')
+            except KeyboardInterrupt:
+                log.info("\n 程序已退出")
+            except ClientError as e:
+                log.error(f'获取失败: {path} - 连接错误: {str(e)}')
+            except ConnectionTimeoutError as e:
+                log.error(f'连接超时: {url} - 错误: {str(e)}')
+
+        retry -= 1
+        log.warning(f'重试剩余次数: {retry} - {path}')
+
+    log.error(f'超过最大重试次数: {path}')
+    raise Exception(f'无法下载: {path}')

common/get_manifest_info.py

@@ -3,32 +3,32 @@ import aiofiles
 import vdf
 
 from .log import log
-from .manifest_down import get
+from .dl import get
 from .stack_error import stack_error
 
 
 async def get_manifest(sha: str, path: str, steam_path: Path, repo: str, session) -> list:
     collected_depots = []
     depot_cache_path = steam_path / 'depotcache'
-    
+
     try:
         depot_cache_path.mkdir(exist_ok=True)
 
         if path.endswith('.manifest'):
             save_path = depot_cache_path / path
             if save_path.exists():
-                log.warning(f'👋 已存在清单: {save_path}')
+                log.warning(f'已存在清单: {save_path}')
                 return collected_depots
 
             content = await get(sha, path, repo, session)
-            log.info(f'🔄 清单下载成功: {path}')
+            log.info(f'清单下载成功: {path}')
 
             async with aiofiles.open(save_path, 'wb') as f:
                 await f.write(content)
 
         elif path == 'Key.vdf':
             content = await get(sha, path, repo, session)
-            log.info(f'🔄 密钥下载成功: {path}')
+            log.info(f'密钥下载成功: {path}')
 
             depots_config = vdf.loads(content.decode('utf-8'))
             collected_depots = [
@@ -36,8 +36,10 @@ async def get_manifest(sha: str, path: str, steam_path: Path, repo: str, session
                 for depot_id, depot_info in depots_config['depots'].items()
             ]
 
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except Exception as e:
-        log.error(f'❌ 处理失败: {path} - {stack_error(e)}')
+        log.error(f'处理失败: {path} - {stack_error(e)}')
         raise
 
     return collected_depots

common/get_steam_path.py

@@ -5,16 +5,20 @@ from .log import log
 from .config import config
 from .stack_error import stack_error
 
+
 def get_steam_path() -> Path:
     try:
         key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r'Software\Valve\Steam')
         steam_path = Path(winreg.QueryValueEx(key, 'SteamPath')[0])
-        
+
         custom_steam_path = config.get("Custom_Steam_Path", "").strip()
         return Path(custom_steam_path) if custom_steam_path else steam_path
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except Exception as e:
-        log.error(f'❌ Steam路径获取失败, {stack_error(e)}, 请检查是否正确安装Steam')
+        log.error(f'Steam路径获取失败, {stack_error(e)}, 请检查是否正确安装Steam')
         os.system('pause')
         return Path()
 
+
 steam_path = get_steam_path()

common/gl_unlock.py

@@ -1,32 +0,0 @@
-from .get_steam_path import steam_path
-from pathlib import Path
-
-async def greenluma_add(depot_id_list: list) -> bool:
-    app_list_path = steam_path / 'AppList'
-
-    try:
-        app_list_path.mkdir(parents=True, exist_ok=True)
-
-        for file in app_list_path.glob('*.txt'):
-            file.unlink(missing_ok=True)
-
-        depot_dict = {
-            int(i.stem): int(i.read_text(encoding='utf-8').strip())
-            for i in app_list_path.iterdir() if i.is_file() and i.stem.isdecimal() and i.suffix == '.txt'
-        }
-
-        for depot_id in map(int, depot_id_list):
-            if depot_id not in depot_dict.values():
-                index = max(depot_dict.keys(), default=-1) + 1
-                while index in depot_dict:
-                    index += 1
-
-                (app_list_path / f'{index}.txt').write_text(str(depot_id), encoding='utf-8')
-
-                depot_dict[index] = depot_id
-
-        return True
-
-    except Exception as e:
-        print(f'❌ 处理时出错: {e}')
-        return False

common/init_text.py

@@ -1,24 +1,21 @@
-from colorama import Fore, Back, Style, init
-
-init()
-
 from .log import log
 
 def init():
     banner_lines = [
-        f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT}  _____   __   _   _____   _   _    _____  __    __ {Style.RESET_ALL}",
-        f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} /  _  \\ |  \\ | | | ____| | | / /  | ____| \\ \\  / /{Style.RESET_ALL}",
-        f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} | | | | |   \\| | | |__   | |/ /   | |__    \\ \\/ /{Style.RESET_ALL}",
-        f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} | | | | | |\\   | |  __|  | |\\ \\   |  __|    \\  / {Style.RESET_ALL}",
-        f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} | |_| | | | \\  | | |___  | | \\ \\  | |___    / /{Style.RESET_ALL}",
-        f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} \\_____/ |_|  \\_| |_____| |_|  \\_\\ |_____|  /_/{Style.RESET_ALL}",
+        f"  _____   __   _   _____   _   _    _____  __    __ ",
+        f" /  _  \\ |  \\ | | | ____| | | / /  | ____| \\ \\  / /",
+        f" | | | | |   \\| | | |__   | |/ /   | |__    \\ \\/ /",
+        f" | | | | | |\\   | |  __|  | |\\ \\   |  __|    \\  / ",
+        f" | |_| | | | \\  | | |___  | | \\ \\  | |___    / /",
+        f" \\_____/ |_|  \\_| |_____| |_|  \\_\\ |_____|  /_/",
     ]
     for line in banner_lines:
-        print(line)
-    
-    log.info('作者：ikun0014')
-    log.info('本项目采用GNU General Public License v3开源许可证')
-    log.info('版本：1.2.5')
-    log.info('项目仓库：https://github.com/ikunshare/Onekey')
-    log.info('官网：ikunshare.com')
-    log.warning('本项目完全开源免费，如果你在淘宝，QQ群内通过购买方式获得，赶紧回去骂商家死全家\n交流群组：\nhttps://qm.qq.com/q/d7sWovfAGI\nhttps://t.me/ikunshare_qun')
+        log.info(line)
+
+    log.info(f'作者: ikun0014')
+    log.warning(f'本项目采用GNU General Public License v3开源许可证，请勿用于商业用途')
+    log.info(f'版本: 1.3.2')
+    log.info(f'项目Github仓库: https://github.com/ikunshare/Onekey')
+    log.info(f'官网: ikunshare.com')
+    log.warning(
+        f'本项目完全开源免费, 如果你在淘宝, QQ群内通过购买方式获得, 赶紧回去骂商家死全家\n   交流群组:\n    https://t.me/ikunshare_qun')

common/log.py

@@ -1,7 +1,7 @@
 import logging
 import colorlog
 
-LOG_FORMAT = '%(log_color)s[%(name)s][%(levelname)s]%(message)s'
+LOG_FORMAT = '%(log_color)s%(message)s'
 LOG_COLORS = {
     'INFO': 'cyan',
     'WARNING': 'yellow',
@@ -9,6 +9,7 @@ LOG_COLORS = {
     'CRITICAL': 'purple',
 }
 
+
 def init_log(level=logging.DEBUG) -> logging.Logger:
     logger = logging.getLogger('Onekey')
     logger.setLevel(level)

common/main_func.py

@@ -1,29 +1,38 @@
 import os
-from aiohttp import ClientSession
+from typing import Any
 
+from aiohttp import ClientSession, ConnectionTimeoutError
+from common.checkcn import checkcn
 from common.config import config
 from common.dkey_merge import depotkey_merge
 from common.migration import migrate
-from common.st_unlock import stool_add
-from common.gl_unlock import greenluma_add
+from common.unlock import stool_add, greenluma_add
 from common.get_manifest_info import get_manifest
 from common.check import check_github_api_rate_limit
 from common.log import log
 from common.get_steam_path import steam_path
 from common.stack_error import stack_error
 
-isGreenLuma = any((steam_path / dll).exists() for dll in ['GreenLuma_2024_x86.dll', 'GreenLuma_2024_x64.dll', 'User32.dll'])
+isGreenLuma = any((steam_path / dll).exists()
+                  for dll in ['GreenLuma_2024_x86.dll', 'GreenLuma_2024_x64.dll', 'User32.dll'])
 isSteamTools = (steam_path / 'config' / 'stUI').is_dir()
 
-async def fetch_branch_info(session, url, headers):
+
+async def fetch_branch_info(session, url, headers) -> str | None:
     try:
         async with session.get(url, headers=headers, ssl=False) as response:
             return await response.json()
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except Exception as e:
-        log.error(f'⚠ 获取信息失败: {stack_error(e)}')
+        log.error(f'获取信息失败: {stack_error(e)}')
+        return None
+    except ConnectionTimeoutError as e:
+        log.error(f'获取信息时超时: {stack_error(e)}')
         return None
 
-async def get_latest_repo_info(session, repos, app_id, headers):
+
+async def get_latest_repo_info(session, repos, app_id, headers) -> Any | None:
     latest_date = None
     selected_repo = None
 
@@ -38,30 +47,37 @@ async def get_latest_repo_info(session, repos, app_id, headers):
 
     return selected_repo, latest_date
 
+
 async def main(app_id: str, repos: list) -> bool:
     app_id_list = list(filter(str.isdecimal, app_id.strip().split('-')))
+
     if not app_id_list:
-        log.error(f'⚠ App ID无效')
+        log.error(f'App ID无效')
         return False
+
     app_id = app_id_list[0]
 
     async with ClientSession() as session:
         github_token = config.get("Github_Personal_Token", "")
-        headers = {'Authorization': f'Bearer {github_token}'} if github_token else None
+        headers = {'Authorization': f'Bearer {
+            github_token}'} if github_token else None
+
+        await checkcn(session)
         await check_github_api_rate_limit(headers, session)
 
         selected_repo, latest_date = await get_latest_repo_info(session, repos, app_id, headers)
 
         if selected_repo:
-            log.info(f'🔄 选择清单仓库：{selected_repo}')
-            url = f'https://api.github.com/repos/{selected_repo}/branches/{app_id}'
+            log.info(f'选择清单仓库: {selected_repo}')
+            url = f'https://api.github.com/repos/{
+                selected_repo}/branches/{app_id}'
             r_json = await fetch_branch_info(session, url, headers)
 
             if r_json and 'commit' in r_json:
                 sha = r_json['commit']['sha']
                 url = r_json['commit']['commit']['tree']['url']
                 r2_json = await fetch_branch_info(session, url, headers)
-                
+
                 if r2_json and 'tree' in r2_json:
                     collected_depots = []
                     for item in r2_json['tree']:
@@ -72,21 +88,22 @@ async def main(app_id: str, repos: list) -> bool:
                         if isSteamTools:
                             await migrate(st_use=True, session=session)
                             await stool_add(collected_depots, app_id)
-                            log.info('✅ 找到SteamTools，已添加解锁文件')
+                            log.info('找到SteamTools,已添加解锁文件')
 
                         if isGreenLuma:
                             await migrate(st_use=False, session=session)
                             await greenluma_add([app_id])
-                            depot_config = {'depots': {depot_id: {'DecryptionKey': depot_key} for depot_id, depot_key in collected_depots}}
+                            depot_config = {'depots': {depot_id: {
+                                'DecryptionKey': depot_key} for depot_id, depot_key in collected_depots}}
                             await depotkey_merge(steam_path / 'config' / 'config.vdf', depot_config)
                             if await greenluma_add([int(i) for i in depot_config['depots'] if i.isdecimal()]):
-                                log.info('✅ 找到GreenLuma，已添加解锁文件')
+                                log.info('找到GreenLuma,已添加解锁文件')
 
-                        log.info(f'✅ 清单最后更新时间：{latest_date}')
-                        log.info(f'✅ 入库成功: {app_id}')
+                        log.info(f'清单最后更新时间:{latest_date}')
+                        log.info(f'入库成功: {app_id}')
                         os.system('pause')
                         return True
-            
-        log.error(f'⚠ 清单下载或生成失败: {app_id}')
+
+        log.error(f'清单下载或生成失败: {app_id}')
         os.system('pause')
         return False

common/manifest_down.py

@@ -1,54 +0,0 @@
-from aiohttp import ClientError
-from tqdm.asyncio import tqdm_asyncio
-
-from .log import log
-
-
-async def get(sha: str, path: str, repo: str, session, chunk_size: int = 1024) -> bytearray:
-    url_list = [
-        f'https://jsdelivr.pai233.top/gh/{repo}@{sha}/{path}',
-        f'https://cdn.jsdmirror.com/gh/{repo}@{sha}/{path}',
-        f'https://raw.kkgithub.com/{repo}/{sha}/{path}',
-        f'https://raw.dgithub.xyz/{repo}/{sha}/{path}',
-        f'https://raw.githubusercontent.com/{repo}/{sha}/{path}'
-    ]
-    '''
-    下载时间 (20MB 从小到大):
-    https://jsdelivr.pai233.top/gh/{repo}@{sha}/{path} - 0.95秒
-    https://cdn.jsdmirror.com/gh/{repo}@{sha}/{path} - 6.74秒
-    https://raw.kkgithub.com/{repo}/{sha}/{path} - 6.76秒
-    https://raw.dgithub.xyz/{repo}/{sha}/{path} - 8.30秒
-    https://raw.gitmirror.com/{repo}/{sha}/{path} - 15.60秒
-    https://ghproxy.net/https://raw.githubusercontent.com/{repo}/{sha}/{path} - 16.59秒
-    https://fastly.jsdelivr.net/gh/{repo}@{sha}/{path} - 20.08秒
-    https://jsd.onmicrosoft.cn/gh/{repo}@{sha}/{path} - 22.07秒
-    https://gitdl.cn/https://raw.githubusercontent.com/{repo}/{sha}/{path} - 47.33秒
-    https://ghp.ci/https://raw.githubusercontent.com/{repo}/{sha}/{path} - 96.56秒
-    https://raw.githubusercontent.com/{repo}/{sha}/{path} - 458.75秒
-    https://cdn.jsdelivr.net/gh/{repo}@{sha}/{path} - 下载时出错
-    '''
-    retry = 3
-    while retry > 0:
-        for url in url_list:
-            try:
-                async with session.get(url, ssl=False) as response:
-                    if response.status == 200:
-                        total_size = int(response.headers.get('Content-Length', 0))
-                        content = bytearray()
-
-                        with tqdm_asyncio(total=total_size, unit='B', unit_scale=True, desc=f'🔄 下载 {path}', colour='#ffadad') as pbar:
-                            async for chunk in response.content.iter_chunked(chunk_size):
-                                content.extend(chunk)
-                                pbar.update(len(chunk))
-                        
-                        return content
-                    else:
-                        log.error(f'🔄 获取失败: {path} - 状态码: {response.status}')
-            except ClientError as e:
-                log.error(f'🔄 获取失败: {path} - 连接错误: {str(e)}')
-        
-        retry -= 1
-        log.warning(f'🔄 重试剩余次数: {retry} - {path}')
-    
-    log.error(f'🔄 超过最大重试次数: {path}')
-    raise Exception(f'🔄 无法下载: {path}')

common/migration.py

@@ -1,7 +1,8 @@
 import subprocess
 import aiofiles
+from aiohttp import ConnectionTimeoutError
 from pathlib import Path
-from tqdm.asyncio import tqdm
+from rich.progress import Progress, BarColumn, TextColumn, TimeElapsedColumn
 from .log import log
 from .get_steam_path import steam_path
 
@@ -10,30 +11,43 @@ temp_path = Path('./temp')
 setup_url = 'https://steamtools.net/res/SteamtoolsSetup.exe'
 setup_file = temp_path / 'SteamtoolsSetup.exe'
 
+
 async def download_setup_file(session) -> None:
-    log.info('🔄 开始下载 SteamTools 安装程序...')
+    log.info('开始下载 SteamTools 安装程序...')
     try:
         async with session.get(setup_url, stream=True) as r:
             if r.status == 200:
                 total_size = int(r.headers.get('Content-Length', 0))
                 chunk_size = 8192
-                progress = tqdm(total=total_size, unit='B', unit_scale=True, desc='下载安装程序')
+                with Progress(
+                    TextColumn("[progress.description]{task.description}", style="#66CCFF"),
+                    BarColumn(style="#66CCFF", complete_style="#4CE49F", finished_style="#2FE9D9"),
+                    TextColumn("[progress.percentage]{task.percentage:>3.0f}%", style="#66CCFF"),
+                    TimeElapsedColumn(),
+                ) as progress:
+                    
+                    task = progress.add_task(f"下载安装程序中...", total=total_size)
 
-                async with aiofiles.open(setup_file, mode='wb') as f:
-                    async for chunk in r.content.iter_chunked(chunk_size):
-                        await f.write(chunk)
-                        progress.update(len(chunk))
+                    async with aiofiles.open(setup_file, mode='wb') as f:
+                        async for chunk in r.content.iter_chunked(chunk_size):
+                            await f.write(chunk)
+                            progress.update(task, advance=len(chunk))
 
                 progress.close()
-                log.info('✅ 安装程序下载完成')
+                log.info('安装程序下载完成')
             else:
-                log.error('⚠ 网络错误，无法下载安装程序')
+                log.error('网络错误，无法下载安装程序')
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except Exception as e:
-        log.error(f'⚠ 下载失败: {e}')
+        log.error(f'下载失败: {e}')
+    except ConnectionTimeoutError as e:
+        log.error(f'下载时超时: {e}')
+
 
 async def migrate(st_use: bool, session) -> None:
     if st_use:
-        log.info('🔄 检测到你正在使用 SteamTools，尝试迁移旧文件')
+        log.info('检测到你正在使用 SteamTools,尝试迁移旧文件')
 
         if directory.exists():
             for file in directory.iterdir():
@@ -44,9 +58,9 @@ async def migrate(st_use: bool, session) -> None:
                         file.rename(directory / new_filename)
                         log.info(f'Renamed: {file.name} -> {new_filename}')
                     except Exception as e:
-                        log.error(f'⚠ 重命名失败 {file.name} -> {new_filename}: {e}')
+                        log.error(f'重命名失败 {file.name} -> {new_filename}: {e}')
         else:
-            log.error('⚠ 故障，正在重新安装 SteamTools')
+            log.error('故障,正在重新安装 SteamTools')
             temp_path.mkdir(parents=True, exist_ok=True)
 
             await download_setup_file(session)
@@ -56,4 +70,4 @@ async def migrate(st_use: bool, session) -> None:
                 file.unlink()
             temp_path.rmdir()
     else:
-        log.info('✅ 未使用 SteamTools，停止迁移')
+        log.info('未使用 SteamTools,停止迁移')

common/st_unlock.py

@@ -1,44 +0,0 @@
-import os
-import asyncio
-import subprocess
-import aiofiles
-from pathlib import Path
-
-from .log import log
-from .get_steam_path import steam_path
-
-lock = asyncio.Lock()
-
-async def stool_add(depot_data: list, app_id: str) -> bool:
-    lua_filename = f"{app_id}.lua"
-    lua_filepath = steam_path / "config" / "stplug-in" / lua_filename
-
-    async with lock:
-        log.info(f'✅ SteamTools 解锁文件生成: {lua_filepath}')
-        try:
-            async with aiofiles.open(lua_filepath, mode="w", encoding="utf-8") as lua_file:
-                await lua_file.write(f'addappid({app_id}, 1, "None")\n')
-                for depot_id, depot_key in depot_data:
-                    await lua_file.write(f'addappid({depot_id}, 1, "{depot_key}")\n')
-
-            luapacka_path = steam_path / "config" / "stplug-in" / "luapacka.exe"
-            log.info(f'🔄 正在处理文件: {lua_filepath}')
-
-            result = subprocess.run(
-                [str(luapacka_path), str(lua_filepath)], 
-                capture_output=True
-            )
-            if result.returncode != 0:
-                log.error(f'⚠ 调用失败: {result.stderr.decode()}')
-                return False
-
-            log.info('✅ 处理完成')
-        except Exception as e:
-            log.error(f'❌ 处理过程出现错误: {e}')
-            return False
-        finally:
-            if lua_filepath.exists():
-                os.remove(lua_filepath)
-                log.info(f'🗑️ 删除临时文件: {lua_filepath}')
-
-    return True

common/stack_error.py

@@ -1,5 +1,7 @@
 import traceback
 
+
 def stack_error(exception: Exception) -> str:
-    stack_trace = traceback.format_exception(type(exception), exception, exception.__traceback__)
+    stack_trace = traceback.format_exception(
+        type(exception), exception, exception.__traceback__)
     return ''.join(stack_trace)

common/unlock.py

@@ -0,0 +1,76 @@
+import os
+import asyncio
+import subprocess
+import aiofiles
+from .get_steam_path import steam_path
+from .log import log
+
+lock = asyncio.Lock()
+
+async def stool_add(depot_data: list, app_id: str) -> bool:
+    lua_filename = f"{app_id}.lua"
+    lua_filepath = steam_path / "config" / "stplug-in" / lua_filename
+
+    async with lock:
+        log.info(f'SteamTools 解锁文件生成: {lua_filepath}')
+        try:
+            async with aiofiles.open(lua_filepath, mode="w", encoding="utf-8") as lua_file:
+                await lua_file.write(f'addappid({app_id}, 1, "None")\n')
+                for depot_id, depot_key in depot_data:
+                    await lua_file.write(f'addappid({depot_id}, 1, "{depot_key}")\n')
+
+            luapacka_path = steam_path / "config" / "stplug-in" / "luapacka.exe"
+            log.info(f'正在处理文件: {lua_filepath}')
+
+            result = subprocess.run(
+                [str(luapacka_path), str(lua_filepath)],
+                capture_output=True
+            )
+            if result.returncode != 0:
+                log.error(f'调用失败: {result.stderr.decode()}')
+                return False
+
+            log.info('处理完成')
+        except KeyboardInterrupt:
+            log.info("\n 程序已退出")
+        except Exception as e:
+            log.error(f'处理过程出现错误: {e}')
+            return False
+        finally:
+            if lua_filepath.exists():
+                os.remove(lua_filepath)
+                log.info(f'🗑️ 删除临时文件: {lua_filepath}')
+
+    return True
+
+
+async def greenluma_add(depot_id_list: list) -> bool:
+    app_list_path = steam_path / 'AppList'
+
+    try:
+        app_list_path.mkdir(parents=True, exist_ok=True)
+
+        for file in app_list_path.glob('*.txt'):
+            file.unlink(missing_ok=True)
+
+        depot_dict = {
+            int(i.stem): int(i.read_text(encoding='utf-8').strip())
+            for i in app_list_path.iterdir() if i.is_file() and i.stem.isdecimal() and i.suffix == '.txt'
+        }
+
+        for depot_id in map(int, depot_id_list):
+            if depot_id not in depot_dict.values():
+                index = max(depot_dict.keys(), default=-1) + 1
+                while index in depot_dict:
+                    index += 1
+
+                (app_list_path /
+                 f'{index}.txt').write_text(str(depot_id), encoding='utf-8')
+
+                depot_dict[index] = depot_id
+
+        return True
+
+    except Exception as e:
+        print(f'处理时出错: {e}')
+        return False

main.py

@@ -1,7 +1,7 @@
 import sys
+import os
 import asyncio
 import re
-import platform
 
 from colorama import Fore, Back, Style
 from colorama import init as cinit
@@ -10,6 +10,9 @@ from common.stack_error import stack_error
 from common.init_text import init
 from common.main_func import main
 
+# 摘自https://github.com/MeoProject/lx-music-api-server
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
 lock = asyncio.Lock()
 
 init()
@@ -21,50 +24,42 @@ repos = [
     'tymolu233/ManifestAutoUpdate',
 ]
 
-def check_system_msg():
-    os_type = platform.system()
-    try:
-        if not os_type == 'Windows':
-            log.error(f'❌ 不用Windows你想上天？{os_type}')
-    except Exception as e:
-        log.error(f'❌ 获取系统类型失败：{stack_error(e)}')
-    os_version = sys.getwindowsversion().major
-    try:
-        if os_version < 10:
-            log.error(f'❌ 低于Windows10就别用了买台新电脑吧！当前版本：Windows {os_version}')
-    except Exception as e:
-        log.error(f'❌ 获取系统版本失败：{stack_error(e)}')
 
 def prompt_app_id():
-        app_id = input(f"{Fore.CYAN}{Back.BLACK}{Style.BRIGHT}🤔 请输入游戏AppID：{Style.RESET_ALL}").strip()
+    while True:
+        app_id = input(f"{Fore.CYAN}{Back.BLACK}{
+                       Style.BRIGHT}请输入游戏AppID: {Style.RESET_ALL}").strip()
         if re.match(r'^\d+$', app_id):
             return app_id
         else:
-            print(f"{Fore.RED}⚠ 无效的AppID，请输入数字！{Style.RESET_ALL}")
+            print(f"{Fore.RED}无效的AppID, 请输入数字!{Style.RESET_ALL}")
+
 
 async def main_loop():
     while True:
         try:
             app_id = prompt_app_id()
             await main(app_id, repos)
+        except KeyboardInterrupt:
+            log.info("\n 程序已退出")
         except EOFError:
             break
 
+
 async def run():
     try:
-        log.info('❗ App ID可以在SteamDB或Steam商店链接页面查看')
+        log.info('App ID可以在SteamDB或Steam商店链接页面查看')
         await main_loop()
     except KeyboardInterrupt:
-        log.info("👋 程序已退出")
+        log.info("\n 程序已退出")
     except Exception as e:
-        log.error(f' ⚠ 发生错误: {stack_error(e)}，将在5秒后退出')
+        log.error(f'发生错误: {stack_error(e)}, 将在5秒后退出')
         await asyncio.sleep(5)
-    finally:
-        asyncio.get_event_loop().stop()
 
 if __name__ == '__main__':
     try:
-        check_system_msg()
         asyncio.run(run())
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except SystemExit:
         sys.exit()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "onekey",
-  "version": "1.2.5",
+  "version": "1.3.2",
   "description": "一个Steam仓库清单下载器",
   "main": "index.js",
   "scripts": {

requirements.txt

@@ -1,7 +1,7 @@
 aiofiles==24.1.0
-aiohttp==3.10.2
+aiohttp==3.10.10
 colorama==0.4.6
 colorlog==6.8.2
-tqdm==4.66.5
+rich==13.9.4
 ujson==5.10.0
 vdf==3.4