第一版完整版
This commit is contained in:
27942
2026-01-26 23:10:26 +08:00
parent 52e53706c7
commit 01c4dfdcc0
100 changed files with 123 additions and 72 deletions

View File

@@ -243,6 +243,16 @@ class WorkerThread(QThread):
try:
payload = dict(r)
payload["user_id"] = config.get("多多id", "")
# 确保index字段正确传递从原始文件信息中获取
if "index" not in payload or not payload.get("index"):
# 如果payload中没有index尝试从对应的视频文件中获取
for vid_file in video_file_paths:
if vid_file.get('path') == payload.get('path') or str(vid_file.get('path')) == str(payload.get('path')):
payload["index"] = vid_file.get("index", config.get("序号", ""))
break
# 如果还是找不到,使用配置中的序号
if "index" not in payload or not payload.get("index"):
payload["index"] = config.get("序号", "")
self.item_result.emit(payload)
except Exception:
pass
@@ -3062,8 +3072,24 @@ class MainWindow(QMainWindow):
)
return
# 转换为配置列表,添加异常处理
# 清空所有状态根据新的Excel配置表格为准
# 1. 清空配置列表
self.configs = []
# 2. 重置运行状态变量
self.running_total = 0
self.running_done = 0
# 3. 清空批量任务队列
self.batch_task_queue = []
self.current_batch_task_index = 0
# 4. 清空行映射(用于状态回写)
self._row_map_by_user_index = {}
# 5. 重置所有状态卡片显示
self.set_status_cards(update_text="未更新", pending=0, running=0, success=0, failed=0)
# 6. 重置进度条
if hasattr(self, "status_running_progress"):
self.status_running_progress.setValue(0)
# 转换为配置列表,添加异常处理
for idx, row in df.iterrows():
try:
# 处理间隔时间:保持原始状态,空值保持为空字符串
@@ -3084,6 +3110,10 @@ class MainWindow(QMainWindow):
return s[:-2]
return s
# 导入新Excel时强制将所有状态重置为"待执行"根据新的Excel配置表格为准
# 忽略Excel中"情况"列的旧状态值,统一重置为"待执行"
status_value = '待执行'
config = {
'勾选': True, # 默认勾选,方便导入后直接操作
'多多id': clean_str(row.get('多多id', '')),
@@ -3093,7 +3123,7 @@ class MainWindow(QMainWindow):
'间隔时间': interval_value,
'达人链接': str(row.get('达人链接', '')).strip() if pd.notna(row.get('达人链接')) else '',
'执行人': str(row.get('执行人', '')).strip() if pd.notna(row.get('执行人')) else '',
'情况': '待执行', # 导入新Excel时强制重置为待执行,不累计历史状态
'情况': status_value, # 强制重置为"待执行"根据新的Excel配置表格为准
'文件路径': '' # 文件路径字段初始为空,通过更新数据按钮填充
}
self.configs.append(config)
@@ -3119,11 +3149,12 @@ class MainWindow(QMainWindow):
# 显示表格
self.table_group.setVisible(True)
# 更新状态统计
# 更新状态统计(基于新导入的配置重新计算)
self._update_status_statistics()
# 确保更新状态显示为"未更新"(文件路径还未更新)
self.set_status_cards(update_text="未更新")
self._show_infobar("success", "成功", f"成功导入 {len(self.configs)} 条配置")
self._show_infobar("success", "成功", f"成功导入 {len(self.configs)} 条配置,所有状态已清空重置")
except Exception as e:
error_msg = f"导入Excel文件失败: {str(e)}"
@@ -4088,20 +4119,48 @@ class MainWindow(QMainWindow):
reason = str(payload.get("reason", "")).strip()
name = str(payload.get("name", "")).strip()
if not user_id or not idx:
if not user_id:
return
# 全局搜索匹配的多多ID和序号
found_config_idx = -1
for i, cfg in enumerate(self.configs):
if str(cfg.get("多多id")) == user_id and str(cfg.get("序号")) == idx:
found_config_idx = i
break
if idx: # 如果有序号优先通过多多ID和序号匹配
for i, cfg in enumerate(self.configs):
if str(cfg.get("多多id")) == user_id and str(cfg.get("序号")) == idx:
found_config_idx = i
break
if found_config_idx != -1:
# 如果通过序号没找到且批量上传模式下尝试通过多多ID匹配所有相关配置
if found_config_idx == -1:
# 查找所有匹配多多ID的配置批量上传时可能有多个配置对应同一个多多ID
matching_indices = []
for i, cfg in enumerate(self.configs):
if str(cfg.get("多多id")) == user_id:
matching_indices.append(i)
# 如果只找到一个匹配的配置,直接使用它
if len(matching_indices) == 1:
found_config_idx = matching_indices[0]
# 如果有多个匹配的配置,且当前正在执行批量任务,更新所有相关配置的状态
elif len(matching_indices) > 1 and hasattr(self, 'current_batch_task_index') and self.current_batch_task_index < len(self.batch_task_queue):
# 获取当前任务的配置索引列表
current_task = self.batch_task_queue[self.current_batch_task_index]
task_config_indices = current_task.get('config_indices', [])
# 只更新当前任务相关的配置状态
for cfg_idx in task_config_indices:
if cfg_idx in matching_indices:
self._update_table_status(cfg_idx, "已完成" if ok else "失败", is_config_index=True)
found_config_idx = -2 # 标记为已处理(多个配置)
if found_config_idx >= 0:
# 单个配置匹配成功,更新状态
self._update_table_status(found_config_idx, "已完成" if ok else "失败", is_config_index=True)
label = name if name else payload.get("path", "") or ""
self.log_text.append(f"[结果] {user_id}-{idx}: {'' if ok else ''} {label} {reason}")
elif found_config_idx == -2:
# 多个配置已处理,只记录日志
label = name if name else payload.get("path", "") or ""
self.log_text.append(f"[结果] {user_id}-{idx}: {'' if ok else ''} {label} {reason}")
else:
self.log_text.append(f"[结果] {user_id}-{idx}: ok={ok} {reason} (未在列表中找到匹配项)")
except Exception as e:

View File

@@ -15,5 +15,5 @@
"top_topics_and_observing_domains": [ ]
} ],
"hex_encoded_hmac_key": "434BF7DBD7DA573B45E0A11AD9045A61B6221D14AE2F9A341E2FEF659AF071F6",
"next_scheduled_calculation_time": "13414055093389557"
"next_scheduled_calculation_time": "13414055093389575"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:33.885 8be8 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\File System\Origins/MANIFEST-000001
2026/01/26-22:09:33.885 8be8 Recovering log #6
2026/01/26-22:09:33.886 8be8 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\File System\Origins/000006.log
2026/01/26-22:54:00.434 9334 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\File System\Origins/MANIFEST-000001
2026/01/26-22:54:00.434 9334 Recovering log #6
2026/01/26-22:54:00.435 9334 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\File System\Origins/000006.log

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:11.350 5464 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\File System\Origins/MANIFEST-000001
2026/01/26-22:09:11.350 5464 Recovering log #6
2026/01/26-22:09:11.351 5464 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\File System\Origins/000006.log
2026/01/26-22:33:05.801 9638 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\File System\Origins/MANIFEST-000001
2026/01/26-22:33:05.802 9638 Recovering log #6
2026/01/26-22:33:05.802 9638 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\File System\Origins/000006.log

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:37.858 8b94 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\GCM Store/MANIFEST-000001
2026/01/26-22:09:37.859 8b94 Recovering log #3
2026/01/26-22:09:37.859 8b94 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\GCM Store/000003.log
2026/01/26-22:54:05.467 98d8 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\GCM Store/MANIFEST-000001
2026/01/26-22:54:05.468 98d8 Recovering log #3
2026/01/26-22:54:05.487 98d8 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\GCM Store/000003.log

View File

@@ -1,3 +1,3 @@
2026/01/26-21:30:52.672 d0a8 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\GCM Store/MANIFEST-000001
2026/01/26-21:30:52.674 d0a8 Recovering log #3
2026/01/26-21:30:52.675 d0a8 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\GCM Store/000003.log
2026/01/26-22:33:09.013 8524 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\GCM Store/MANIFEST-000001
2026/01/26-22:33:09.014 8524 Recovering log #3
2026/01/26-22:33:09.128 8524 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\GCM Store/000003.log

Binary file not shown.

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:33.025 3edc Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Local Storage\leveldb/MANIFEST-000001
2026/01/26-22:09:33.029 3edc Recovering log #11
2026/01/26-22:09:33.032 3edc Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Local Storage\leveldb/000011.log
2026/01/26-22:53:59.340 2498 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Local Storage\leveldb/MANIFEST-000001
2026/01/26-22:53:59.343 2498 Recovering log #11
2026/01/26-22:53:59.346 2498 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Local Storage\leveldb/000011.log

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:10.508 8910 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Local Storage\leveldb/MANIFEST-000001
2026/01/26-22:09:10.512 8910 Recovering log #11
2026/01/26-22:09:10.515 8910 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Local Storage\leveldb/000011.log
2026/01/26-22:33:04.909 98dc Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Local Storage\leveldb/MANIFEST-000001
2026/01/26-22:33:04.913 98dc Recovering log #11
2026/01/26-22:33:04.916 98dc Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Local Storage\leveldb/000011.log

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
{"sts":[{"expiry":1780307155.354295,"host":"dERK8Ko+SPll3fI4ktOXyGETlPtRvoHIttvQhh3OR68=","mode":"force-https","sts_include_subdomains":true,"sts_observed":1769420755.354296},{"expiry":1779259199.044976,"host":"myxca24Fg7L/IgePD/QeLaUxbyYNmJdOyLPYvlVtjPE=","mode":"force-https","sts_include_subdomains":true,"sts_observed":1768372799.044977},{"expiry":1800972573.326249,"host":"5EdUoB7YUY9zZV+2DkgVXgho8WUvp+D+6KpeUOhNQIM=","mode":"force-https","sts_include_subdomains":false,"sts_observed":1769436573.326252},{"expiry":1800972573.313072,"host":"8/RrMmQlCD2Gsp14wUCE1P8r7B2C5+yE0+g79IPyRsc=","mode":"force-https","sts_include_subdomains":true,"sts_observed":1769436573.313075}],"version":2}
{"sts":[{"expiry":1780307155.354295,"host":"dERK8Ko+SPll3fI4ktOXyGETlPtRvoHIttvQhh3OR68=","mode":"force-https","sts_include_subdomains":true,"sts_observed":1769420755.354296},{"expiry":1779259199.044976,"host":"myxca24Fg7L/IgePD/QeLaUxbyYNmJdOyLPYvlVtjPE=","mode":"force-https","sts_include_subdomains":true,"sts_observed":1768372799.044977},{"expiry":1800975240.342072,"host":"5EdUoB7YUY9zZV+2DkgVXgho8WUvp+D+6KpeUOhNQIM=","mode":"force-https","sts_include_subdomains":false,"sts_observed":1769439240.342074},{"expiry":1800975239.886179,"host":"8/RrMmQlCD2Gsp14wUCE1P8r7B2C5+yE0+g79IPyRsc=","mode":"force-https","sts_include_subdomains":true,"sts_observed":1769439239.886182}],"version":2}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:32.911 7e78 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Service Worker\Database/MANIFEST-000001
2026/01/26-22:09:32.911 7e78 Recovering log #3
2026/01/26-22:09:32.913 7e78 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Service Worker\Database/000003.log
2026/01/26-22:53:59.268 12f0 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Service Worker\Database/MANIFEST-000001
2026/01/26-22:53:59.269 12f0 Recovering log #3
2026/01/26-22:53:59.271 12f0 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Service Worker\Database/000003.log

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:10.429 8824 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Service Worker\Database/MANIFEST-000001
2026/01/26-22:09:10.430 8824 Recovering log #3
2026/01/26-22:09:10.432 8824 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Service Worker\Database/000003.log
2026/01/26-22:33:04.826 3048 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Service Worker\Database/MANIFEST-000001
2026/01/26-22:33:04.827 3048 Recovering log #3
2026/01/26-22:33:04.829 3048 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Service Worker\Database/000003.log

Binary file not shown.

Binary file not shown.

View File

@@ -1,14 +1,5 @@
2026/01/26-22:09:33.114 3edc Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Session Storage/MANIFEST-000001
2026/01/26-22:09:33.116 3edc Recovering log #21
2026/01/26-22:09:33.117 3edc Level-0 table #24: started
2026/01/26-22:09:33.124 3edc Level-0 table #24: 9737 bytes OK
2026/01/26-22:09:33.131 3edc Delete type=0 #21
2026/01/26-22:09:33.133 8838 Compacting 4@0 + 1@1 files
2026/01/26-22:09:33.144 8838 Generated table #26@0: 2 keys, 145 bytes
2026/01/26-22:09:33.145 8838 Compacted 4@0 + 1@1 files => 145 bytes
2026/01/26-22:09:33.146 8838 compacted to: files[ 0 1 0 0 0 0 0 ]
2026/01/26-22:09:33.146 8838 Delete type=2 #13
2026/01/26-22:09:33.146 8838 Delete type=2 #16
2026/01/26-22:09:33.146 8838 Delete type=2 #19
2026/01/26-22:09:33.147 8838 Delete type=2 #22
2026/01/26-22:09:33.147 8838 Delete type=2 #24
2026/01/26-22:53:59.460 2498 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Session Storage/MANIFEST-000001
2026/01/26-22:53:59.461 2498 Recovering log #25
2026/01/26-22:53:59.468 2498 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Session Storage/000025.log
2026/01/26-23:10:13.229 2e04 Level-0 table #29: started
2026/01/26-23:10:13.237 2e04 Level-0 table #29: 10077 bytes OK

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:10.630 8910 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Session Storage/MANIFEST-000001
2026/01/26-22:09:10.632 8910 Recovering log #21
2026/01/26-22:09:10.638 8910 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Session Storage/000021.log
2026/01/26-22:33:05.031 98dc Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Session Storage/MANIFEST-000001
2026/01/26-22:33:05.032 98dc Recovering log #25
2026/01/26-22:33:05.036 98dc Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Session Storage/000025.log

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:32.940 6e9c Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Site Characteristics Database/MANIFEST-000001
2026/01/26-22:09:32.941 6e9c Recovering log #6
2026/01/26-22:09:32.942 6e9c Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Site Characteristics Database/000006.log
2026/01/26-22:53:59.277 54fc Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Site Characteristics Database/MANIFEST-000001
2026/01/26-22:53:59.277 54fc Recovering log #6
2026/01/26-22:53:59.278 54fc Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Site Characteristics Database/000006.log

View File

@@ -1,3 +1,3 @@
2026/01/26-22:09:10.433 8884 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Site Characteristics Database/MANIFEST-000001
2026/01/26-22:09:10.434 8884 Recovering log #6
2026/01/26-22:09:10.435 8884 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Site Characteristics Database/000006.log
2026/01/26-22:33:04.834 9930 Reusing MANIFEST C:\Users\27942\Desktop\haha\user\user_data\Default\Site Characteristics Database/MANIFEST-000001
2026/01/26-22:33:04.835 9930 Recovering log #6
2026/01/26-22:33:04.835 9930 Reusing old log C:\Users\27942\Desktop\haha\user\user_data\Default\Site Characteristics Database/000006.log

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,5 @@
<08> C :
"0010ܝ
<EFBFBD><EFBFBD>m<EFBFBD>B"
"0010<EFBFBD><EFBFBD>
<EFBFBD>!n<EFBFBD>B"
<20>?<3F><>eY8<59>-<2D>|<12>Ց<EFBFBD>

View File

@@ -1,4 +1,4 @@
<08> C :
"0010޼
Tny<EFBFBD>B"
"0010<EFBFBD><EFBFBD>
6])B"

View File

@@ -1,4 +1,4 @@
<08> C :
"0010<10><>
n<EFBFBD><EFBFBD>PB"
"0010<10><>
<12>]<5D>B"

Binary file not shown.

Binary file not shown.