mirror of
https://github.com/Cp0204/quark-auto-save.git
synced 2026-01-16 09:20:43 +08:00
Compare commits
No commits in common. "b14bfbdfd1bad4ff9149245851cc706da528ccfc" and "83894c5e4f198c8f6d48644233422366834d5e80" have entirely different histories.
b14bfbdfd1
...
83894c5e4f
@ -75,7 +75,7 @@ docker run -d \
|
||||
x1ao4/quark-auto-save-x:latest
|
||||
```
|
||||
|
||||
Docker Compose（推荐）
|
||||
Docker Compose
|
||||
|
||||
```yaml
|
||||
version: "3.3"
|
||||
@ -89,6 +89,7 @@ services:
|
||||
- /自定义配置文件的存储目录/quark-auto-save-x/config:/app/config
|
||||
- /自定义生成文件的存储目录:/media # 可选，插件 alist_strm_gen 生成 strm 使用
|
||||
restart: unless-stopped
|
||||
networks: {}
|
||||
```
|
||||
|
||||
默认管理地址：http://yourhost:5005
|
||||
|
||||
@ -281,7 +281,7 @@ main div[v-if="activeTab === 'config'"] .row.title:first-child {
|
||||
left: 0;
|
||||
z-index: 100;
|
||||
padding: 54px 0 0;
|
||||
box-shadow: inset -1px 0 0 rgba(0, 0, 0, .088);
|
||||
box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
|
||||
transition: none; /* 禁用动画效果 */
|
||||
overflow-x: hidden; /* 防止水平滚动条 */
|
||||
}
|
||||
@ -2137,7 +2137,7 @@ div.jsoneditor-tree button.jsoneditor-button:focus {
|
||||
|
||||
/* 侧边栏菜单项图标样式 */
|
||||
.sidebar .nav-link .bi-list-ul {
|
||||
font-size: 1.1rem;
|
||||
font-size: 1.09rem;
|
||||
position: relative;
|
||||
top: 0.5px; /* 向下微调 */
|
||||
}
|
||||
@ -2149,7 +2149,7 @@ div.jsoneditor-tree button.jsoneditor-button:focus {
|
||||
}
|
||||
|
||||
.sidebar .nav-link .bi-clock-history {
|
||||
font-size: 1.015rem;
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
.sidebar .nav-link .bi-archive {
|
||||
|
||||
@ -2453,7 +2453,7 @@
|
||||
checkShareUrlStatus() {
|
||||
// 只在任务列表页面检查
|
||||
if (this.activeTab !== 'tasklist') return;
|
||||
|
||||
|
||||
// 遍历所有任务
|
||||
this.formData.tasklist.forEach((task, index) => {
|
||||
// 如果任务有分享链接且没有设置shareurl_ban
|
||||
@ -2463,13 +2463,7 @@
|
||||
.then(response => {
|
||||
const share_detail = response.data.data;
|
||||
if (!response.data.success) {
|
||||
// 检查是否是 request error，如果是则忽略
|
||||
if (share_detail.error && share_detail.error.includes("request error")) {
|
||||
// 忽略 request error，不设置 shareurl_ban
|
||||
console.log('检查分享链接时出现网络错误，忽略此错误:', share_detail.error);
|
||||
return;
|
||||
}
|
||||
// 使用格式化函数处理其他错误信息
|
||||
// 使用格式化函数处理错误信息
|
||||
this.$set(task, "shareurl_ban", this.formatShareUrlBanMessage(share_detail.error));
|
||||
} else if (share_detail.list !== undefined && share_detail.list.length === 0) {
|
||||
// 检查文件列表是否为空，确保列表存在且为空
|
||||
@ -2477,8 +2471,8 @@
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
// 网络请求失败，忽略错误，不设置 shareurl_ban
|
||||
console.log('检查分享链接状态时网络请求失败，忽略此错误:', error);
|
||||
// 错误处理
|
||||
console.error('检查分享链接状态失败:', error);
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -3179,15 +3173,8 @@
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// 检查是否是 request error，如果是则忽略
|
||||
if (share_detail.error && share_detail.error.includes("request error")) {
|
||||
// 忽略 request error，不设置 shareurl_ban
|
||||
console.log('修改分享链接时出现网络错误，忽略此错误:', share_detail.error);
|
||||
return;
|
||||
}
|
||||
|
||||
// 使用格式化函数处理其他错误信息
|
||||
|
||||
// 使用格式化函数处理错误信息
|
||||
this.$set(task, "shareurl_ban", this.formatShareUrlBanMessage(share_detail.error));
|
||||
} else {
|
||||
// 检查文件列表是否为空
|
||||
@ -3201,8 +3188,7 @@
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
// 网络请求失败，忽略错误，不设置 shareurl_ban
|
||||
console.log('修改分享链接时网络请求失败，忽略此错误:', error);
|
||||
// 错误处理
|
||||
});
|
||||
},
|
||||
clearData(target) {
|
||||
@ -3415,21 +3401,14 @@
|
||||
// 检查是否包含已知的失效原因
|
||||
const error = response.data.data.error || "";
|
||||
let isInvalid = false;
|
||||
|
||||
// 如果是 request error，视为有效（网络问题，不是资源问题）
|
||||
if (error.includes("request error")) {
|
||||
this.smart_param.validateProgress.valid++;
|
||||
resolve(link);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
for (const term of invalidTerms) {
|
||||
if (error.includes(term)) {
|
||||
isInvalid = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 如果不是已知的失效原因，保留该结果
|
||||
if (!isInvalid) {
|
||||
this.smart_param.validateProgress.valid++;
|
||||
|
||||
@ -2251,17 +2251,8 @@ class Quark:
|
||||
else:
|
||||
target_name = episode_pattern.replace("[]", f"{episode_num:02d}") + file_ext
|
||||
|
||||
# 检查目标文件名是否已存在，支持忽略后缀选项
|
||||
if task.get("ignore_extension", False):
|
||||
# 忽略后缀模式：只比较文件名部分，不比较扩展名
|
||||
target_name_base = os.path.splitext(target_name)[0]
|
||||
target_exists = any(
|
||||
os.path.splitext(dir_file["file_name"])[0] == target_name_base for dir_file in dir_file_list
|
||||
)
|
||||
else:
|
||||
# 不忽略后缀模式：完整文件名必须匹配
|
||||
target_exists = any(dir_file["file_name"] == target_name for dir_file in dir_file_list)
|
||||
|
||||
# 检查目标文件名是否已存在
|
||||
target_exists = any(dir_file["file_name"] == target_name for dir_file in dir_file_list)
|
||||
if target_exists:
|
||||
is_duplicate = True
|
||||
|
||||
@ -2761,7 +2752,6 @@ class Quark:
|
||||
if query_task_return["code"] == 0:
|
||||
# 建立目录树
|
||||
saved_files = []
|
||||
|
||||
for index, item in enumerate(need_save_list):
|
||||
icon = (
|
||||
"📁"
|
||||
@ -2789,16 +2779,12 @@ class Quark:
|
||||
saved_files.append(format_file_display("", icon, display_name))
|
||||
# 检查节点是否已存在于树中，避免重复添加
|
||||
if not tree.contains(item["fid"]):
|
||||
# 安全地获取save_as_top_fids中的fid，防止索引越界
|
||||
save_as_top_fids = query_task_return.get('data', {}).get('save_as', {}).get('save_as_top_fids', [])
|
||||
saved_fid = save_as_top_fids[index] if index < len(save_as_top_fids) else item["fid"]
|
||||
|
||||
tree.create_node(
|
||||
display_name, # 只存储文件名，不包含图标
|
||||
item["fid"],
|
||||
parent=pdir_fid,
|
||||
data={
|
||||
"fid": f"{saved_fid}",
|
||||
"fid": f"{query_task_return['data']['save_as']['save_as_top_fids'][index]}",
|
||||
"path": f"{savepath}/{item['save_name']}",
|
||||
"is_dir": item["dir"],
|
||||
"icon": icon, # 将图标存储在data中
|
||||
@ -2989,19 +2975,7 @@ class Quark:
|
||||
else:
|
||||
save_name = sequence_pattern.replace("{}", f"{current_sequence:02d}") + file_ext
|
||||
|
||||
# 检查是否需要重命名，支持忽略后缀选项
|
||||
name_conflict = False
|
||||
if task.get("ignore_extension", False):
|
||||
# 忽略后缀模式：只比较文件名部分，不比较扩展名
|
||||
save_name_base = os.path.splitext(save_name)[0]
|
||||
name_conflict = any(
|
||||
os.path.splitext(existing_name)[0] == save_name_base for existing_name in dir_file_name_list
|
||||
)
|
||||
else:
|
||||
# 不忽略后缀模式：完整文件名必须匹配
|
||||
name_conflict = save_name in dir_file_name_list
|
||||
|
||||
if save_name != dir_file["file_name"] and not name_conflict:
|
||||
if save_name != dir_file["file_name"] and save_name not in dir_file_name_list:
|
||||
# 收集重命名对，包含原始文件信息以便排序
|
||||
renamed_pairs.append((dir_file, save_name, current_sequence))
|
||||
dir_file_name_list.append(save_name)
|
||||
@ -3490,19 +3464,8 @@ class Quark:
|
||||
|
||||
# 执行重命名操作，但不立即打印日志
|
||||
for dir_file, new_name, _ in rename_operations:
|
||||
# 防止重名，支持忽略后缀选项
|
||||
name_conflict = False
|
||||
if task.get("ignore_extension", False):
|
||||
# 忽略后缀模式：只比较文件名部分，不比较扩展名
|
||||
new_name_base = os.path.splitext(new_name)[0]
|
||||
name_conflict = any(
|
||||
os.path.splitext(f["file_name"])[0] == new_name_base for f in dir_file_list
|
||||
)
|
||||
else:
|
||||
# 不忽略后缀模式：完整文件名必须匹配
|
||||
name_conflict = new_name in [f["file_name"] for f in dir_file_list]
|
||||
|
||||
if not name_conflict:
|
||||
# 防止重名
|
||||
if new_name not in [f["file_name"] for f in dir_file_list]:
|
||||
try:
|
||||
rename_return = self.rename(dir_file["fid"], new_name)
|
||||
if rename_return["code"] == 0:
|
||||
@ -3658,21 +3621,8 @@ class Quark:
|
||||
# 执行重命名操作，并收集日志
|
||||
already_renamed_files = set() # 用于防止重复重命名
|
||||
for dir_file, new_name in rename_operations:
|
||||
# 检查是否会导致重名，支持忽略后缀选项
|
||||
name_conflict = False
|
||||
if task.get("ignore_extension", False):
|
||||
# 忽略后缀模式：只比较文件名部分，不比较扩展名
|
||||
new_name_base = os.path.splitext(new_name)[0]
|
||||
name_conflict = any(
|
||||
os.path.splitext(f["file_name"])[0] == new_name_base for f in dir_file_list
|
||||
) or any(
|
||||
os.path.splitext(existing_name)[0] == new_name_base for existing_name in already_renamed_files
|
||||
)
|
||||
else:
|
||||
# 不忽略后缀模式：完整文件名必须匹配
|
||||
name_conflict = new_name in [f["file_name"] for f in dir_file_list] or new_name in already_renamed_files
|
||||
|
||||
if not name_conflict:
|
||||
# 检查是否会导致重名
|
||||
if new_name not in [f["file_name"] for f in dir_file_list] and new_name not in already_renamed_files:
|
||||
try:
|
||||
rename_return = self.rename(dir_file["fid"], new_name)
|
||||
if rename_return["code"] == 0:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user