Compare commits

...

4 Commits
1.0.3 ... 1.0.5

Author SHA1 Message Date
ikun
e31e1c40dc chore: 优化清单下载速度;优化界面
## 优化

清单下载速度
日志
2024-08-06 22:56:43 +08:00
ikun
630f825294 fix:关闭SSL验证以支持Watt ToolKit 2024-07-20 20:20:27 +08:00
ikun
6a4222985a Update README.md 2024-07-19 23:28:07 +08:00
ikun
61ce83ce9c Update LICENSE.md 2024-07-19 23:27:33 +08:00
2 changed files with 35 additions and 38 deletions

View File

@@ -17,7 +17,7 @@
先去Release下最新发布然后去steamtools官网下steamtools日志会有点石介意别用
## 项目协议
本项目基于 GPL V3.0 许可证发行,以下协议是对于 GPL V3.0 原协议的补充,如有冲突,以以下协议为准。
本项目基于 ACSL V2.0 许可证发行,以下协议是对于 ACSL V2.0 原协议的补充,如有冲突,以以下协议为准。
词语约定:“使用者”指签署本协议的使用者;“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。

71
main.py
View File

@@ -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,15 +60,15 @@ 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.3')
log.info('版本1.0.5')
log.info('项目仓库https://github.com/ikunshare/Onekey')
log.debug('官网ikunshare.com')
log.warning('注意据传Steam新版本对部分解锁工具进行了检测但目前未发现问题如果你被封号可以issue反馈')
@@ -103,27 +103,25 @@ async def get(sha, path):
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://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.dgithub.xyz/{repo}/{sha}/{path}'
]
retry = 3
async with aiohttp.ClientSession() as session:
while retry:
for url in url_list:
try:
async with session.get(url) as r:
async with session.get(url, ssl=False) as r:
if r.status == 200:
return await r.read()
else:
log.error(f'获取失败: {path} - 状态码: {r.status}')
log.error(f' 🔄 获取失败: {path} - 状态码: {r.status}')
except aiohttp.ClientError:
log.error(f'获取失败: {path} - 连接错误')
log.error(f' 🔄 获取失败: {path} - 连接错误')
retry -= 1
log.warning(f'重试剩余次数: {retry} - {path}')
log.error(f'超过最大重试次数: {path}')
raise Exception(f'Failed to download: {path}')
log.warning(f' 🔄 重试剩余次数: {retry} - {path}')
log.error(f' 🔄 超过最大重试次数: {path}')
raise Exception(f' 🔄 无法下载: {path}')
# 获取清单信息
@@ -138,17 +136,17 @@ async def get_manifest(sha, path, steam_path: Path):
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}')
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}')
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']))
@@ -165,7 +163,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 +184,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:
@@ -231,17 +229,17 @@ async def greenluma_add(depot_id_list):
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) as r:
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}')
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}')
log.info(f' 🔄 你的Github Api请求数已超限请尝试增加Persoal Token')
log.info(f' 🔄 请求数重置时间:{f_reset_time}')
return True
@@ -260,18 +258,17 @@ async def main(app_id):
github_token = config.get("Github_Persoal_Token", "")
headers = {'Authorization': f'Bearer {github_token}'} if github_token else None
if headers:
await check_github_api_limit(headers)
await check_github_api_limit(headers)
url = f'https://api.github.com/repos/{repo}/branches/{app_id}'
async with aiohttp.ClientSession() as session:
async with session.get(url, headers=headers) as r:
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) as r2:
async with session.get(url, headers=headers, ssl=False) as r2:
r2_json = await r2.json()
if 'tree' in r2_json:
collected_depots = []
@@ -281,17 +278,17 @@ async def main(app_id):
if collected_depots:
if isSteamTools:
await stool_add(collected_depots, app_id)
log.info('找到SteamTools已添加解锁文件')
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}')
log.info('找到GreenLuma已添加解锁文件')
log.info(f'清单最后更新时间:{date}')
log.info(f'入库成功: {app_id}')
return True
log.error(f'清单下载或生成.st失败: {app_id}')
log.error(f'清单下载或生成.st失败: {app_id}')
return False
@@ -306,7 +303,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')