Revert some code styles to adapt to Python 3.7

This commit is contained in:
yoshiko2
2021-08-03 03:15:07 +08:00
parent 91c7b016a2
commit 82fc31c4e0
2 changed files with 8 additions and 6 deletions

View File

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