fix: 处于“待扫描”状态的记录重启后会继续处理 issue #316

tests/test_scan.py

@@ -34,6 +34,34 @@ def test_import_status(self):
         self.assertEqual(d["err"], "ok")
 
 
+class TestScanContinue(TestWithUserLogin):
+    NEW_ROW_ID = 69
+
+    def setUp(self):
+        # 将这行记录设置为可导入的状态
+        self.session = self.get_app().settings["ScopedSession"]
+        self.session.rollback()
+
+        row = self.session.query(ScanFile).filter(ScanFile.id == self.NEW_ROW_ID).one()
+        row.path = testdir + "/cases/new.epub"
+        row.status = ScanFile.NEW
+        row.book_id = 0
+        row.import_id = 0
+        row.save()
+        self.session.commit()
+        return super().setUp()
+
+    @mock.patch("webserver.handlers.scan.Scanner.allow_backgrounds")
+    def test_scan(self, m1):
+        m1.return_value = False
+        d = self.json("/api/admin/scan/run", method="POST", body="")
+        self.assertEqual(d["err"], "ok")
+
+        row = self.session.query(ScanFile).filter(ScanFile.id == self.NEW_ROW_ID).one()
+        self.assertEqual(row.status, ScanFile.READY)
+
+
+
 class TestImport(TestWithUserLogin):
     READY_ROW_ID = 69
 

webserver/handlers/scan.py

@@ -95,9 +95,14 @@ def do_scan(self, path_dir):
         inserted_hash = set()
         for fname, fpath, fmt in tasks:
             # logging.info("Scan: %s", fpath)
-            if self.session.query(ScanFile).filter(ScanFile.path == fpath).count() > 0:
+            samefiles = self.session.query(ScanFile).filter(ScanFile.path == fpath)
+            if samefiles.count() > 0:
                 # 如果已经有相同的文件记录，则跳过
-                continue
+                row = samefiles.first()
+                if row.status == ScanFile.NEW:
+                    rows.append( row )
+                else:
+                    continue
 
             stat = os.stat(fpath)
             md5 = hashlib.md5(fname.encode("UTF-8")).hexdigest()