Merge pull request #28 from muwenyan521/main

[WIP] 代码美化与优化

.github/workflows/build.yml

@@ -7,14 +7,18 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: windows-2019
     steps:
     - 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
-      run: node -p -e '`PACKAGE_VERSION=${require("./package.json").version}`' >> $GITHUB_ENV
+      shell: powershell
+      run: |
+        $version = (Get-Content package.json | ConvertFrom-Json).version
+        echo "PACKAGE_VERSION=$version" >> $env:GITHUB_ENV
+  
 
     - name: Set up Python 3.11
       uses: actions/setup-python@v3
@@ -41,6 +45,7 @@ jobs:
         file-version: ${{ env.PACKAGE_VERSION }}
         product-version: ${{ env.PACKAGE_VERSION }}
         file-description: 一个Steam仓库清单下载器
+        copyright: Copyright © 2024 ikun0014
         output-file: Onekey---v${{ env.PACKAGE_VERSION }}.exe
         assume-yes-for-downloads: true
         output-dir: build
@@ -61,6 +66,6 @@ jobs:
         draft: false
         tag_name: v${{ env.PACKAGE_VERSION }}
         files: |
-          Onekey---v${{ env.PACKAGE_VERSION }}.exe
+          build/Onekey---v${{ env.PACKAGE_VERSION }}.exe
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/python-publish.yml

@@ -0,0 +1,67 @@
+# 此工作流使用未经 GitHub 认证的操作。
+# 它们由第三方提供，并受
+# 单独的服务条款、隐私政策和支持
+# 文档。
+
+# GitHub 建议将操作固定到提交 SHA。
+# 若要获取较新版本，需要更新 SHA。
+# 还可以引用标记或分支，但该操作可能会更改而不发出警告。
+
+name: Upload Python Package
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  release-build:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Build release distributions
+        run: |
+          # NOTE: put your own distribution build steps here.
+          python -m pip install build
+          python -m pip install requirements.txt
+          python -m build
+
+      - name: Upload distributions
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+  pypi-publish:
+    runs-on: ubuntu-latest
+
+    needs:
+      - release-build
+
+    permissions:
+      # IMPORTANT: this permission is mandatory for trusted publishing
+      id-token: write
+
+    # Dedicated environments with protections for publishing are strongly recommended.
+    environment:
+      name: pypi
+      # OPTIONAL: uncomment and update to include your PyPI project URL in the deployment status:
+      url: https://pypi.org/p/Onekey
+
+    steps:
+      - name: Retrieve release distributions
+        uses: actions/download-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+      - name: Publish release distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

MANIFEST.in

@@ -0,0 +1 @@
+include README.md LICENSE

README.md

@@ -1,59 +1,62 @@
-<div align="center">
+# Onekey
 
-![Onekey](https://socialify.git.ci/ikunshare/Onekey/image?description=1&font=Inter&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Auto)
+## 项目简介
+Onekey 是一个用于从 Steam 官方 CDN 服务器下载游戏清单数据的工具。它可以帮助用户快速获取和管理游戏数据。
 
-![GitHub Repo Size](https://img.shields.io/github/repo-size/ikunshare/Onekey?style=for-the-badge)
-[![GitHub Release (with filter)](https://img.shields.io/github/v/release/ikunshare/Onekey?style=for-the-badge)](https://github.com/ikunshare/Onekey/releases/latest)
-[![GitHub All Releases](https://img.shields.io/github/downloads/ikunshare/Onekey/total?style=for-the-badge&color=violet)](https://github.com/ikunshare/Onekey/releases)
-[![GitHub License](https://img.shields.io/github/license/ikunshare/Onekey?style=for-the-badge)](https://github.com/ikunshare/Onekey/blob/main/LICENSE)
+## 安装和使用
+### 安装步骤
+1. 下载最新版本：前往 [Releases](https://github.com/ikunshare/Onekey/releases/latest) 页面下载最新版本。
+2. 安装依赖：
+   ```bash
+   pip install -r requirements.txt
+   ```
 
-</div>
+### 使用方法
+1. 运行程序并按照提示操作。
 
+## 开发环境要求
+- Python 3.10 及以上
+- Windows 10 及以上
+- Git 版本管理
 
-## Onekey
- Onekey Steam Depot Manifest Downloader
-
-## 使用方法
- 先去Release下最新发布，然后去steamtools官网下steamtools，日志会有点石介意别用
-
-## 开发
-本程序使用Python编程语言开发
-要求环境：
-1.Python 3.10及以上
-2.Windows 10及以上
-3.使用Git进行版本管理
-
-1.克隆项目到本地 
-
-git clone https://github.com/ikunshare/Onekey
-
-2.安装依赖
-
-pip install -r requirements.txt
-
-3.Success！
+## 克隆和安装
+1. 克隆项目到本地：
+   ```bash
+   git clone https://github.com/ikunshare/Onekey
+   ```
+2. 安装依赖：
+   ```bash
+   pip install -r requirements.txt
+   ```
 
 ## 项目协议
- 本项目基于 ACSL V2.0 许可证发行，以下协议是对于 ACSL V2.0 原协议的补充，如有冲突，以以下协议为准。
-
- 词语约定：“使用者”指签署本协议的使用者;“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
-
- 本项目的数据来源原理是从Steam官方的CDN服务器中拉取游戏清单数据，经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的准确性负责。
- 使用本项目的过程中可能会产生版权数据，对于这些版权数据，本项目不拥有它们的所有权，为了避免造成侵权，使用者务必在24 小时内清除使用本项目的过程中所产生的版权数据。
- 由于使用本项目产生的包括由于本协议或由于使用或无法使用本项目而引起的任何性质的任何直接、间接、特殊、偶然或结果性损害（包括但不限于因商誉损失、停工、计算机故障或故障引起的损害赔偿，或任何及所有其他商业损害或损失）由使用者负责。
- 本项目完全免费，且开源发布于 GitHub 面向全世界人用作对技术的学习交流，本项目不对项目内的技术可能存在违反当地法律法规的行为作保证，禁止在违反当地法律法规的情况下使用本项目，对于使用者在明知或不知当地法律法规不允许的情况下使用本项目所造成的任何违法违规行为由使用者承担，本项目不承担由此造成的任何直接、间接、特殊、偶然或结果性责任。
- 而且，本项目已禁止使用于商业用途，以及不得进行未经允许的二次修改，否则必须同时发布源代码。
- 若你使用了本项目，将代表你接受以上协议。
-
- Steam正版平台不易，请尊重版权，支持正版。  
- 本项目仅用于对技术可行性的探索及研究，不接受任何商业（包括但不限于广告等）合作。  
-
-## Star 趋势图
-
- [![Stargazers over time](https://starchart.cc/ikunshare/Onekey.svg)](https://starchart.cc/ikunshare/Onekey)
+本项目基于 GPL-3.0 许可证发行。使用者在使用过程中应遵守以下条款：
+- 24小时内清除产生的版权数据
+- 承担使用本项目可能产生的任何损害
+- 禁止商业用途和未经允许的二次修改
 
 ## 贡献者
+感谢所有贡献者的支持：
+<a href="https://github.com/ikunshare/Onekey/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=ikunshare/Onekey" />
+</a>
 
- <a href="https://github.com/ikunshare/Onekey/graphs/contributors">
-   <img src="https://contrib.rocks/image?repo=ikunshare/Onekey" />
- </a>
+## Star 趋势图
+[![Stargazers over time](https://starchart.cc/ikunshare/Onekey.svg)](https://starchart.cc/ikunshare/Onekey)
+
+## 贡献指南
+欢迎参与本项目的开发和维护。
+
+## 常见问题解答（FAQ）
+查看 [FAQ](https://ikunshare.com/d/49) 获取常见问题的解答。
+
+
+## 社区和支持
+加入我们的社区，参与讨论和支持：
+- [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)
+
+## 许可证
+本项目采用 [GPL-3.0](https://github.com/ikunshare/Onekey/blob/main/LICENSE) 许可证。

common/check.py

@@ -7,20 +7,22 @@ async def check_github_api_rate_limit(headers, session):
     url = 'https://api.github.com/rate_limit'
 
     async with session.get(url, headers=headers, ssl=False) as r:
-        if not r == None:
-            r_json = await r.json()
-        else:
+        if r is None:
             log.error('孩子，你怎么做到的？')
             os.system('pause')
+            return
+
+        r_json = await r.json()
 
     if r.status == 200:
         rate_limit = r_json['rate']
         remaining_requests = rate_limit['remaining']
         reset_time = rate_limit['reset']
         reset_time_formatted = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(reset_time))
-        log.info(f' 🔄 剩余请求次数: {remaining_requests}')
+        log.info(f'🔄 剩余请求次数: {remaining_requests}')
     else:
         log.error('Github请求数检查失败')
+        return
 
     if remaining_requests == 0:
-        log.warning(f' ⚠ GitHub API 请求数已用尽，将在 {reset_time_formatted} 重置, 不想等生成一个填配置文件里')
+        log.warning(f'⚠ GitHub API 请求数已用尽，将在 {reset_time_formatted} 重置, 不想等生成一个填配置文件里')

common/config.py

@@ -7,18 +7,25 @@ import aiofiles
 from .stack_error import stack_error
 from .log import log
 
+
 async def gen_config_file():
+    qa1 = "温馨提示：Github_Personal_Token可在Github设置的最底下开发者选项找到，详情看教程"
+    tutorial = "https://ikunshare.com/Onekey_tutorial"
     default_config ={
                     "Github_Personal_Token": "",
                     "Custom_Steam_Path": "",
-                    "QA1": "温馨提示：Github_Personal_Token可在Github设置的最底下开发者选项找到，详情看教程",
-                    "教程": "https://lyvx-my.sharepoint.com/:w:/g/personal/ikun_ikunshare_com/EWqIqyCElLNLo_CKfLbqix0BWU_O03HLzEHQKHdJYrUz-Q?e=79MZjw"
+                    "QA1": qa1,
+                    "教程": tutorial
                     }
-    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))
+    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))
         await f.close()
-    log.info(' 🖱️ 程序可能为第一次启动，请填写配置文件后重新启动程序')
+    log.info('🖱️ 程序可能为第一次启动，请填写配置文件后重新启动程序')
 
 
 async def load_config():
@@ -28,7 +35,9 @@ async def load_config():
         sys.exit()
     else:
         try:
-            async with aiofiles.open("./config.json", mode="r", encoding="utf-8") as f:
+            async with aiofiles.open("./config.json",
+                                     mode="r",
+                                     encoding="utf-8") as f:
                 config = json.loads(await f.read())
                 return config
         except Exception as e:
@@ -37,4 +46,4 @@ async def load_config():
             os.system('pause')
 
         
-config = asyncio.run(load_config())
+config = asyncio.run(load_config())

common/dkey_merge.py

@@ -6,21 +6,25 @@ from .log import log
 
 lock = asyncio.Lock()
 
+
 async def depotkey_merge(config_path, depots_config):
     if not config_path.exists():
         async with lock:
-            log.error(' 👋 Steam默认配置不存在，可能是没有登录账号')
+            log.error('👋 Steam默认配置不存在，可能是没有登录账号')
         return
+    
     async with aiofiles.open(config_path, encoding='utf-8') as f:
         content = await f.read()
+        
     config = vdf.loads(content)
     software = config['InstallConfigStore']['Software']
     valve = software.get('Valve') or software.get('valve')
     steam = valve.get('Steam') or valve.get('steam')
-    if 'depots' not in steam:
-        steam['depots'] = {}
-    steam['depots'].update(depots_config['depots'])
+    
+    steam.setdefault('depots', {}).update(depots_config['depots'])
+    
     async with aiofiles.open(config_path, mode='w', encoding='utf-8') as f:
         new_content = vdf.dumps(config, pretty=True)
         await f.write(new_content)
+        
     return True

common/get_manifest_info.py

@@ -6,29 +6,35 @@ from .log import log
 from .manifest_down import get
 from .stack_error import stack_error
 
-# 获取清单信息
+
 async def get_manifest(sha, path, steam_path: Path, repo, session):
     collected_depots = []
     try:
         if path.endswith('.manifest'):
             depot_cache_path = steam_path / 'depotcache'
-            if not depot_cache_path.exists():
-                depot_cache_path.mkdir(exist_ok=True)
+            depot_cache_path.mkdir(exist_ok=True) if not depot_cache_path.exists() else None
             save_path = depot_cache_path / path
+            
             if save_path.exists():
                 log.warning(f'👋已存在清单: {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}')
-            depots_config = vdf.loads(content.decode(encoding='utf-8'))
+            log.info(f'🔄 密钥下载成功: {path}')
+            depots_config = vdf.loads(content.decode('utf-8'))
+            
             for depot_id, depot_info in depots_config['depots'].items():
                 collected_depots.append((depot_id, depot_info['DecryptionKey']))
+                
     except Exception as e:
         log.error(f'处理失败: {path} - {stack_error(e)}')
         raise
+        
     return collected_depots

common/get_steam_path.py

@@ -1,7 +1,5 @@
 import os
-
 import winreg
-
 from pathlib import Path
 from .log import log
 from .config import config
@@ -12,12 +10,14 @@ def get_steam_path():
         key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r'Software\Valve\Steam')
         steam_path = Path(winreg.QueryValueEx(key, 'SteamPath')[0])
         custom_steam_path = config["Custom_Steam_Path"]
-        if not custom_steam_path == '':
+        
+        if custom_steam_path:
             return Path(custom_steam_path)
-        else:
-            return steam_path
+        
+        return steam_path
     except Exception as e:
-        log.error(f'Steam路径获取失败, {stack_error(e)}')
+        log.error(f'❗ Steam路径获取失败, {stack_error(e)}')
         os.system('pause')
-    
+        return None
+
 steam_path = get_steam_path()

common/gl_unlock.py

@@ -4,25 +4,29 @@ async def greenluma_add(depot_id_list):
     app_list_path = steam_path / 'AppList'
     if app_list_path.exists() and app_list_path.is_file():
         app_list_path.unlink(missing_ok=True)
+    
     if not app_list_path.is_dir():
         app_list_path.mkdir(parents=True, exist_ok=True)
-    depot_dict = {}
+    
+    depot_dict = {int(i.stem): None for i in app_list_path.iterdir() if i.stem.isdecimal() and i.suffix == '.txt'}
+    
     for i in app_list_path.iterdir():
         if i.stem.isdecimal() and i.suffix == '.txt':
             with i.open('r', encoding='utf-8') as f:
                 app_id_ = f.read().strip()
-                depot_dict[int(i.stem)] = None
                 if app_id_.isdecimal():
                     depot_dict[int(i.stem)] = int(app_id_)
+                    
     for depot_id in depot_id_list:
         if int(depot_id) not in depot_dict.values():
-            index = max(depot_dict.keys()) + 1 if depot_dict.keys() else 0
-            if index != 0:
-                for i in range(max(depot_dict.keys())):
-                    if i not in depot_dict.keys():
-                        index = i
-                        break
+            index = max(depot_dict.keys(), default=-1) + 1
+            for i in range(max(depot_dict.keys(), default=-1) + 1):
+                if i not in depot_dict:
+                    index = i
+                    break
+            
             with (app_list_path / f'{index}.txt').open('w', encoding='utf-8') as f:
                 f.write(str(depot_id))
             depot_dict[index] = int(depot_id)
+    
     return True

common/init_text.py

@@ -1,15 +1,19 @@
+from colorama import Fore, Back, Style, init
+
+init()
+
 from .log import log
 
 def init():
-    print('\033[1;32;40m  _____   __   _   _____   _   _    _____  __    __ ' + '\033[0m')
-    print('\033[1;32;40m /  _  \\ |  \\ | | | ____| | | / /  | ____| \\ \\  / /' + '\033[0m')
-    print('\033[1;32;40m | | | | |   \\| | | |__   | |/ /   | |__    \\ \\/ /' + '\033[0m')
-    print('\033[1;32;40m | | | | | |\\   | |  __|  | |\\ \\   |  __|    \\  / ' + '\033[0m')
-    print('\033[1;32;40m | |_| | | | \\  | | |___  | | \\ \\  | |___    / /' + '\033[0m')
-    print('\033[1;32;40m \\_____/ |_|  \\_| |_____| |_|  \\_\\ |_____|  /_/' + '\033[0m')
+    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT}  _____   __   _   _____   _   _    _____  __    __ {Style.RESET_ALL}")
+    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} /  _  \\ |  \\ | | | ____| | | / /  | ____| \\ \\  / /{Style.RESET_ALL}")
+    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} | | | | |   \\| | | |__   | |/ /   | |__    \\ \\/ /{Style.RESET_ALL}")
+    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} | | | | | |\\   | |  __|  | |\\ \\   |  __|    \\  / {Style.RESET_ALL}")
+    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} | |_| | | | \\  | | |___  | | \\ \\  | |___    / /{Style.RESET_ALL}")
+    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} \\_____/ |_|  \\_| |_____| |_|  \\_\\ |_____|  /_/{Style.RESET_ALL}")
     log.info('作者ikun0014')
-    log.info('本项目基于wxy1343/ManifestAutoUpdate进行修改，采用ACSL许可证')
-    log.info('版本：1.1.9')
+    log.info('本项目采用GNU General Public License v3开源许可证')
+    log.info('版本：1.2.2')
     log.info('项目仓库：https://github.com/ikunshare/Onekey')
     log.info('官网：ikunshare.com')
-    log.warning('本项目完全开源免费，如果你在淘宝，QQ群内通过购买方式获得，赶紧回去骂商家死全家\n交流群组：\n点击链接加入群聊【𝗶𝗸𝘂𝗻分享】：https://qm.qq.com/q/d7sWovfAGI\nhttps://t.me/ikunshare_group')
+    log.warning('本项目完全开源免费，如果你在淘宝，QQ群内通过购买方式获得，赶紧回去骂商家死全家\n交流群组：\nhttps://qm.qq.com/q/d7sWovfAGI\nhttps://t.me/ikunshare_group')

common/log.py

@@ -4,18 +4,23 @@ import colorlog
 def init_log():
     logger = logging.getLogger('Onekey')
     logger.setLevel(logging.DEBUG)
+
     stream_handler = logging.StreamHandler()
     stream_handler.setLevel(logging.DEBUG)
+
     fmt_string = '%(log_color)s[%(name)s][%(levelname)s]%(message)s'
     log_colors = {
+        'DEBUG': 'blue',
         'INFO': 'cyan',
         'WARNING': 'yellow',
         'ERROR': 'red',
         'CRITICAL': 'purple'
     }
     fmt = colorlog.ColoredFormatter(fmt_string, log_colors=log_colors)
+
     stream_handler.setFormatter(fmt)
     logger.addHandler(stream_handler)
+
     return logger
 
-log = init_log()
+log = init_log()

common/main_func.py

@@ -1,7 +1,5 @@
 import os
-
 from aiohttp import ClientSession
-
 from common.config import config
 from common.dkey_merge import depotkey_merge
 from common.migration import migrate
@@ -18,10 +16,13 @@ isSteamTools = (steam_path / 'config' / 'stUI').is_dir()
 
 async def main(app_id, repos):
     app_id_list = list(filter(str.isdecimal, app_id.strip().split('-')))
+    if not app_id_list:
+        log.error("无有效的应用ID")
+        return False
     app_id = app_id_list[0]
     
     async with ClientSession() as session:
-        github_token = config["Github_Personal_Token"]
+        github_token = config.get("Github_Personal_Token")
         headers = {'Authorization': f'Bearer {github_token}'} if github_token else None
         latest_date = None
         selected_repo = None
@@ -40,8 +41,9 @@ async def main(app_id, repos):
                             selected_repo = repo
             except Exception as e:
                 log.error(f' ⚠ 获取分支信息失败: {stack_error(e)}')
+
         if selected_repo:
-            log.info(f' 🔄 选择清单仓库：{selected_repo}')
+            log.info(f'🔄 选择清单仓库：{selected_repo}')
             url = f'https://api.github.com/repos/{selected_repo}/branches/{app_id}'
             async with session.get(url, headers=headers, ssl=False) as r:
                 r_json = await r.json()
@@ -59,18 +61,18 @@ async def main(app_id, repos):
                                 if isSteamTools:
                                     migrate(st_use=True)
                                     await stool_add(collected_depots, app_id)
-                                    log.info(' ✅ 找到SteamTools，已添加解锁文件')
+                                    log.info('✅ 找到SteamTools，已添加解锁文件')
                                 if isGreenLuma:
                                     migrate(st_use=False)
                                     await greenluma_add([app_id])
                                     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(f' ✅ 清单最后更新时间：{date}')
-                                log.info(f' ✅ 入库成功: {app_id}')
+                                        log.info('✅ 找到GreenLuma，已添加解锁文件')
+                                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
+        return False

common/manifest_down.py

@@ -1,11 +1,12 @@
 from aiohttp import ClientError
+from tqdm.asyncio import tqdm_asyncio
 from .log import log
 
 async def get(sha, path, repo, session):
     url_list = [
         f'https://cdn.jsdmirror.com/gh/{repo}@{sha}/{path}',
         f'https://jsd.onmicrosoft.cn/gh/{repo}@{sha}/{path}',
-        f'https://mirror.ghproxy.com/https://raw.githubusercontent.com/{repo}/{sha}/{path}',
+        # f'https://mirror.ghproxy.com/https://raw.githubusercontent.com/{repo}/{sha}/{path}',
         f'https://raw.githubusercontent.com/{repo}/{sha}/{path}',
     ]
     retry = 3
@@ -14,12 +15,24 @@ async def get(sha, path, repo, session):
             try:
                 async with session.get(url, ssl=False) as r:
                     if r.status == 200:
-                        return await r.read()
+                        total_size = int(r.headers.get('Content-Length', 0))
+                        if total_size == 0:
+                            log.error(f'🔄 获取失败: {path} - 内容为空')
+                            break
+                        chunk_size = 1024
+                        content = bytearray()
+
+                        with tqdm_asyncio(total=total_size, unit='B', unit_scale=True, desc=f'🔃 下载 {path}', bar_format="{l_bar}{bar} [{n_fmt}/{total_fmt}] {postfix}") as pbar:
+                            async for chunk in r.content.iter_chunked(chunk_size):
+                                content.extend(chunk)
+                                pbar.update(len(chunk))
+                        
+                        return content
                     else:
-                        log.error(f' 🔄 获取失败: {path} - 状态码: {r.status}')
+                        log.error(f'🔄 获取失败: {path} - 状态码: {r.status}')
             except ClientError:
-                log.error(f' 🔄 获取失败: {path} - 连接错误')
+                log.error(f'🔄 获取失败: {path} - 连接错误')
         retry -= 1
-        log.warning(f'  🔄  重试剩余次数: {retry} - {path}')
-    log.error(f'  🔄 超过最大重试次数: {path}')
-    raise Exception(f'  🔄 无法下载: {path}')
+        log.warning(f'🔄 重试剩余次数: {retry} - {path}')
+    log.error(f'🔄 超过最大重试次数: {path}')
+    raise Exception(f'🔄 无法下载: {path}')

common/migration.py

@@ -9,13 +9,13 @@ from .get_steam_path import steam_path
 directory = Path(steam_path / "config" / "stplug-in")
 
 def migrate(st_use):
-    if st_use == True:
-        log.info('检测到你正在使用SteamTools，尝试迁移旧文件')
-        if os.path.exists(directory):
+    if st_use:
+        log.info('🔃 检测到你正在使用SteamTools，尝试迁移旧文件')
+        if directory.exists():
             for filename in os.listdir(directory):
                 if filename.startswith("Onekey_unlock_"):
                     new_filename = filename[len("Onekey_unlock_"):]
-    
+
                     old_file = os.path.join(directory, filename)
                     new_file = os.path.join(directory, new_filename)
 
@@ -25,20 +25,22 @@ def migrate(st_use):
                     except Exception as e:
                         log.error(f'Failed to rename {filename} -> {new_filename}: {e}')
         else:
-            log.error('故障，正在重新安装SteamTools')
-            temp_path = './temp'
-            if not os.path.exists(temp_path):
-                os.mkdir(temp_path)
+            log.error('❗ 故障，正在重新安装SteamTools')
+            temp_path = Path('./temp')
+            temp_path.mkdir(exist_ok=True)
             down_url = 'https://steamtools.net/res/SteamtoolsSetup.exe'
-            out_path = './temp/SteamtoolsSetup.exe'
-            with requests.get(down_url, stream=True) as r:
-                if r.status_code == 200:
+            out_path = temp_path / 'SteamtoolsSetup.exe'
+            try:
+                with requests.get(down_url, stream=True) as r:
+                    r.raise_for_status()
                     with open(out_path, 'wb') as f:
                         for chunk in r.iter_content(chunk_size=8192):
                             f.write(chunk)
-                else:
-                    log.error('网络错误')
-            subprocess.run(str(out_path))
-            os.rmdir(temp_path)
+            except requests.HTTPError:
+                log.error('下载失败，网络错误')
+                return
+
+            subprocess.run([str(out_path)], check=True)
+            subprocess.run(['rm', '-rf', str(temp_path)])
     else:
-        log.info('未使用SteamTools，停止迁移')
+        log.info('未使用SteamTools，停止迁移')

common/st_unlock.py

@@ -13,13 +13,13 @@ async def stool_add(depot_data, app_id):
     lua_filepath = steam_path / "config" / "stplug-in" / lua_filename
 
     async with lock:
-        log.info(f' ✅ SteamTools解锁文件生成: {lua_filepath}')
+        log.info(f'✅ SteamTools解锁文件生成: {lua_filepath}')
         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"
-    subprocess.run([str(luapacka_path), str(lua_filepath)])
+    subprocess.run([str(luapacka_path), str(lua_filepath)], check=True)
     os.remove(lua_filepath)
-    return True
+    return True

main.py

@@ -8,23 +8,25 @@ from common.init_text import init
 from common.main_func import main
 
 lock = asyncio.Lock()
-
 init()
 
 repos = [
-         'ikun0014/ManifestHub',
-         'Auiowu/ManifestAutoUpdate',
-         'tymolu233/ManifestAutoUpdate'
-        ]
+    'ikun0014/ManifestHub',
+    'Auiowu/ManifestAutoUpdate',
+    'tymolu233/ManifestAutoUpdate'
+]
+
+def get_app_id():
+    log.info('App ID可以在SteamDB或Steam商店链接页面查看')
+    return input("请输入游戏AppID：").strip()
+
 if __name__ == '__main__':
     try:
         while True:
-            log.info('App ID可以在SteamDB或Steam商店链接页面查看')
-            app_id = input("请输入游戏AppID：").strip()
+            app_id = get_app_id()
             asyncio.run(main(app_id, repos))
     except KeyboardInterrupt:
         exit()
     except Exception as e:
         log.error(f' ⚠ 发生错误: {stack_error(e)}，将在5秒后退出')
-        time.sleep(5)
-        os.system('pause')
+        time.sleep(5)

package.json

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

requirements.txt

@@ -2,6 +2,7 @@ aiofiles
 colorlog
 ujson
 vdf
-nuitka
 requests
 imageio
+aiohttp
+tqdm

setup.py

@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Note: To use the 'upload' functionality of this file, you must:
+#   $ pipenv install twine --dev
+
+import io
+import os
+import sys
+from shutil import rmtree
+
+from setuptools import find_packages, setup, Command
+
+# Package meta-data.
+NAME = 'Onekey'
+DESCRIPTION = 'Onekey Steam Depot Manifest Downloader.'
+URL = 'https://github.com/ikunshare/Onekey'
+EMAIL = 'ikun0014@qq.com'
+AUTHOR = 'ikun0014'
+REQUIRES_PYTHON = '>=3.10.0'
+VERSION = '1.2.2'
+
+REQUIRED = [
+    'aiohttp',
+    'aiofiles',
+    'colorlog',
+    'ujson',
+    'vdf',
+    'requests',
+    'tqdm'
+]
+
+EXTRAS = {}
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+try:
+    with io.open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
+        long_description = '\n' + f.read()
+except FileNotFoundError:
+    long_description = DESCRIPTION
+
+about = {}
+if not VERSION:
+    project_slug = NAME.lower().replace("-", "_").replace(" ", "_")
+    with open(os.path.join(here, project_slug, '__version__.py')) as f:
+        exec(f.read(), about)
+else:
+    about['__version__'] = VERSION
+
+
+class UploadCommand(Command):
+    """Support setup.py upload."""
+
+    description = 'Build and publish the package.'
+    user_options = []
+
+    @staticmethod
+    def status(s):
+        """Prints things in bold."""
+        print('\033[1m{0}\033[0m'.format(s))
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        try:
+            self.status('Removing previous builds…')
+            rmtree(os.path.join(here, 'dist'))
+        except OSError:
+            pass
+
+        self.status('Building Source and Wheel (universal) distribution…')
+        os.system('{0} setup.py sdist bdist_wheel --universal'.format(sys.executable))
+
+        self.status('Uploading the package to PyPI via Twine…')
+        os.system('twine upload dist/*')
+
+        self.status('Pushing git tags…')
+        os.system('git tag v{0}'.format(about['__version__']))
+        os.system('git push --tags')
+
+        sys.exit()
+
+
+setup(
+    name=NAME,
+    version=about['__version__'],
+    description=DESCRIPTION,
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    author=AUTHOR,
+    author_email=EMAIL,
+    python_requires=REQUIRES_PYTHON,
+    url=URL,
+    packages=find_packages(exclude=["tests", "*.tests", "*.tests.*", "tests.*"]),
+    install_requires=REQUIRED,
+    extras_require=EXTRAS,
+    include_package_data=True,
+    license='GNU General Public License v3',
+    classifiers=[
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Natural Language :: Chinese (Simplified)'
+    ],
+    # $ setup.py publish support.
+    cmdclass={
+        'upload': UploadCommand,
+    },
+)