From 82fc31c4e0d8f5828cdf74d02956dd12d04e4523 Mon Sep 17 00:00:00 2001 From: yoshiko2 Date: Tue, 3 Aug 2021 03:15:07 +0800 Subject: [PATCH] Revert some code styles to adapt to Python 3.7 --- core.py | 8 ++++---- number_parser.py | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core.py b/core.py index d44823f..57cbea0 100755 --- a/core.py +++ b/core.py @@ -344,11 +344,11 @@ def add_to_pic(pic_path, img_pic, size, count, mode): print('[-]Error: watermark image param mode invalid!') return # 先找pyinstaller打包的图片 - if hasattr(sys, '_MEIPASS') and os.path.isfile(_p := os.path.join(getattr(sys, '_MEIPASS'), pngpath)): - mark_pic_path = _p + if hasattr(sys, '_MEIPASS') and os.path.isfile(os.path.join(getattr(sys, '_MEIPASS'), pngpath)): + mark_pic_path = os.path.join(getattr(sys, '_MEIPASS'), pngpath) # 再找py脚本所在路径的图片 - elif os.path.isfile(_p := os.path.join(os.path.dirname(os.path.realpath(__file__)), pngpath)): - mark_pic_path = _p + elif os.path.isfile(os.path.join(os.path.dirname(os.path.realpath(__file__)), pngpath)): + mark_pic_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), pngpath) # 如果没有本地图片才通过网络下载 else: mark_pic_path = BytesIO( diff --git a/number_parser.py b/number_parser.py index 1dbc32d..1aee8f4 100755 --- a/number_parser.py +++ b/number_parser.py @@ -43,7 +43,8 @@ def get_number(debug,filepath: str) -> str: lower_check = filename.lower() if 'fc2' in lower_check: filename = lower_check.replace('ppv', '').replace('--', '-').replace('_', '-').upper() - if file_number := get_number_by_dict(lower_check): + file_number = get_number_by_dict(lower_check) + if file_number: return file_number return str(re.search(r'\w+(-|_)\w+', filename, re.A).group()) else: # 提取不含减号-的番号，FANZA CID @@ -70,7 +71,8 @@ def get_number(debug,filepath: str) -> str: lower_check = filename.lower() if 'fc2' in lower_check: filename = lower_check.replace('ppv', '').replace('--', '-').replace('_', '-').upper() - if file_number := get_number_by_dict(lower_check): + file_number = get_number_by_dict(lower_check) + if file_number: return file_number return str(re.search(r'\w+(-|_)\w+', filename, re.A).group()) else: # 提取不含减号-的番号，FANZA CID