基本完成

Clients.py

@@ -1,6 +1,5 @@
-import json
 import os
-from typing import List
+import sqlite3
 
 import requests_cache as rqc
 
@@ -9,10 +8,25 @@
 
 curdir = os.path.abspath(os.path.dirname(__file__))
 
+
+def vacuum():
+    if os.path.exists(db := os.path.join(curdir, "cache", "CurseForgeBlob-Cache")):
+        conn = sqlite3.connect(db)
+        conn.execute("VACUUM")
+        conn.close()
+        print("Vacuumed")
+
+    if os.path.exists(db := os.path.join(curdir, "cache", "CurseForgeRequest-Cache")):
+        conn = sqlite3.connect(db)
+        conn.execute("VACUUM")
+        conn.close()
+        print("Vacuumed")
+
+
 shortCachedRequest = rqc.CachedSession(
     os.path.join(curdir, "cache", "CurseForgeRequest-Cache"),
     backend="sqlite",
-    expire_after=300
+    expire_after=3600
 )
 longCachedRequest = rqc.CachedSession(
     os.path.join(curdir, "cache", "CurseForgeBlob-Cache"),
@@ -49,4 +63,3 @@
     for d in data:
         print(d)
     print(666)
-

concurrent/future.py

@@ -49,8 +49,9 @@ def __str__(self):
 
 
 class Future(QObject):
-    done = pyqtSignal(object)
-    childrenDone = pyqtSignal(object)
+    allDone = pyqtSignal(object)  # self
+    partialDone = pyqtSignal(object)  # child future
+    childrenDone = pyqtSignal(object)  # self
 
     def __init__(self):
         super().__init__()
@@ -72,6 +73,7 @@ def __onChildDone(self, childFuture: 'Future') -> None:
         if childFuture.isFailed():
             self._failed = True
         self._counter += 1
+        self.partialDone.emit(childFuture)
         try:
             idx = getattr(childFuture, "_idx")
             self._result[idx] = childFuture._result
@@ -113,7 +115,7 @@ def setResult(self, result) -> None:
                 self.childrenDone.emit(self)
             if self._callback:
                 self._callback(result)
-            self.done.emit(result)
+            self.allDone.emit(result)
         else:
             raise RuntimeError("Future already done")
         # self.deleteLater()  # delete this future object
@@ -131,7 +133,7 @@ def setFailed(self, exception: Optional[BaseException]) -> None:
                 self.childrenDone.emit(self)
             if self._failedCallback:
                 self._failedCallback(self)
-            self.done.emit(self._result)
+            self.allDone.emit(self._result)
         else:
             raise RuntimeError("Future already done")
         # self.deleteLater()

concurrent/taskManager.py

@@ -47,8 +47,12 @@ def _taskSingleCancel(self, fut: Future):
         _id = fut.getTaskID()
         task = self.tasks[_id]()
         if task is not None:
-            self.threadPool.cancel(task)
-            print(f"Task {_id} canceled.")
+            try:
+                self.threadPool.cancel(task)
+                print(f"Task {_id} canceled.")
+            except RuntimeError:
+                print(f"Task {_id} already done.")
+
 
     def cancelTask(self, fut: Future):
         self._taskCancel(fut)

demo1.py

@@ -101,7 +101,7 @@ def onFinished(self, mods: List[schemas.Mod]):
             failedCallback=lambda _: print(f"单个加载失败,url={_.url}", _.getException())
         )
         future.setFailedCallback(lambda _: print("加载失败,failedCallback", _.getException()))
-        future.done.connect(self.onFutureDone)
+        future.allDone.connect(self.onFutureDone)
         self.fut = future
 
     def onFutureDone(self, result):

main.py

@@ -3,6 +3,7 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QApplication
 
+from Plugins.Mod_Plaza.Clients import vacuum
 from ui.plazaPage import PlazaPage
 
 if __name__ == '__main__':