改进魔法变量 {II} 使用自然排序

* fix: 修复 II 魔法变量排序时不是自然排序的问题

* chore: del empty line

---------

Co-authored-by: Cp0204 <Cp0204@qq.com>
This commit is contained in:
xiaoQQya 2025-06-25 19:46:48 +08:00 committed by GitHub
parent cd3964a8f8
commit a939c233dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions

View File

@ -18,6 +18,7 @@ import importlib
import traceback import traceback
import urllib.parse import urllib.parse
from datetime import datetime from datetime import datetime
from natsort import natsorted
# 兼容青龙 # 兼容青龙
try: try:
@ -273,7 +274,7 @@ class MagicRename:
# print(f"dir_filename_list: {dir_filename_list}") # print(f"dir_filename_list: {dir_filename_list}")
# 合并目录文件列表 # 合并目录文件列表
filename_list = list(set(filename_list) | set(dir_filename_dict.values())) filename_list = list(set(filename_list) | set(dir_filename_dict.values()))
filename_list.sort(key=self._custom_sort_key) filename_list = natsorted(filename_list, key=self._custom_sort_key)
filename_index = {} filename_index = {}
for name in filename_list: for name in filename_list:
if name in dir_filename_dict.values(): if name in dir_filename_dict.values():

View File

@ -2,3 +2,4 @@ flask
apscheduler apscheduler
requests requests
treelib treelib
natsort