chickliu/quark-auto-save
1
0
Fork 0
mirror of https://github.com/Cp0204/quark-auto-save.git synced 2026-01-16 17:30:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复某些情况下顺序命名预览界面显示的重命名与实际操作不一致的问题

Browse Source
This commit is contained in:
x1ao4 2025-04-26 21:11:16 +08:00
parent 6935c609b4
commit d6390cde99
1 changed files with 136 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
app/run.py
View File

@ -331,56 +331,154 @@ def get_share_detail():
if file["dir"]: # 跳过文件夹 if file["dir"]: # 跳过文件夹
return float('inf') return float('inf')
file_name = file["file_name"] filename = file["file_name"]
# 1. 首先尝试提取SxxExx格式（如S01E01） # 提取文件名，不含扩展名
match_s_e = re.search(r'[Ss](\d+)[Ee](\d+)', file_name) file_name_without_ext = os.path.splitext(filename)[0]
# 1. "第X期/集/话" 格式 - 保持最高优先级
match_chinese = re.search(r'第(\d+)[期集话]', filename)
episode_num = int(match_chinese.group(1)) if match_chinese else 0
# 5. 文件名含"上中下"（优先处理，因为可能与其他格式同时存在）
if match_chinese:
# 如果同时存在集数和上中下，则按照集数*10+位置排序
if '上' in filename:
return episode_num * 10 + 1
elif '中' in filename:
return episode_num * 10 + 2
elif '下' in filename:
return episode_num * 10 + 3
return episode_num * 10
elif '上' in filename:
return 1
elif '中' in filename:
return 2
elif '下' in filename:
return 3
# 1.2 "X集/期/话" 格式 - 与我们修改后的优先级一致
match_chinese_simple = re.search(r'(\d+)[期集话]', filename)
if match_chinese_simple:
return int(match_chinese_simple.group(1))
# 2.1 S01E01 格式，提取季数和集数
match_s_e = re.search(r'[Ss](\d+)[Ee](\d+)', filename)
if match_s_e: if match_s_e:
season = int(match_s_e.group(1)) season = int(match_s_e.group(1))
episode = int(match_s_e.group(2)) episode = int(match_s_e.group(2))
return season * 1000 + episode return season * 1000 + episode
# 2. 尝试提取E01/EP01格式 # 2.2 E01/EP01 格式，仅提取集数
match_e = re.search(r'[Ee][Pp]?(\d+)', file_name) match_e = re.search(r'[Ee][Pp]?(\d+)', filename)
if match_e: if match_e:
return int(match_e.group(1)) return int(match_e.group(1))
# 3. 首先尝试提取期数（第X期） # 2.3 1x01 格式，提取季数和集数
period_match = re.search(r'第(\d+)期[上中下]', file_name) match_x = re.search(r'(\d+)[Xx](\d+)', filename)
if period_match: if match_x:
period_num = int(period_match.group(1)) season = int(match_x.group(1))
# 根据上中下调整排序 episode = int(match_x.group(2))
if '上' in file_name: return season * 1000 + episode
return period_num * 3 - 2
elif '中' in file_name:
return period_num * 3 - 1
elif '下' in file_name:
return period_num * 3
return period_num * 3
# 4. 尝试提取日期格式（YYYY-MM-DD） # 2.4 数字后接4K格式
date_match = re.search(r'(\d{4})-(\d{2})-(\d{2})', file_name) match_4k = re.search(r'(\d+)[-_\s]*4[Kk]', filename)
if date_match: if match_4k:
year = int(date_match.group(1)) return int(match_4k.group(1))
month = int(date_match.group(2))
day = int(date_match.group(3))
base_value = year * 10000 + month * 100 + day
# 如果同一天有多个文件，根据"上中下"或其他标识符进行排序
if '上' in file_name:
return base_value * 10 + 1
elif '中' in file_name:
return base_value * 10 + 2
elif '下' in file_name:
return base_value * 10 + 3
return base_value * 10
# 5. 尝试提取任何数字 # 2.5 方括号包围的数字
number_match = re.search(r'(\d+)', file_name) match_bracket = re.search(r'\[(\d+)\]', filename)
if number_match: if match_bracket:
return int(number_match.group(1)) return int(match_bracket.group(1))
# 6. 默认使用原文件名 # 2.6 中括号包围的数字
return float('inf') match_cn_bracket = re.search(r'【(\d+)】', filename)
if match_cn_bracket:
return int(match_cn_bracket.group(1))
# 2.7 下划线包围的数字
match_underscore = re.search(r'_?(\d+)_', filename)
if match_underscore:
return int(match_underscore.group(1))
# 3. 日期格式识别（支持多种格式）
# 3.1 完整的YYYYMMDD格式
match_date_compact = re.search(r'(20\d{2})(\d{2})(\d{2})', filename)
if match_date_compact:
year = int(match_date_compact.group(1))
month = int(match_date_compact.group(2))
day = int(match_date_compact.group(3))
return year * 10000 + month * 100 + day
# 3.2 YYYY-MM-DD 或 YYYY.MM.DD 或 YYYY/MM/DD 格式
match_date_full = re.search(r'(20\d{2})[-./](\d{1,2})[-./](\d{1,2})', filename)
if match_date_full:
year = int(match_date_full.group(1))
month = int(match_date_full.group(2))
day = int(match_date_full.group(3))
return year * 10000 + month * 100 + day
# 3.3 MM/DD/YYYY 或 DD/MM/YYYY 格式
match_date_alt = re.search(r'(\d{1,2})[-./](\d{1,2})[-./](20\d{2})', filename)
if match_date_alt:
# 假设第一个是月，第二个是日（美式日期）
month = int(match_date_alt.group(1))
day = int(match_date_alt.group(2))
year = int(match_date_alt.group(3))
# 检查月份值，如果大于12可能是欧式日期格式（DD/MM/YYYY）
if month > 12:
month, day = day, month
return year * 10000 + month * 100 + day
# 3.4 MM/DD 格式（无年份），假设为当前年
match_date_short = re.search(r'(\d{1,2})[-./](\d{1,2})', filename)
if match_date_short:
# 假设第一个是月，第二个是日
month = int(match_date_short.group(1))
day = int(match_date_short.group(2))
# 检查月份值，如果大于12可能是欧式日期格式（DD/MM）
if month > 12:
month, day = day, month
# 由于没有年份，使用一个较低的基数，确保任何有年份的日期都排在后面
return month * 100 + day
# 3.5 年期格式，如"2025年14期"
match_year_issue = re.search(r'(20\d{2})[年].*?(\d+)[期]', filename)
if match_year_issue:
year = int(match_year_issue.group(1))
issue = int(match_year_issue.group(2))
return year * 1000 + issue
# 3.6 日期+期数的复合格式，例如：2025-04-18 第5期上
match_date_episode = re.search(r'(20\d{2})[-./](\d{1,2})[-./](\d{1,2}).*?第(\d+)[期集话]', filename)
if match_date_episode:
year = int(match_date_episode.group(1))
month = int(match_date_episode.group(2))
day = int(match_date_episode.group(3))
episode = int(match_date_episode.group(4))
date_val = year * 10000 + month * 100 + day
# 将日期值作为主排序，期数为次要排序
if '上' in filename:
return date_val * 100 + episode * 10 + 1
elif '中' in filename:
return date_val * 100 + episode * 10 + 2
elif '下' in filename:
return date_val * 100 + episode * 10 + 3
return date_val * 100 + episode * 10
# 4. 纯数字格式（文件名开头是纯数字）
match_num = re.match(r'^(\d+)', file_name_without_ext)
if match_num:
return int(match_num.group(1))
# 5. 尝试匹配文件名中的任何数字
any_num_match = re.search(r'(\d+)', filename)
if any_num_match:
return int(any_num_match.group(1))
# 6. 默认使用更新时间
return file.get("created_at", file.get("updated_at", file.get("last_update_at", 0)))
# 过滤出非目录文件，并且排除已经符合命名规则的文件 # 过滤出非目录文件，并且排除已经符合命名规则的文件
files_to_process = [] files_to_process = []