From 062e58ea57e8abe1ae01ff83ad49b1598a4f3ac9 Mon Sep 17 00:00:00 2001 From: ikun0014 Date: Fri, 18 Oct 2024 21:22:21 +0800 Subject: [PATCH] =?UTF-8?q?ui:=20=E4=B8=BA=E4=BA=86=E6=8B=96=E6=85=A2?= =?UTF-8?q?=E5=90=84=E4=BD=8D=E7=9A=84=E6=97=B6=E9=97=B4=E6=88=91=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AA=E9=80=86=E5=A4=A9=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 79 ++++++++++++++++++++ .github/workflows/{build.yml => release.yml} | 1 + README.md | 35 ++++----- common/check.py | 19 ++--- common/checkcn.py | 11 ++- common/config.py | 14 ++-- common/dkey_merge.py | 12 ++- common/get_manifest_info.py | 10 +-- common/get_steam_path.py | 4 +- common/init_text.py | 42 ++++++----- common/log.py | 34 ++------- common/main_func.py | 20 ++--- common/manifest_down.py | 12 +-- common/migration.py | 22 +++--- common/st_unlock.py | 14 ++-- main.py | 10 +-- requirements.txt | 2 +- 17 files changed, 199 insertions(+), 142 deletions(-) create mode 100644 .github/workflows/ci.yml rename .github/workflows/{build.yml => release.yml} (97%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..99532fc --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,79 @@ +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: ${{ 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 + + - name: Create git tag + uses: pkgdeps/git-tag-action@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + github_repo: ${{ github.repository }} + version: ${{ env.PACKAGE_VERSION }} + git_commit_sha: ${{ github.sha }} + git_tag_prefix: "v" + + - name: Release + uses: softprops/action-gh-release@v2 + with: + tag_name: v${{ env.PACKAGE_VERSION }} + files: build/Onekey---v${{ env.PACKAGE_VERSION }}.exe + prerelease: false + draft: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload to Telegram Channel + run: | + & curl -F "chat_id=${{ secrets.TELEGRAM_TO }}" ` + -F "document=@build/Onekey---v${{ env.PACKAGE_VERSION }}.exe" ` + -F "caption=Onekey's New CI Build ${{ env.PACKAGE_VERSION }}" ` + -F "parse_mode=Markdown" ` + "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendDocument" diff --git a/.github/workflows/build.yml b/.github/workflows/release.yml similarity index 97% rename from .github/workflows/build.yml rename to .github/workflows/release.yml index 061b943..d9fec37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: jobs: build: + if: contains(github.event.head_commit.message, '[release]') permissions: contents: write runs-on: windows-2019 diff --git a/README.md b/README.md index 2cf868f..1fd465b 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,10 @@ ## Onekey - Onekey Steam Depot Manifest Downloader +Onekey Steam Depot Manifest Downloader ## 使用方法 - 先去Release下最新发布，然后去steamtools官网下steamtools，日志会有点石介意别用 +先去Release下最新发布，然后去steamtools官网下steamtools，日志会有点石介意别用 ## 开发 本程序使用Python编程语言开发 @@ -36,35 +36,36 @@ pip install -r requirements.txt ``` ## 项目协议 - 本项目基于 GPL-3.0 许可证发行，以下协议是对于 GPL-3.0 原协议的补充，如有冲突，以以下协议为准。 +本项目基于 GPL-3.0 许可证发行，以下协议是对于 GPL-3.0 原协议的补充，如有冲突，以以下协议为准。 - 词语约定：“使用者”指签署本协议的使用者;“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。 +词语约定：“使用者”指签署本协议的使用者;“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。 - 本项目的数据来源原理是从Steam官方的CDN服务器中拉取游戏清单数据，经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的准确性负责。 - 使用本项目的过程中可能会产生版权数据，对于这些版权数据，本项目不拥有它们的所有权，为了避免造成侵权，使用者务必在24 小时内清除使用本项目的过程中所产生的版权数据。 - 由于使用本项目产生的包括由于本协议或由于使用或无法使用本项目而引起的任何性质的任何直接、间接、特殊、偶然或结果性损害（包括但不限于因商誉损失、停工、计算机故障或故障引起的损害赔偿，或任何及所有其他商业损害或损失）由使用者负责。 - 本项目完全免费，且开源发布于 GitHub 面向全世界人用作对技术的学习交流，本项目不对项目内的技术可能存在违反当地法律法规的行为作保证，禁止在违反当地法律法规的情况下使用本项目，对于使用者在明知或不知当地法律法规不允许的情况下使用本项目所造成的任何违法违规行为由使用者承担，本项目不承担由此造成的任何直接、间接、特殊、偶然或结果性责任。 - 而且，本项目已禁止使用于商业用途，以及不得进行未经允许的二次修改，否则必须同时发布源代码。 - 若你使用了本项目，将代表你接受以上协议。 +本项目的数据来源原理是从Steam官方的CDN服务器中拉取游戏清单数据，经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的准确性负责。 +使用本项目的过程中可能会产生版权数据，对于这些版权数据，本项目不拥有它们的所有权，为了避免造成侵权，使用者务必在24 小时内清除使用本项目的过程中所产生的版权数据。 +由于使用本项目产生的包括由于本协议或由于使用或无法使用本项目而引起的任何性质的任何直接、间接、特殊、偶然或结果性损害（包括但不限于因商誉损失、停工、计算机故障或故障引起的损害赔偿，或任何及所有其他商业损害或损失）由使用者负责。 +本项目完全免费，且开源发布于 GitHub 面向全世界人用作对技术的学习交流，本项目不对项目内的技术可能存在违反当地法律法规的行为作保证，禁止在违反当地法律法规的情况下使用本项目，对于使用者在明知或不知当地法律法规不允许的情况下使用本项目所造成的任何违法违规行为由使用者承担，本项目不承担由此造成的任何直接、间接、特殊、偶然或结果性责任。 +而且，本项目已禁止使用于商业用途，以及不得进行未经允许的二次修改，否则必须同时发布源代码。 +若你使用了本项目，将代表你接受以上协议。 - Steam正版平台不易，请尊重版权，支持正版。 - 本项目仅用于对技术可行性的探索及研究，不接受任何商业（包括但不限于广告等）合作。 +Steam正版平台不易，请尊重版权，支持正版。 +本项目仅用于对技术可行性的探索及研究，不接受任何商业（包括但不限于广告等）合作。 ## Star 趋势图 - [![Stargazers over time](https://starchart.cc/ikunshare/Onekey.svg)](https://starchart.cc/ikunshare/Onekey) +[![Stargazers over time](https://starchart.cc/ikunshare/Onekey.svg)](https://starchart.cc/ikunshare/Onekey) ## 贡献者 - - - + + + ## 常见问题解答（FAQ） 查看 [FAQ](https://ikunshare.com/d/49) 获取常见问题的解答。 ## 社区和支持 加入我们的社区，参与讨论和支持： +- [ikun论坛](https://ikunshare.com) - [GitHub Discussions](https://github.com/ikunshare/Onekey/discussions) -- [QQ](https://qm.qq.com/q/d7sWovfAGI) - [Telegram](https://t.me/ikunshare_qun) +- [Telegram Channel](https://t.me/ikunshare_channel) \ No newline at end of file diff --git a/common/check.py b/common/check.py index 75612bc..aa3fa7d 100644 --- a/common/check.py +++ b/common/check.py @@ -4,10 +4,8 @@ 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: + async with session.get('https://api.github.com/rate_limit', headers=headers, ssl=False) as r: r_json = await r.json() if r.status == 200: @@ -16,18 +14,17 @@ async def check_github_api_rate_limit(headers, session): 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}') + log(f'🔄 剩余请求次数: {remaining_requests}') if remaining_requests == 0: - log.warning(f'⚠ GitHub API 请求数已用尽, 将在 {reset_time_formatted} 重置,建议生成一个填在配置文件里') + log(f'⚠ GitHub API 请求数已用尽, 将在 {reset_time_formatted} 重置,建议生成一个填在配置文件里') else: - log.error('⚠ Github请求数检查失败, 网络错误') - + log('⚠ Github请求数检查失败, 网络错误') except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except ClientError as e: - log.error(f'⚠ 检查Github API 请求数失败,{stack_error(e)}') + log(f'⚠ 检查Github API 请求数失败,{stack_error(e)}') except ConnectionTimeoutError as e: - log.error(f'⚠ 检查Github API 请求数超时: {stack_error(e)}') + log(f'⚠ 检查Github API 请求数超时: {stack_error(e)}') except Exception as e: - log.error(f'⚠ 发生错误: {stack_error(e)}') + log(f'⚠ 发生错误: {stack_error(e)}') diff --git a/common/checkcn.py b/common/checkcn.py index 546fbe8..63ec92c 100644 --- a/common/checkcn.py +++ b/common/checkcn.py @@ -3,24 +3,23 @@ import requests from .log import log from .stack_error import stack_error -def checkcn(): +def checkcn() -> bool: try: req = requests.get('https://mips.kugou.com/check/iscn?&format=json') req.raise_for_status() body = req.json() scn = bool(body['flag']) if not scn: - log.info(f"❌ 您在非中国大陆地区({body['country']})上使用了项目, 已自动切换回Github官方下载CDN") + log(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👋 程序已退出") + log("👋 程序已退出") except requests.RequestException as e: os.environ['IS_CN'] = 'yes' - log.warning('❗ 检查服务器位置失败，已忽略，自动认为你在中国大陆') - log.warning(stack_error(e)) + log('❗ 检查服务器位置失败，已忽略，自动认为你在中国大陆') + log(stack_error(e)) return False diff --git a/common/config.py b/common/config.py index 67b38b5..64c0bb0 100644 --- a/common/config.py +++ b/common/config.py @@ -9,7 +9,7 @@ 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" } @@ -17,27 +17,25 @@ 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('🖱️ 程序可能为第一次启动或配置重置,请填写配置文件后重新启动程序') except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except Exception as e: - log.error(f'❌ 配置文件生成失败,{stack_error(e)}') + log(f'❌ 配置文件生成失败,{stack_error(e)}') async def load_config(): if not os.path.exists('./config.json'): await gen_config_file() os.system('pause') sys.exit() - try: async with aiofiles.open("./config.json", mode="r", encoding="utf-8") as f: config = json.loads(await f.read()) return config except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except Exception as e: - log.error(f"配置文件加载失败，原因: {stack_error(e)},重置配置文件中...") + log(f"配置文件加载失败，原因: {stack_error(e)},重置配置文件中...") os.remove("./config.json") await gen_config_file() os.system('pause') diff --git a/common/dkey_merge.py b/common/dkey_merge.py index eddc8c1..6d60c75 100644 --- a/common/dkey_merge.py +++ b/common/dkey_merge.py @@ -9,9 +9,8 @@ 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('👋 Steam默认配置不存在, 可能是没有登录账号') return False - try: async with aiofiles.open(config_path, encoding='utf-8') as f: content = await f.read() @@ -21,7 +20,7 @@ async def depotkey_merge(config_path: Path, depots_config: dict) -> bool: config.get('InstallConfigStore', {}).get('Software', {}).get('valve') if steam is None: - log.error('⚠ 找不到Steam配置, 请检查配置文件') + log('⚠ 找不到Steam配置, 请检查配置文件') return False depots = steam.setdefault('depots', {}) @@ -31,12 +30,11 @@ async def depotkey_merge(config_path: Path, depots_config: dict) -> bool: new_context = vdf.dumps(config, pretty=True) await f.write(new_context) - log.info('✅ 成功合并') + log('✅ 成功合并') return True - except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except Exception as e: async with lock: - log.error(f'❌ 合并失败, 原因: {e}') + log(f'❌ 合并失败, 原因: {e}') return False diff --git a/common/get_manifest_info.py b/common/get_manifest_info.py index 7708f85..6a288a3 100644 --- a/common/get_manifest_info.py +++ b/common/get_manifest_info.py @@ -17,18 +17,18 @@ async def get_manifest(sha: str, path: str, steam_path: Path, repo: str, session if path.endswith('.manifest'): save_path = depot_cache_path / path if save_path.exists(): - log.warning(f'👋 已存在清单: {save_path}') + log(f'👋 已存在清单: {save_path}') return collected_depots content = await get(sha, path, repo, session) - log.info(f'🔄 清单下载成功: {path}') + log(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(f'🔄 密钥下载成功: {path}') depots_config = vdf.loads(content.decode('utf-8')) collected_depots = [ @@ -37,9 +37,9 @@ async def get_manifest(sha: str, path: str, steam_path: Path, repo: str, session ] except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except Exception as e: - log.error(f'❌ 处理失败: {path} - {stack_error(e)}') + log(f'❌ 处理失败: {path} - {stack_error(e)}') raise return collected_depots diff --git a/common/get_steam_path.py b/common/get_steam_path.py index 9271421..aeddf08 100644 --- a/common/get_steam_path.py +++ b/common/get_steam_path.py @@ -13,9 +13,9 @@ def get_steam_path() -> Path: 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("👋 程序已退出") + log("👋 程序已退出") except Exception as e: - log.error(f'❌ Steam路径获取失败, {stack_error(e)}, 请检查是否正确安装Steam') + log(f'❌ Steam路径获取失败, {stack_error(e)}, 请检查是否正确安装Steam') os.system('pause') return Path() diff --git a/common/init_text.py b/common/init_text.py index 5c380b1..e4f7eaa 100644 --- a/common/init_text.py +++ b/common/init_text.py @@ -1,25 +1,27 @@ -from colorama import Fore, Back, Style, init - -init() +from terminaltexteffects.effects.effect_print import Print 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}", - ] - for line in banner_lines: - print(line) + text = ( + " _____ __ _ _____ _ _ _____ __ __ \n" + " / _ \\ | \\ | | | ____| | | / / | ____| \\ \\ / /\n" + " | | | | | \\| | | |__ | |/ / | |__ \\ \\/ /\n" + " | | | | | |\\ | | __| | |\\ \\ | __| \\ / \n" + " | |_| | | | \\ | | |___ | | \\ \\ | |___ / / \n" + " \\_____/ |_| \\_| |_____| |_| \\_\\ |_____| /_/ " + ) - log.info(f'作者: {Fore.RED}{Back.BLACK}{Style.BRIGHT}ikun0014{Style.RESET_ALL}') - log.info(f'{Fore.RED}{Back.BLACK}{Style.BRIGHT}本项目采用GNU General Public License v3开源许可证，请勿用于商业用途{Style.RESET_ALL}') - log.info('版本: 1.2.9') - log.info(f'{Fore.RED}{Back.BLACK}{Style.BRIGHT}项目Github仓库: https://github.com/ikunshare/Onekey{Style.RESET_ALL}') - log.info('官网: ikunshare.com') - log.warning('本项目完全开源免费, 如果你在淘宝, QQ群内通过购买方式获得, 赶紧回去骂商家死全家\n交流群组:\n https://t.me/ikunshare_qun') - log.warning('如果本项目中的Emoji(即表情包)无法正常显示, 请使用支持Emoji的终端(例如Windows Terminal)') + effect = Print(text) + + with effect.terminal_output() as terminal: + for frame in effect: + terminal.print(frame) + + log(f'作者: ikun0014') + log(f'本项目采用GNU General Public License v3开源许可证，请勿用于商业用途') + log('版本: 1.3.0') + log(f'项目Github仓库: https://github.com/ikunshare/Onekey') + log('官网: ikunshare.com') + log('本项目完全开源免费, 如果你在淘宝, QQ群内通过购买方式获得, 赶紧回去骂商家死全家\n交流群组:\n https://t.me/ikunshare_qun') + log('如果本项目中的Emoji(即表情包)无法正常显示, 请使用支持Emoji的终端(例如Windows Terminal)') diff --git a/common/log.py b/common/log.py index fbe93a2..ae88ef7 100644 --- a/common/log.py +++ b/common/log.py @@ -1,29 +1,11 @@ -import logging -import colorlog +from terminaltexteffects.effects.effect_print import Print -LOG_FORMAT = '%(log_color)s[%(name)s][%(levelname)s]%(message)s' -LOG_COLORS = { - 'INFO': 'cyan', - 'WARNING': 'yellow', - 'ERROR': 'red', - 'CRITICAL': 'purple', -} - -def init_log(level=logging.DEBUG) -> logging.Logger: - logger = logging.getLogger('Onekey') - logger.setLevel(level) - - stream_handler = logging.StreamHandler() - stream_handler.setLevel(level) - - fmt = colorlog.ColoredFormatter(LOG_FORMAT, log_colors=LOG_COLORS) - stream_handler.setFormatter(fmt) - - # 避免重复添加处理器 - if not logger.handlers: - logger.addHandler(stream_handler) - - return logger +def logger(text): + effect = Print(text) + + with effect.terminal_output() as terminal: + for frame in effect: + terminal.print(frame) -log = init_log() +log = logger \ No newline at end of file diff --git a/common/main_func.py b/common/main_func.py index fa6dba4..c27d9e6 100644 --- a/common/main_func.py +++ b/common/main_func.py @@ -21,12 +21,12 @@ async def fetch_branch_info(session, url, headers): async with session.get(url, headers=headers, ssl=False) as response: return await response.json() except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except Exception as e: - log.error(f'⚠ 获取信息失败: {stack_error(e)}') + log(f'⚠ 获取信息失败: {stack_error(e)}') return None except ConnectionTimeoutError as e: - log.error(f'⚠ 获取信息时超时: {stack_error(e)}') + log(f'⚠ 获取信息时超时: {stack_error(e)}') return None async def get_latest_repo_info(session, repos, app_id, headers): @@ -47,7 +47,7 @@ async def get_latest_repo_info(session, repos, app_id, headers): 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(f'⚠ App ID无效') return False app_id = app_id_list[0] @@ -61,7 +61,7 @@ async def main(app_id: str, repos: list) -> bool: selected_repo, latest_date = await get_latest_repo_info(session, repos, app_id, headers) if selected_repo: - log.info(f'🔄 选择清单仓库:{selected_repo}') + log(f'🔄 选择清单仓库:{selected_repo}') url = f'https://api.github.com/repos/{selected_repo}/branches/{app_id}' r_json = await fetch_branch_info(session, url, headers) @@ -80,7 +80,7 @@ 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('✅ 找到SteamTools,已添加解锁文件') if isGreenLuma: await migrate(st_use=False, session=session) @@ -88,13 +88,13 @@ async def main(app_id: str, repos: list) -> bool: 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('✅ 找到GreenLuma,已添加解锁文件') - log.info(f'✅ 清单最后更新时间:{latest_date}') - log.info(f'✅ 入库成功: {app_id}') + log(f'✅ 清单最后更新时间:{latest_date}') + log(f'✅ 入库成功: {app_id}') os.system('pause') return True - log.error(f'⚠ 清单下载或生成失败: {app_id}') + log(f'⚠ 清单下载或生成失败: {app_id}') os.system('pause') return False diff --git a/common/manifest_down.py b/common/manifest_down.py index 2b60795..5088328 100644 --- a/common/manifest_down.py +++ b/common/manifest_down.py @@ -33,16 +33,16 @@ async def get(sha: str, path: str, repo: str, session, chunk_size: int = 1024) - return content else: - log.error(f'🔄 获取失败: {path} - 状态码: {response.status}') + log(f'🔄 获取失败: {path} - 状态码: {response.status}') except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except ClientError as e: - log.error(f'🔄 获取失败: {path} - 连接错误: {str(e)}') + log(f'🔄 获取失败: {path} - 连接错误: {str(e)}') except ConnectionTimeoutError as e: - log.error(f'🔄 连接超时: {url} - 错误: {str(e)}') + log(f'🔄 连接超时: {url} - 错误: {str(e)}') retry -= 1 - log.warning(f'🔄 重试剩余次数: {retry} - {path}') + log(f'🔄 重试剩余次数: {retry} - {path}') - log.error(f'🔄 超过最大重试次数: {path}') + log(f'🔄 超过最大重试次数: {path}') raise Exception(f'🔄 无法下载: {path}') diff --git a/common/migration.py b/common/migration.py index cf1fb81..4a1d69d 100644 --- a/common/migration.py +++ b/common/migration.py @@ -12,7 +12,7 @@ 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('🔄 开始下载 SteamTools 安装程序...') try: async with session.get(setup_url, stream=True) as r: if r.status == 200: @@ -26,19 +26,19 @@ async def download_setup_file(session) -> None: progress.update(len(chunk)) progress.close() - log.info('✅ 安装程序下载完成') + log('✅ 安装程序下载完成') else: - log.error('⚠ 网络错误，无法下载安装程序') + log('⚠ 网络错误，无法下载安装程序') except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except Exception as e: - log.error(f'⚠ 下载失败: {e}') + log(f'⚠ 下载失败: {e}') except ConnectionTimeoutError as e: - log.error(f'⚠ 下载时超时: {e}') + log(f'⚠ 下载时超时: {e}') async def migrate(st_use: bool, session) -> None: if st_use: - log.info('🔄 检测到你正在使用 SteamTools,尝试迁移旧文件') + log('🔄 检测到你正在使用 SteamTools,尝试迁移旧文件') if directory.exists(): for file in directory.iterdir(): @@ -47,11 +47,11 @@ async def migrate(st_use: bool, session) -> None: try: file.rename(directory / new_filename) - log.info(f'Renamed: {file.name} -> {new_filename}') + log(f'Renamed: {file.name} -> {new_filename}') except Exception as e: - log.error(f'⚠ 重命名失败 {file.name} -> {new_filename}: {e}') + log(f'⚠ 重命名失败 {file.name} -> {new_filename}: {e}') else: - log.error('⚠ 故障,正在重新安装 SteamTools') + log('⚠ 故障,正在重新安装 SteamTools') temp_path.mkdir(parents=True, exist_ok=True) await download_setup_file(session) @@ -61,4 +61,4 @@ async def migrate(st_use: bool, session) -> None: file.unlink() temp_path.rmdir() else: - log.info('✅ 未使用 SteamTools,停止迁移') + log('✅ 未使用 SteamTools,停止迁移') diff --git a/common/st_unlock.py b/common/st_unlock.py index 5238a90..0867e62 100644 --- a/common/st_unlock.py +++ b/common/st_unlock.py @@ -13,7 +13,7 @@ async def stool_add(depot_data: list, app_id: str) -> bool: lua_filepath = steam_path / "config" / "stplug-in" / lua_filename async with lock: - log.info(f'✅ SteamTools 解锁文件生成: {lua_filepath}') + log(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') @@ -21,25 +21,25 @@ async def stool_add(depot_data: list, app_id: str) -> bool: 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}') + log(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()}') + log(f'⚠ 调用失败: {result.stderr.decode()}') return False - log.info('✅ 处理完成') + log('✅ 处理完成') except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except Exception as e: - log.error(f'❌ 处理过程出现错误: {e}') + log(f'❌ 处理过程出现错误: {e}') return False finally: if lua_filepath.exists(): os.remove(lua_filepath) - log.info(f'🗑️ 删除临时文件: {lua_filepath}') + log(f'🗑️ 删除临时文件: {lua_filepath}') return True diff --git a/main.py b/main.py index 9a79ecb..be4863e 100644 --- a/main.py +++ b/main.py @@ -34,24 +34,24 @@ async def main_loop(): app_id = prompt_app_id() await main(app_id, repos) except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except EOFError: break async def run(): try: - log.info('❗ App ID可以在SteamDB或Steam商店链接页面查看') + log('❗ App ID可以在SteamDB或Steam商店链接页面查看') await main_loop() except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except Exception as e: - log.error(f'⚠ 发生错误: {stack_error(e)}, 将在5秒后退出') + log(f'⚠ 发生错误: {stack_error(e)}, 将在5秒后退出') await asyncio.sleep(5) if __name__ == '__main__': try: asyncio.run(run()) except KeyboardInterrupt: - log.info("\n👋 程序已退出") + log("👋 程序已退出") except SystemExit: sys.exit() diff --git a/requirements.txt b/requirements.txt index e0f5698..65a3fd5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ aiofiles==24.1.0 aiohttp==3.10.2 colorama==0.4.6 -colorlog==6.8.2 Requests==2.32.3 +terminaltexteffects==0.11.0 tqdm==4.66.5 ujson==5.10.0 vdf==3.4