From 0fd4146c200a0a2926420720c95d76bd65724a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E4=B9=8B=E5=87=8C=E6=AE=87?= Date: Fri, 14 Jul 2023 21:13:15 +0800 Subject: [PATCH] fix: lint --- _package.py | 11 ++++------- _release.py | 5 ++++- djc_helper.py | 2 +- main_def.py | 1 - qq_login.py | 13 ++++++++++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/_package.py b/_package.py index 77dd0f4824..f43d09f256 100644 --- a/_package.py +++ b/_package.py @@ -1,11 +1,8 @@ # 构建发布压缩包 import os -import pathlib -import re import shutil from compress import compress_dir_with_bandizip -from const import db_top_dir from log import color, logger from util import human_readable_size, make_sure_dir_exists, show_head_line from version import now_version @@ -27,25 +24,25 @@ def package(dir_src, dir_all_release, release_dir_name, release_7z_name, dir_git logger.info(color("bold_yellow") + f"将部分内容从 {dir_src} 复制到 {dir_current_release} ") # 需要复制的文件与目录 files_to_copy = [ + # 最外层文件 "config.toml", "config.example.toml", "DNF蚊子腿小助手.exe", "DNF蚊子腿小助手配置工具.exe", "DNF蚊子腿小助手配置文件.bat", "DNF蚊子腿小助手交流群群二维码.png", - + # 复制完后要移动或重命名到其他路径的文件 "CHANGELOG.MD", "README.MD", - + "utils/auto_updater.exe", + # 其他文件 "使用教程", "付费指引", "相关信息", - "utils/bandizip_portable", "utils/icons", "utils/reference_data", "utils/auto_updater_changelog.MD", - "utils/auto_updater.exe", "utils/hdiffz.exe", "utils/hpatchz.exe", "utils/不要下载增量更新文件_这个是给自动更新工具使用的.txt", diff --git a/_release.py b/_release.py index 82e193d1fe..c0fb89b7c2 100644 --- a/_release.py +++ b/_release.py @@ -133,7 +133,10 @@ def path_in_src(filepath_relative_to_src: str) -> str: upload(local_filepath, old_version_name_prefix=history_file_prefix) except Exception as e: local_filename = os.path.basename(local_filepath) - logger.warning(color("bold_yellow") + f"第{try_index}/{total_try_count}次尝试上传 {local_filename} 失败，等待一会后重试", exc_info=e) + logger.warning( + color("bold_yellow") + f"第{try_index}/{total_try_count}次尝试上传 {local_filename} 失败，等待一会后重试", + exc_info=e, + ) if try_index < total_try_count: count_down("上传到网盘", 5 * try_index) continue diff --git a/djc_helper.py b/djc_helper.py index ba13ab7a0d..72511e9067 100644 --- a/djc_helper.py +++ b/djc_helper.py @@ -9978,7 +9978,7 @@ def dnf_anniversary_ide_op( **{ **bindData, **extra_params, - } + }, ) # --------------------------------------------新春福袋大作战-------------------------------------------- diff --git a/main_def.py b/main_def.py index 7eca417ca5..0552c2583c 100644 --- a/main_def.py +++ b/main_def.py @@ -8,7 +8,6 @@ import sys import threading import time -import webbrowser from multiprocessing import cpu_count, freeze_support from typing import Callable, Dict, List, Optional, Tuple diff --git a/qq_login.py b/qq_login.py index 7b3e60ebd1..1043f43979 100644 --- a/qq_login.py +++ b/qq_login.py @@ -392,7 +392,9 @@ def check_and_download_chrome_ahead_windows(self): logger.info("检查driver是否存在") if not self.is_valid_chrome_file(self.chrome_driver_executable_path()): logger.info(color("bold_yellow") + f"未在小助手utils目录里发现 {chrome_driver_exe_name} ，将尝试从网盘下载") - logger.info(color("bold_cyan") + f"如果速度实在太慢，可以去QQ群文件里面下载 {chrome_driver_exe_name}，然后原样放到小助手的 utils 目录中，再重新启动即可") + logger.info( + color("bold_cyan") + f"如果速度实在太慢，可以去QQ群文件里面下载 {chrome_driver_exe_name}，然后原样放到小助手的 utils 目录中，再重新启动即可" + ) self.download_chrome_driver(chrome_driver_exe_name) options = Options() @@ -418,7 +420,9 @@ def check_and_download_chrome_ahead_windows(self): # 尝试从网盘下载合适版本的便携版chrome if not self.is_valid_chrome_file(self.chrome_binary_7z()): - logger.info(color("bold_yellow") + f"未在小助手utils目录里发现 便携版chrome 的压缩包，尝试自动从网盘下载 {zip_name}，需要下载大概80MB的压缩包，请耐心等候") + logger.info( + color("bold_yellow") + f"未在小助手utils目录里发现 便携版chrome 的压缩包，尝试自动从网盘下载 {zip_name}，需要下载大概80MB的压缩包，请耐心等候" + ) logger.info(color("bold_cyan") + f"如果速度实在太慢，可以去QQ群文件里面下载 {zip_name}，然后原样放到小助手的 utils 目录中，再重新启动即可") self.download_chrome_file(zip_name) @@ -444,7 +448,10 @@ def check_and_download_chrome_ahead_windows(self): # 走到这里，大概率是多线程并行下载导致文件出错了，尝试重新下载 logger.info(color("bold_yellow") + "似乎chrome相关文件损坏了，尝试重新下载并解压") - logger.info(color("bold_cyan") + f"如果速度实在太慢，可以去QQ群文件里面下载 {zip_name} 和 {chrome_driver_exe_name}，然后原样放到小助手的 utils 目录中，再重新启动即可") + logger.info( + color("bold_cyan") + + f"如果速度实在太慢，可以去QQ群文件里面下载 {zip_name} 和 {chrome_driver_exe_name}，然后原样放到小助手的 utils 目录中，再重新启动即可" + ) self.download_chrome_driver(chrome_driver_exe_name) self.download_chrome_file(zip_name)