更新 sync.yml

.github/workflows/ci.yml

@@ -1,66 +0,0 @@
-name: Build CI
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    permissions:
-      contents: write
-    runs-on: windows-2019
-    steps:
-    - name: Check out git repository
-      uses: actions/checkout@v4
-
-    - 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
-      uses: actions/setup-python@v3
-      with:
-        python-version: 3.11.9
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install imageio
-        pip install -r requirements.txt
-
-    - name: Build
-      uses: Nuitka/Nuitka-Action@main
-      with:
-        nuitka-version: main
-        script-name: main.py
-        standalone: true
-        onefile: true
-        show-memory: true
-        windows-uac-admin: true
-        windows-icon-from-ico: icon.jpg
-        company-name: ikunshare
-        product-name: Onekey
-        file-version: 0.0.0.0
-        product-version: 0.0.0.0
-        file-description: Onekey_Beta_${{ github.sha }}
-        copyright: Copyright © 2024 ikun0014
-        output-file: Onekey_${{ github.sha }}.exe
-        assume-yes-for-downloads: true
-        output-dir: build
-
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: Onekey_${{ github.sha }}.exe
-        path: build/Onekey_${{ github.sha }}.exe
-
-    - name: Upload to Telegram Channel
-      run: |
-        & curl -F "chat_id=${{ secrets.TELEGRAM_TO }}" `
-            -F "document=@build/Onekey_${{ github.sha }}.exe" `
-            -F "caption=Onekey's New CI Build ${{ github.sha }}" `
-            -F "parse_mode=Markdown" `
-            "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendDocument"

.github/workflows/release.yml

@@ -7,10 +7,9 @@ on:
 
 jobs:
   build:
-    if: contains(github.event.head_commit.message, '[release]')
     permissions:
       contents: write
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
     - name: Check out git repository
       uses: actions/checkout@v4
@@ -21,10 +20,10 @@ jobs:
         $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: |
@@ -61,6 +60,12 @@ 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:
@@ -71,6 +76,20 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Gitee Release
+      uses: nicennnnnnnlee/action-gitee-release@v1.0.5
+      with:
+        gitee_owner: ikun0014
+        gitee_repo: Onekey
+        gitee_token: ${{ secrets.GITEE_TOKEN }}
+        gitee_tag_name: v${{ env.PACKAGE_VERSION }}
+        gitee_release_name: v${{ env.PACKAGE_VERSION }}
+        gitee_release_body: I don't know
+        gitee_target_commitish: main
+        gitee_upload_retry_times:  3
+        gitee_file_name: Onekey---v${{ env.PACKAGE_VERSION }}.exe
+        gitee_file_path: build/Onekey---v${{ env.PACKAGE_VERSION }}.exe
+
     - name: Upload to Telegram Channel
       run: |
         & curl -F "chat_id=${{ secrets.TELEGRAM_TO }}" `

.github/workflows/sync.yml

@@ -0,0 +1,25 @@
+name: Sync to Gitee
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  sync:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+    - name: Sync to Gitee
+      uses: Yikun/hub-mirror-action@master
+      with:
+        src: github/ikunshare
+        dst: gitee/ikun0014
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token: ${{ secrets.GITEE_TOKEN }}
+        src_account_type: org
+        dst_account_type: user
+        white_list: "Onekey"
+        force_update: true
+        debug: true

.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,14 +11,15 @@
 
 
 ## Onekey
- Onekey Steam Depot Manifest Downloader
+Onekey Steam Depot Manifest Downloader
 
 ## 使用方法
- 先去Release下最新发布，然后去steamtools官网下steamtools，日志会有点石介意别用
+去Releases处下载最新的发布，并且安装好SteamTools或者GreenLuma  
+然后打开Onekey输入App ID即可使用
 
 ## 开发
 本程序使用Python编程语言开发   
-要求环境：   
+要求环境:    
 1.Python 3.10及以上   
 2.Windows 10及以上   
 3.使用Git进行版本管理   
@@ -38,7 +39,7 @@ pip install -r requirements.txt
 ## 项目协议
  本项目基于 GPL-3.0 许可证发行，以下协议是对于 GPL-3.0 原协议的补充，如有冲突，以以下协议为准。
 
- 词语约定：“使用者”指签署本协议的使用者;“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
+ 词语约定: “使用者”指签署本协议的使用者;“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
 
  本项目的数据来源原理是从Steam官方的CDN服务器中拉取游戏清单数据，经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的准确性负责。
  使用本项目的过程中可能会产生版权数据，对于这些版权数据，本项目不拥有它们的所有权，为了避免造成侵权，使用者务必在24 小时内清除使用本项目的过程中所产生的版权数据。
@@ -64,7 +65,6 @@ pip install -r requirements.txt
 查看 [FAQ](https://ikunshare.com/d/49) 获取常见问题的解答。
 
 ## 社区和支持
-加入我们的社区，参与讨论和支持：
+加入我们的社区，参与讨论和支持: 
 - [GitHub Discussions](https://github.com/ikunshare/Onekey/discussions)
-- [QQ](https://qm.qq.com/q/d7sWovfAGI)
 - [Telegram](https://t.me/ikunshare_qun)

common/check.py

@@ -1,32 +1,36 @@
 import time
+import ujson as json
 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))
-                
+                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请求数检查失败, 网络错误')
-    
+
     except KeyboardInterrupt:
-        log.info("\n 程序已退出")
+        log.info("程序已退出")
     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:

common/checkcn.py

@@ -1,25 +1,27 @@
 import os
-import requests
+import aiohttp
+import ujson as json
 from .log import log
 from .stack_error import stack_error
 
-def checkcn():
+
+async def checkcn(client) -> bool:
     try:
-        req = requests.get('https://mips.kugou.com/check/iscn?&format=json')
-        req.raise_for_status()
-        body = req.json()
+        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")
+            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 requests.RequestException as e:
+        log.info("程序已退出")
+    except aiohttp.ClientError as e:
         os.environ['IS_CN'] = 'yes'
         log.warning('检查服务器位置失败，已忽略，自动认为你在中国大陆')
         log.warning(stack_error(e))

common/config.py

@@ -9,21 +9,23 @@ from .log import log
 DEFAULT_CONFIG = {
     "Github_Personal_Token": "",
     "Custom_Steam_Path": "",
-    "QA1": "温馨提示：Github_Personal_Token可在Github设置的最底下开发者选项找到，详情看教程",
+    "QA1": "温馨提示: Github_Personal_Token可在Github设置的最底下开发者选项找到，详情看教程",
     "教程": "https://ikunshare.com/Onekey_tutorial"
 }
 
+
 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 程序已退出")
+        log.info("程序已退出")
     except Exception as e:
         log.error(f'配置文件生成失败,{stack_error(e)}')
 
+
 async def load_config():
     if not os.path.exists('./config.json'):
         await gen_config_file()
@@ -35,7 +37,7 @@ async def load_config():
             config = json.loads(await f.read())
             return config
     except KeyboardInterrupt:
-        log.info("\n 程序已退出")
+        log.info("程序已退出")
     except Exception as e:
         log.error(f"配置文件加载失败，原因: {stack_error(e)},重置配置文件中...")
         os.remove("./config.json")

common/dkey_merge.py

@@ -6,6 +6,7 @@ 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:
@@ -15,27 +16,28 @@ async def depotkey_merge(config_path: Path, depots_config: dict) -> bool:
     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配置, 请检查配置文件')
             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('成功合并')
         return True
-        
+
     except KeyboardInterrupt:
-        log.info("\n 程序已退出")
+        log.info("程序已退出")
     except Exception as e:
         async with lock:
             log.error(f'合并失败, 原因: {e}')

common/dl.py

@@ -1,7 +1,6 @@
 import os
 from aiohttp import ClientError, ConnectionTimeoutError
-from tqdm.asyncio import tqdm_asyncio
-
+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:
@@ -26,23 +25,30 @@ async def get(sha: str, path: str, repo: str, session, chunk_size: int = 1024) -
                         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:
+                        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)
-                                pbar.update(len(chunk))
-                        
+                                progress.update(task, advance=len(chunk))
+
                         return content
                     else:
                         log.error(f'获取失败: {path} - 状态码: {response.status}')
             except KeyboardInterrupt:
-                log.info("\n 程序已退出")
+                log.info("程序已退出")
             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,14 +3,14 @@ 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)
 
@@ -37,7 +37,7 @@ async def get_manifest(sha: str, path: str, steam_path: Path, repo: str, session
             ]
 
     except KeyboardInterrupt:
-        log.info("\n 程序已退出")
+        log.info("程序已退出")
     except Exception as e:
         log.error(f'处理失败: {path} - {stack_error(e)}')
         raise

common/get_steam_path.py

@@ -5,18 +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 程序已退出")
+        log.info("程序已退出")
     except Exception as e:
         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,7 +1,3 @@
-from colorama import Fore, Back, Style, init
-
-init()
-
 from .log import log
 
 def init():
@@ -15,10 +11,11 @@ def init():
     ]
     for line in banner_lines:
         log.info(line)
-    
+
     log.info(f'作者: ikun0014')
     log.warning(f'本项目采用GNU General Public License v3开源许可证，请勿用于商业用途')
-    log.info(f'版本: 1.3.0')
-    log.info(f'项目Github仓库: https://github.com/ikunshare/Onekey')
+    log.info(f'版本: 1.3.3')
+    log.info(f'项目Github仓库: https://github.com/ikunshare/Onekey \n Gitee: https://gitee.com/ikun0014/Onekey')
     log.info(f'官网: ikunshare.com')
-    log.warning(f'本项目完全开源免费, 如果你在淘宝, QQ群内通过购买方式获得, 赶紧回去骂商家死全家\n   交流群组:\n    https://t.me/ikunshare_qun')
+    log.warning(
+        f'本项目完全开源免费, 如果你在淘宝, QQ群内通过购买方式获得, 赶紧回去骂商家死全家\n   交流群组:\n    https://t.me/ikunshare_qun')

common/log.py

@@ -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,27 +1,29 @@
 import os
-from aiohttp import ClientSession, ConnectionTimeoutError
+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 程序已退出")
+        log.info("程序已退出")
     except Exception as e:
         log.error(f'获取信息失败: {stack_error(e)}')
         return None
@@ -29,7 +31,8 @@ async def fetch_branch_info(session, url, headers):
         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
 
@@ -44,32 +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无效')
         return False
+
     app_id = app_id_list[0]
-    
-    checkcn()
 
     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']:
@@ -80,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'清单最后更新时间: {latest_date}')
                         log.info(f'入库成功: {app_id}')
                         os.system('pause')
                         return True
-            
+
         log.error(f'清单下载或生成失败: {app_id}')
         os.system('pause')
         return False

common/migration.py

@@ -2,7 +2,7 @@ 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
 
@@ -11,6 +11,7 @@ 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 安装程序...')
     try:
@@ -18,24 +19,32 @@ async def download_setup_file(session) -> None:
             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('安装程序下载完成')
             else:
                 log.error('网络错误，无法下载安装程序')
     except KeyboardInterrupt:
-        log.info("\n 程序已退出")
+        log.info("程序已退出")
     except Exception as 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,尝试迁移旧文件')

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

@@ -2,9 +2,8 @@ import os
 import asyncio
 import subprocess
 import aiofiles
-
-from .log import log
 from .get_steam_path import steam_path
+from .log import log
 
 lock = asyncio.Lock()
 
@@ -24,7 +23,7 @@ async def stool_add(depot_data: list, app_id: str) -> bool:
             log.info(f'正在处理文件: {lua_filepath}')
 
             result = subprocess.run(
-                [str(luapacka_path), str(lua_filepath)], 
+                [str(luapacka_path), str(lua_filepath)],
                 capture_output=True
             )
             if result.returncode != 0:
@@ -33,13 +32,45 @@ async def stool_add(depot_data: list, app_id: str) -> bool:
 
             log.info('处理完成')
         except KeyboardInterrupt:
-            log.info("\n 程序已退出")
+            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}')
+                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,4 +1,5 @@
 import sys
+import os
 import asyncio
 import re
 
@@ -9,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()
@@ -20,30 +24,34 @@ repos = [
     'tymolu233/ManifestAutoUpdate',
 ]
 
+
 def prompt_app_id():
     while True:
-        app_id = input(f"{Fore.CYAN}{Back.BLACK}{Style.BRIGHT}请输入游戏AppID: {Style.RESET_ALL}").strip()
+        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}")
 
+
 async def main_loop():
     while True:
         try:
             app_id = prompt_app_id()
             await main(app_id, repos)
         except KeyboardInterrupt:
-            log.info("\n 程序已退出")
+            log.info("程序已退出")
         except EOFError:
             break
 
+
 async def run():
     try:
         log.info('App ID可以在SteamDB或Steam商店链接页面查看')
         await main_loop()
     except KeyboardInterrupt:
-        log.info("\n 程序已退出")
+        log.info("程序已退出")
     except Exception as e:
         log.error(f'发生错误: {stack_error(e)}, 将在5秒后退出')
         await asyncio.sleep(5)
@@ -52,6 +60,6 @@ if __name__ == '__main__':
     try:
         asyncio.run(run())
     except KeyboardInterrupt:
-        log.info("\n 程序已退出")
+        log.info("程序已退出")
     except SystemExit:
         sys.exit()

package.json

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

requirements.txt

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