代码优化

This commit is contained in:
WangXianming
2024-09-16 17:13:08 +08:00
committed by GitHub
parent 6f4dac876f
commit 9bd6cc5a60
10 changed files with 72 additions and 49 deletions

View File

@@ -7,11 +7,12 @@ 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']
@@ -21,6 +22,7 @@ async def check_github_api_rate_limit(headers, session):
log.info(f' 🔄 剩余请求次数: {remaining_requests}')
else:
log.error('Github请求数检查失败')
return
if remaining_requests == 0:
log.warning(f' ⚠ GitHub API 请求数已用尽,将在 {reset_time_formatted} 重置, 不想等生成一个填配置文件里')

View File

@@ -12,16 +12,19 @@ async def depotkey_merge(config_path, depots_config):
async with lock:
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

View File

@@ -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}')
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'))
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

View File

@@ -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)}')
os.system('pause')
return None
steam_path = get_steam_path()

View File

@@ -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

View File

@@ -1,23 +1,26 @@
import logging
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()

View File

@@ -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,6 +41,7 @@ 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}')
url = f'https://api.github.com/repos/{selected_repo}/branches/{app_id}'
@@ -67,10 +69,10 @@ async def main(app_id, repos):
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' ✅ 清单最后更新时间:{latest_date}')
log.info(f' ✅ 入库成功: {app_id}')
os.system('pause')
return True
log.error(f' ⚠ 清单下载或生成失败: {app_id}')
os.system('pause')
return False
return False

View File

@@ -1,9 +1,7 @@
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}',
@@ -18,6 +16,9 @@ async def get(sha, path, repo, session):
async with session.get(url, ssl=False) as r:
if r.status == 200:
total_size = int(r.headers.get('Content-Length', 0))
if total_size == 0:
log.error(f' 🔄 获取失败: {path} - 内容为空')
break
chunk_size = 1024
content = bytearray()

View File

@@ -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:
if st_use:
log.info('检测到你正在使用SteamTools尝试迁移旧文件')
if os.path.exists(directory):
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)
@@ -26,19 +26,21 @@ def migrate(st_use):
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)
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停止迁移')

View File

@@ -20,6 +20,6 @@ async def stool_add(depot_data, app_id):
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