chengma/cmshoppe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add selected task reset actions

Browse Source
This commit is contained in:
chengma
2026-06-30 11:50:49 +08:00
parent 580a7a570d
commit f7ea9ec0fa
6 changed files with 412 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_db.py
+52
View File
@@ -115,6 +115,58 @@ class DbTests(TempDirMixin, unittest.TestCase):
self.assert_removed(temp_dir)
def test_reset_generated_and_apply_status_keep_local_history(self):
with self.make_temp_dir() as temp_dir:
db_path = os.path.join(temp_dir, "cmshopee.db")
db.init_db(db_path)
batch_id = db.create_batch(["input.xlsx"], path=db_path)
db.insert_tasks(
batch_id,
[
{
"source_file_abs": os.path.join(temp_dir, "input.xlsx"),
"source_sheet": "Sheet1",
"source_row": 2,
"account_name": "shop",
"alias": "alias",
"item_id": "51100639510",
}
],
path=db_path,
)
task = db.list_tasks(batch_id=batch_id, path=db_path)[0]
new_cover = os.path.join(temp_dir, "new.jpg")
with open(new_cover, "wb") as fh:
fh.write(b"jpeg")
db.set_collected(task.id, "旧标题", "old.jpg", path=db_path)
db.set_generated(task.id, "新标题", new_cover, path=db_path)
db.set_applied(task.id, True, path=db_path)
reset_apply = db.reset_apply_status(task.id, path=db_path)
self.assertEqual("applied", reset_apply["before"].stage)
after_apply = reset_apply["after"]
self.assertEqual("generated", after_apply.stage)
self.assertEqual("pending", after_apply.status)
self.assertEqual("新标题", after_apply.new_title)
self.assertEqual(new_cover, after_apply.new_cover_path)
self.assertEqual(1, after_apply.committed)
reset_generated = db.reset_generated(task.id, path=db_path)
after_generated = reset_generated["after"]
self.assertEqual(new_cover, reset_generated["new_cover_path"])
self.assertIsNone(reset_generated["deleted_file"])
self.assertTrue(os.path.exists(new_cover))
self.assertEqual("collected", after_generated.stage)
self.assertEqual("success", after_generated.status)
self.assertIsNone(after_generated.new_title)
self.assertIsNone(after_generated.new_cover_path)
self.assertIsNone(after_generated.last_error)
self.assertEqual(1, after_generated.committed)
self.assert_removed(temp_dir)
def test_duplicate_task_and_invalid_update_raise_clear_errors(self):
with self.make_temp_dir() as temp_dir:
db_path = os.path.join(temp_dir, "cmshopee.db")
tests/test_gui.py
+106
View File
@@ -509,6 +509,7 @@ class GuiTests(TempDirMixin, unittest.TestCase):
self.assertEqual("保存标题提示词", tab.save_title_button.text())
self.assertEqual("开始生成", tab.generate_button.text())
self.assertEqual("停止", tab.stop_generate_button.text())
self.assertEqual("重置生成结果", tab.reset_generate_button.text())
self.assertFalse(tab.stop_generate_button.isEnabled())
self.assertEqual("进度：标题0/0 · 封面0/0 · 失败0", tab.progress_label.text())
self.assertEqual("默认", tab.cover_template_combo.currentText())
@@ -595,6 +596,58 @@ class GuiTests(TempDirMixin, unittest.TestCase):
self.assert_removed(temp_dir)
def test_generate_tab_resets_selected_generated_result_and_writes_reset_log(self):
with self.make_temp_dir() as temp_dir:
cfg = self.make_config(temp_dir)
accounts.create_account("主店", "alias-a", debug_port=9222, config=cfg)
batch_id = db.create_batch(["input.xlsx"], path=cfg["db_path"])
db.insert_tasks(
batch_id,
[
{
"source_file_abs": os.path.join(temp_dir, "input.xlsx"),
"source_sheet": "商品",
"source_row": 2,
"account_name": "Excel主店",
"alias": "alias-a",
"item_id": "51100639510",
}
],
path=cfg["db_path"],
)
task = db.list_tasks(batch_id=batch_id, path=cfg["db_path"])[0]
new_cover = os.path.join(temp_dir, "new.jpg")
with open(new_cover, "wb") as fh:
fh.write(b"jpeg")
db.set_collected(task.id, "旧标题", "old.jpg", path=cfg["db_path"])
db.set_generated(task.id, "新标题", new_cover, path=cfg["db_path"])
statuses = []
tab = GenerateTab(config=cfg, status_callback=statuses.append)
self.addCleanup(tab.close)
tab.task_table.selectRow(0)
with mock.patch("app.gui.QMessageBox.question", return_value=gui.QMessageBox.Yes) as question:
tab.reset_generated_result()
message = question.call_args[0][2]
self.assertIn("默认不删除本地新封面文件", message)
self.assertIn(new_cover, message)
updated = db.get_task(task.id, path=cfg["db_path"])
self.assertEqual("collected", updated.stage)
self.assertEqual("success", updated.status)
self.assertIsNone(updated.new_title)
self.assertIsNone(updated.new_cover_path)
self.assertTrue(os.path.exists(new_cover))
run_log = db.list_run_logs(limit=1, run_type="reset", path=cfg["db_path"])[0]
self.assertEqual("done", run_log.status)
self.assertEqual("reset_generated", run_log.options["action"])
events = db.list_run_log_events(run_log.id, path=cfg["db_path"])
self.assertTrue(any("action=reset_generated" in event.message for event in events))
self.assertIn("已重置生成结果", statuses[-1])
self.assert_removed(temp_dir)
def test_generate_worker_calls_generate_batch_and_emits_signals(self):
with self.make_temp_dir() as temp_dir:
cfg = self.make_config(temp_dir)
@@ -847,6 +900,7 @@ class GuiTests(TempDirMixin, unittest.TestCase):
self.assertEqual("开始更新", tab.start_update_button.text())
self.assertEqual("applyItemFilter", tab.item_filter.objectName())
self.assertEqual("停止", tab.stop_update_button.text())
self.assertEqual("重置更新状态", tab.reset_update_button.text())
self.assertFalse(tab.stop_update_button.isEnabled())
self.assertEqual(2, tab.model.rowCount())
self.assertEqual("主店", tab.model.index(0, 0).data())
@@ -890,6 +944,58 @@ class GuiTests(TempDirMixin, unittest.TestCase):
self.assert_removed(temp_dir)
def test_apply_tab_resets_selected_apply_status_and_warns_committed_task(self):
with self.make_temp_dir() as temp_dir:
cfg = self.make_config(temp_dir)
accounts.create_account("主店", "alias-a", debug_port=9222, config=cfg)
batch_id = db.create_batch(["input.xlsx"], path=cfg["db_path"])
db.insert_tasks(
batch_id,
[
{
"source_file_abs": os.path.join(temp_dir, "input.xlsx"),
"source_sheet": "商品",
"source_row": 2,
"account_name": "Excel主店",
"alias": "alias-a",
"item_id": "51100639510",
}
],
path=cfg["db_path"],
)
task = db.list_tasks(batch_id=batch_id, path=cfg["db_path"])[0]
db.set_collected(task.id, "旧标题", "old.jpg", path=cfg["db_path"])
db.set_generated(task.id, "新标题", "new.jpg", path=cfg["db_path"])
db.set_applied(task.id, True, path=cfg["db_path"])
statuses = []
tab = ApplyTab(config=cfg, status_callback=statuses.append)
self.addCleanup(tab.close)
tab.status_filter.setCurrentIndex(tab.status_filter.findData("applied"))
tab.task_table.selectRow(0)
with mock.patch("app.gui.QMessageBox.question", return_value=gui.QMessageBox.Yes) as question:
tab.reset_apply_status()
message = question.call_args[0][2]
self.assertIn("已经提交过线上", message)
self.assertIn("本地重置不会回滚 Shopee", message)
self.assertIn("重复更新会再次提交线上", message)
updated = db.get_task(task.id, path=cfg["db_path"])
self.assertEqual("generated", updated.stage)
self.assertEqual("pending", updated.status)
self.assertEqual("新标题", updated.new_title)
self.assertEqual("new.jpg", updated.new_cover_path)
self.assertEqual(1, updated.committed)
run_log = db.list_run_logs(limit=1, run_type="reset", path=cfg["db_path"])[0]
self.assertEqual("done", run_log.status)
self.assertEqual("reset_apply_status", run_log.options["action"])
events = db.list_run_log_events(run_log.id, path=cfg["db_path"])
self.assertTrue(any("action=reset_apply_status" in event.message for event in events))
self.assertIn("已重置更新状态", statuses[-1])
self.assert_removed(temp_dir)
def test_apply_tab_start_update_requires_confirmation_before_starting_worker(self):
with self.make_temp_dir() as temp_dir:
cfg = self.make_config(temp_dir)