feat: 增加一个清单库

史中史代码，看不懂与我无关

.gitignore

@@ -168,3 +168,4 @@ cython_debug/
 *.bat
 *.xml
 *.exe
+*.dll

README.md

@@ -25,7 +25,7 @@
  使用本项目的过程中可能会产生版权数据，对于这些版权数据，本项目不拥有它们的所有权，为了避免造成侵权，使用者务必在24 小时内清除使用本项目的过程中所产生的版权数据。
  由于使用本项目产生的包括由于本协议或由于使用或无法使用本项目而引起的任何性质的任何直接、间接、特殊、偶然或结果性损害（包括但不限于因商誉损失、停工、计算机故障或故障引起的损害赔偿，或任何及所有其他商业损害或损失）由使用者负责。
  本项目完全免费，且开源发布于 GitHub 面向全世界人用作对技术的学习交流，本项目不对项目内的技术可能存在违反当地法律法规的行为作保证，禁止在违反当地法律法规的情况下使用本项目，对于使用者在明知或不知当地法律法规不允许的情况下使用本项目所造成的任何违法违规行为由使用者承担，本项目不承担由此造成的任何直接、间接、特殊、偶然或结果性责任。
- 而且，本项目已禁止使用于商业用途。
+ 而且，本项目已禁止使用于商业用途，以及不得进行未经允许的二次修改，否则必须同时发布源代码。
  若你使用了本项目，将代表你接受以上协议。
 
  Steam正版平台不易，请尊重版权，支持正版。  

main.py

@@ -2,7 +2,6 @@ import os
 import vdf
 import winreg
 import argparse
-import aiohttp
 import aiofiles
 import traceback
 import subprocess
@@ -13,6 +12,7 @@ import time
 import sys
 import psutil
 import asyncio
+from aiohttp import ClientSession, ClientError
 from pathlib import Path
 
 # 初始化日志记录器
@@ -40,7 +40,7 @@ def gen_config_file():
     default_config = {"Github_Persoal_Token": "", "Custom_Steam_Path": ""}
     with open('./config.json', 'w', encoding='utf-8') as f:
         json.dump(default_config, f)
-    log.info('程序可能为第一次启动，请填写配置文件后重新启动程序')
+    log.info(' 🖱️ 程序可能为第一次启动，请填写配置文件后重新启动程序')
 
 
 # 加载配置文件
@@ -60,19 +60,18 @@ config = load_config()
 lock = asyncio.Lock()
 
 
-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 | | | | | |\   | |  __|  | |\ \   |  __|    \  /')
-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('\033[1;32;40m | |_| | | | \\  | | |___  | | \\ \\  | |___    / /' + '\033[0m')
+print('\033[1;32;40m \\_____/ |_|  \\_| |_____| |_|  \\_\\ |_____|  /_/' + '\033[0m')
 log.info('作者ikun0014')
 log.info('本项目基于wxy1343/ManifestAutoUpdate进行修改，采用GPL V3许可证')
-log.info('版本：1.0.4')
+log.info('版本：1.1.0')
 log.info('项目仓库：https://github.com/ikunshare/Onekey')
 log.debug('官网：ikunshare.com')
-log.warning('注意：据传Steam新版本对部分解锁工具进行了检测，但目前未发现问题，如果你被封号可以issue反馈')
-log.warning('本项目完全免费，如果你在淘宝，QQ群内通过购买方式获得，赶紧回去骂商家死全家\n交流群组：\n点击链接加入群聊【ikun分享】：https://qm.qq.com/q/D9Uiva3RVS\nhttps://t.me/ikunshare_group')
+log.warning('本项目完全开源免费，如果你在淘宝，QQ群内通过购买方式获得，赶紧回去骂商家死全家\n交流群组：\n点击链接加入群聊【𝗶𝗸𝘂𝗻分享】：https://qm.qq.com/q/d7sWovfAGI\nhttps://t.me/ikunshare_group')
 
 
 # 通过注册表获取Steam安装路径
@@ -98,62 +97,52 @@ def stack_error(exception):
 
 
 # 下载清单
-async def get(sha, path):
+async def get(sha, path, repo, session):
     url_list = [
-        f'https://gcore.jsdelivr.net/gh/{repo}@{sha}/{path}',
-        f'https://fastly.jsdelivr.net/gh/{repo}@{sha}/{path}',
-        f'https://cdn.jsdelivr.net/gh/{repo}@{sha}/{path}',
-        f'https://github.moeyy.xyz/https://raw.githubusercontent.com/{repo}/{sha}/{path}',
+        f'https://gh.api.99988866.xyz/https://raw.githubusercontent.com/{repo}/{sha}/{path}',
         f'https://mirror.ghproxy.com/https://raw.githubusercontent.com/{repo}/{sha}/{path}',
-        f'https://ghproxy.org/https://raw.githubusercontent.com/{repo}/{sha}/{path}',
-        f'https://raw.githubusercontent.com/{repo}/{sha}/{path}'
+        f'https://raw.githubusercontent.com/{repo}/{sha}/{path}',
+        f'https://gh.jiasu.in/https://raw.githubusercontent.com/{repo}/{sha}/{path}'
     ]
     retry = 3
-    async with aiohttp.ClientSession() as session:
-        while retry:
-            for url in url_list:
-                try:
-                    async with session.get(url, ssl=False) as r:
-                        if r.status == 200:
-                            return await r.read()
-                        else:
-                            log.error(f'获取失败: {path} - 状态码: {r.status}')
-                except aiohttp.ClientError:
-                    log.error(f'获取失败: {path} - 连接错误')
-            retry -= 1
-            log.warning(f'重试剩余次数: {retry} - {path}')
-    log.error(f'超过最大重试次数: {path}')
-    raise Exception(f'Failed to download: {path}')
+    while retry:
+        for url in url_list:
+            try:
+                async with session.get(url, ssl=False) as r:
+                    if r.status == 200:
+                        return await r.read()
+                    else:
+                        log.error(f' 🔄 获取失败: {path} - 状态码: {r.status}')
+            except ClientError:
+                log.error(f' 🔄 获取失败: {path} - 连接错误')
+        retry -= 1
+        log.warning(f'  🔄  重试剩余次数: {retry} - {path}')
+    log.error(f'  🔄 超过最大重试次数: {path}')
+    raise Exception(f'  🔄 无法下载: {path}')
 
 
 # 获取清单信息
-async def get_manifest(sha, path, steam_path: Path):
+async def get_manifest(sha, path, steam_path: Path, repo, session):
     collected_depots = []
     try:
         if path.endswith('.manifest'):
             depot_cache_path = steam_path / 'depotcache'
-            async with lock:
-                if not depot_cache_path.exists():
-                    depot_cache_path.mkdir(exist_ok=True)
+            if not depot_cache_path.exists():
+                depot_cache_path.mkdir(exist_ok=True)
             save_path = depot_cache_path / path
             if save_path.exists():
-                async with lock:
-                    log.warning(f'已存在清单: {path}')
+                log.warning(f'👋已存在清单: {path}')
                 return collected_depots
-            content = await get(sha, path)
-            async with lock:
-                log.info(f'清单下载成功: {path}')
+            content = await get(sha, path, repo, session)
+            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)
-            async with lock:
-                log.info(f'密钥下载成功: {path}')
+            content = await get(sha, path, repo, session)
+            log.info(f' 🔄 密钥下载成功: {path}')
             depots_config = vdf.loads(content.decode(encoding='utf-8'))
             for depot_id, depot_info in depots_config['depots'].items():
                 collected_depots.append((depot_id, depot_info['DecryptionKey']))
-    except KeyboardInterrupt:
-        raise
     except Exception as e:
         log.error(f'处理失败: {path} - {stack_error(e)}')
         traceback.print_exc()
@@ -165,7 +154,7 @@ async def get_manifest(sha, path, steam_path: Path):
 async def depotkey_merge(config_path, depots_config):
     if not config_path.exists():
         async with lock:
-            log.error('Steam默认配置不存在，可能是没有登录账号')
+            log.error(' 👋 Steam默认配置不存在，可能是没有登录账号')
         return
     with open(config_path, encoding='utf-8') as f:
         config = vdf.load(f)
@@ -186,7 +175,7 @@ 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}')
         with open(lua_filepath, "w", encoding="utf-8") as lua_file:
             lua_file.write(f'addappid({app_id}, 1, "None")\n')
             for depot_id, depot_key in depot_data:
@@ -227,24 +216,6 @@ async def greenluma_add(depot_id_list):
     return True
 
 
-# 检测Github Api请求数量
-async def check_github_api_limit(headers):
-    url = 'https://api.github.com/rate_limit'
-    async with aiohttp.ClientSession() as session:
-        async with session.get(url, headers=headers, ssl=False) as r:
-            r_json = await r.json()
-            remain_limit = r_json['rate']['remaining']
-            use_limit = r_json['rate']['used']
-            reset_time = r_json['rate']['reset']
-            f_reset_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(reset_time))
-            log.info(f'已用Github请求数：{use_limit}')
-            log.info(f'剩余Github请求数：{remain_limit}')
-            if r.status == 429:
-                log.info(f'你的Github Api请求数已超限，请尝试增加Persoal Token')
-                log.info(f'请求数重置时间：{f_reset_time}')
-    return True
-
-
 # 检查进程是否运行
 def check_process_running(process_name):
     for process in psutil.process_iter(['name']):
@@ -253,51 +224,87 @@ def check_process_running(process_name):
     return False
 
 
+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:
+        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}')
+
+    if remaining_requests == 0:
+        log.warning(f' ⚠ GitHub API 请求数已用尽，将在 {reset_time_formatted} 重置, 不想等生成一个填配置文件里')
+
+
 # 主函数
 async def main(app_id):
-    app_id_list = list(filter(str.isdecimal, app_id.strip().split('-')))
-    app_id = app_id_list[0]
-    github_token = config.get("Github_Persoal_Token", "")
-    headers = {'Authorization': f'Bearer {github_token}'} if github_token else None
+    async with ClientSession() as session:
+        github_token = config.get("Github_Persoal_Token", "")
+        headers = {'Authorization': f'Bearer {github_token}'} if github_token else None
+        latest_date = None
+        selected_repo = None
 
-    await check_github_api_limit(headers)
+        # 检查Github API限额
+        await check_github_api_rate_limit(headers, session)
 
-    url = f'https://api.github.com/repos/{repo}/branches/{app_id}'
-    async with aiohttp.ClientSession() as session:
-        async with session.get(url, headers=headers, ssl=False) as r:
-            r_json = await r.json()
-            if 'commit' in r_json:
-                sha = r_json['commit']['sha']
-                url = r_json['commit']['commit']['tree']['url']
-                date = r_json['commit']['commit']['author']['date']
-                async with session.get(url, headers=headers, ssl=False) as r2:
-                    r2_json = await r2.json()
-                    if 'tree' in r2_json:
-                        collected_depots = []
-                        for i in r2_json['tree']:
-                            result = await get_manifest(sha, i['path'], steam_path)
-                            collected_depots.extend(result)
-                        if collected_depots:
-                            if isSteamTools:
-                                await stool_add(collected_depots, app_id)
-                                log.info('找到SteamTools，已添加解锁文件')
-                            if isGreenLuma:
-                                await greenluma_add([app_id])
-                                depot_config = {'depots': {depot_id: {'DecryptionKey': depot_key} for depot_id, depot_key in collected_depots}}
-                                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}')
-                            return True
-    log.error(f'清单下载或生成.st失败: {app_id}')
-    return False
+        for repo in repos:
+            url = f'https://api.github.com/repos/{repo}/branches/{app_id}'
+            try:
+                async with session.get(url, headers=headers, ssl=False) as r:
+                    r_json = await r.json()
+                    if 'commit' in r_json:
+                        date = r_json['commit']['commit']['author']['date']
+                        if latest_date is None or date > latest_date:
+                            latest_date = date
+                            selected_repo = repo
+            except Exception as e:
+                log.error(f' ⚠ 获取分支信息失败: {stack_error(e)}')
+                traceback.print_exc()
+        if 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()
+                if 'commit' in r_json:
+                    sha = r_json['commit']['sha']
+                    url = r_json['commit']['commit']['tree']['url']
+                    async with session.get(url, headers=headers, ssl=False) as r2:
+                        r2_json = await r2.json()
+                        if 'tree' in r2_json:
+                            collected_depots = []
+                            for i in r2_json['tree']:
+                                result = await get_manifest(sha, i['path'], steam_path, selected_repo, session)
+                                collected_depots.extend(result)
+                            if collected_depots:
+                                if isSteamTools:
+                                    await stool_add(collected_depots, app_id)
+                                    log.info(' ✅ 找到SteamTools，已添加解锁文件')
+                                if isGreenLuma:
+                                    await greenluma_add([app_id])
+                                    depot_config = {'depots': {depot_id: {'DecryptionKey': depot_key} for depot_id, depot_key in collected_depots}}
+                                    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}')
+                                return True
+        log.error(f' ⚠ 清单下载或生成失败: {app_id}')
+        return False
 
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-a', '--app-id')
 args = parser.parse_args()
-repo = 'ManifestHub/ManifestHub'
+repos = [
+         'ManifestHub/ManifestHub',
+         'ikun0014/ManifestHub'
+        ]
 if __name__ == '__main__':
     try:
         log.debug('App ID可以在SteamDB或Steam商店链接页面查看')
@@ -305,7 +312,7 @@ if __name__ == '__main__':
     except KeyboardInterrupt:
         exit()
     except Exception as e:
-        log.error(f'发生错误: {stack_error(e)}')
+        log.error(f' ⚠ 发生错误: {stack_error(e)}')
         traceback.print_exc()
     if not args.app_id:
         os.system('pause')