更改项目结构，更正Import

MCSLTeam · Oct 1, 2023 · d762050 · d762050
1 parent 118a9f7
commit d762050
Show file tree

Hide file tree

Showing 24 changed files with 52 additions and 42 deletions.
diff --git a/mixins/__init__.py → __init__.py b/mixins/__init__.py → __init__.py
diff --git a/demo1.py b/demo1.py
@@ -6,10 +6,9 @@
 from PyQt5.QtWidgets import QApplication, QMainWindow, QGridLayout, QLabel, QWidget, QPushButton, QMessageBox
 from pyqt5_plugins.examplebuttonplugin import QtGui
 
-from Plugins.Mod_Plaza.Clients import CfClient
-from Plugins.Mod_Plaza.curseforge import CurseForgeAPI, SchemaClasses as schemas
-from Plugins.Mod_Plaza.utils.CacheDB import CacheDB
-from Plugins.Mod_Plaza.utils.FetchImageManager import FetchImageManager
+from Clients import CfClient
+from curseforge import CurseForgeAPI, SchemaClasses as schemas
+from utils.FetchImageManager import FetchImageManager
 
 
 class AThread(QThread):

diff --git a/main.py b/main.py
@@ -1,16 +1,13 @@
 import sys
 
-from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QApplication
 
-from Plugins.Mod_Plaza.Clients import vacuum
-from ui.plazaPage import PlazaPage
+from src.ui.plazaPage import PlazaPage
 
 if __name__ == '__main__':
-    QApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
     app = QApplication(sys.argv)
     window = PlazaPage(None)
     window.setMinimumHeight(600)
     window.setMinimumWidth(800)
     window.show()
-    sys.exit(app.exec_())
+    sys.exit(app.exec_())
diff --git a/result.json b/result.json
diff --git a/Clients.py → src/Clients.py b/Clients.py → src/Clients.py
@@ -3,10 +3,10 @@
 
 import requests_cache as rqc
 
-from Plugins.Mod_Plaza.CFAPI import KEY
-from Plugins.Mod_Plaza.curseforge import CurseForgeAPI, SchemaClasses as schema
+from .CFAPI import KEY
+from .curseforge import CurseForgeAPI, SchemaClasses as schema
 
-curdir = os.path.abspath(os.path.dirname(__file__))
+curdir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
 
 def vacuum():
@@ -28,11 +28,13 @@ def vacuum():
     backend="sqlite",
     expire_after=3600
 )
+# shortCachedRequest.cache.delete(expired=True)
 longCachedRequest = rqc.CachedSession(
     os.path.join(curdir, "cache", "CurseForgeBlob-Cache"),
     backend="sqlite",
     expire_after=86400  # 1day
 )
+# longCachedRequest.cache.delete(expired=True)
 CfClient = CurseForgeAPI(KEY, shortCachedRequest, proxies={'http': '127.0.0.1:7890', 'https': '127.0.0.1:7890'})
 
 if __name__ == '__main__':

diff --git a/ui/__init__.py → src/__init__.py b/ui/__init__.py → src/__init__.py
diff --git a/concurrent/__init__.py → src/concurrent/__init__.py b/concurrent/__init__.py → src/concurrent/__init__.py
diff --git a/concurrent/curseforgeTask.py → src/concurrent/curseforgeTask.py b/concurrent/curseforgeTask.py → src/concurrent/curseforgeTask.py
@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from Plugins.Mod_Plaza.concurrent import Task, TaskManager, Future
-from Plugins.Mod_Plaza.curseforge import CurseForgeAPI, SchemaClasses as schemas
+from . import Task, TaskManager, Future
+from ..curseforge import CurseForgeAPI, SchemaClasses as schemas
 
 
 @dataclass

diff --git a/concurrent/fetchImageTask.py → src/concurrent/fetchImageTask.py b/concurrent/fetchImageTask.py → src/concurrent/fetchImageTask.py
@@ -3,9 +3,9 @@
 from PyQt5.QtCore import QSize
 from PyQt5.QtGui import QPixmap
 
-from Plugins.Mod_Plaza.Clients import longCachedRequest
-from Plugins.Mod_Plaza.concurrent.future import Future
-from Plugins.Mod_Plaza.concurrent.task import Task
+from ..Clients import longCachedRequest
+from ..concurrent.future import Future
+from ..concurrent.task import Task
 
 
 class FetchImageTask(Task):

diff --git a/concurrent/future.py → src/concurrent/future.py b/concurrent/future.py → src/concurrent/future.py
diff --git a/concurrent/task.py → src/concurrent/task.py b/concurrent/task.py → src/concurrent/task.py
@@ -2,7 +2,7 @@
 
 from PyQt5.QtCore import QObject, pyqtSignal, QRunnable
 
-from Plugins.Mod_Plaza.concurrent.future import Future
+from .future import Future
 
 
 class Signal(QObject):

diff --git a/concurrent/taskManager.py → src/concurrent/taskManager.py b/concurrent/taskManager.py → src/concurrent/taskManager.py
@@ -2,9 +2,10 @@
 from typing import Dict, List
 
 from PyQt5.QtCore import QThreadPool, QObject
+from psutil import cpu_count
 
-from Plugins.Mod_Plaza.concurrent.future import Future, FutureCancelled
-from Plugins.Mod_Plaza.concurrent.task import Task
+from .future import Future, FutureCancelled
+from .task import Task
 
 
 class TaskManager(QObject):
@@ -14,7 +15,7 @@ def __init__(self, useGlobalThreadPool=False):
             self.threadPool = QThreadPool.globalInstance()
         else:
             self.threadPool = QThreadPool()
-            self.threadPool.setMaxThreadCount(4)
+            self.threadPool.setMaxThreadCount(2 * cpu_count())  # IO-Bound = 2*N, CPU-Bound = N + 1
         self.taskMap = {}
         self.tasks: Dict[int, weakref.ReferenceType] = {}
         self.taskCounter = 0
@@ -45,14 +46,17 @@ def _taskCancel(self, fut: Future):
 
     def _taskSingleCancel(self, fut: Future):
         _id = fut.getTaskID()
-        task = self.tasks[_id]()
+        task: Task = self.tasks[_id]()
         if task is not None:
-            try:
-                self.threadPool.cancel(task)
-                print(f"Task {_id} canceled.")
-            except RuntimeError:
-                print(f"Task {_id} already done.")
-
+            # try:
+            #     self.threadPool.cancel(task)
+            #     print(f"Task {_id} canceled.")
+            # except RuntimeError:
+            #     print(f"Task {_id} already done.")
+            task.setAutoDelete(False)
+            if self.threadPool.tryTake(task):
+                del self.tasks[_id]
+            task.setAutoDelete(True)
 
     def cancelTask(self, fut: Future):
         self._taskCancel(fut)
diff --git a/curseforge/SchemaClasses.py → src/curseforge/SchemaClasses.py b/curseforge/SchemaClasses.py → src/curseforge/SchemaClasses.py
diff --git a/curseforge/Utils.py → src/curseforge/Utils.py b/curseforge/Utils.py → src/curseforge/Utils.py
diff --git a/curseforge/__init__.py → src/curseforge/__init__.py b/curseforge/__init__.py → src/curseforge/__init__.py
diff --git a/mixins/CfBaseInfoMixin.py → src/mixins/CfBaseInfoMixin.py b/mixins/CfBaseInfoMixin.py → src/mixins/CfBaseInfoMixin.py
diff --git a/utils/__init__.py → src/mixins/__init__.py b/utils/__init__.py → src/mixins/__init__.py
diff --git a/src/ui/__init__.py b/src/ui/__init__.py
diff --git a/ui/modTagExample.py → src/ui/modTagExample.py b/ui/modTagExample.py → src/ui/modTagExample.py
diff --git a/ui/plazaPage.py → src/ui/plazaPage.py b/ui/plazaPage.py → src/ui/plazaPage.py
@@ -20,16 +20,19 @@
     TitleLabel, TransparentPushButton, BodyLabel,
 )
 
-import Plugins.Mod_Plaza.curseforge.SchemaClasses as schemas
-from Plugins.Mod_Plaza.Clients import CfClient
-from Plugins.Mod_Plaza.concurrent import Future
-from Plugins.Mod_Plaza.concurrent.curseforgeTask import GetMinecraftInfoManager, CurseForgeSearchBody, \
+from ..curseforge import SchemaClasses as schemas
+from ..Clients import CfClient
+from ..concurrent import Future
+from ..concurrent.curseforgeTask import (
+    GetMinecraftInfoManager,
+    CurseForgeSearchBody,
     MinecraftModSearchManager
-from Plugins.Mod_Plaza.curseforge.Utils import getStructureCategories
-from Plugins.Mod_Plaza.ui.singleModWidget import SingleModWidget
-from Plugins.Mod_Plaza.utils.FetchImageManager import FetchImageManager
+)
+from ..curseforge.Utils import getStructureCategories
+from .singleModWidget import SingleModWidget
+from ..utils.FetchImageManager import FetchImageManager
 
-CLASS_ID = schemas.MinecraftClassId.BukkitPlugin
+CLASS_ID = schemas.MinecraftClassId.Mod
 CLASS_NAME = CLASS_ID.name
 
 
@@ -49,6 +52,7 @@ def __init__(self, parent):
         # UI
         self.pageLineEdit.setAlignment(Qt.AlignCenter)
 
+
         # mod repository
         self.searchSrcComboBox.addItem("CurseForge")
         self.sortTypeComboBox.addItem("Any")
@@ -87,6 +91,7 @@ def __init__(self, parent):
 
     @pyqtSlot(object)
     def getCurseForgeInfo(self, data):
+        self.titleLabel.setText(f"{CLASS_NAME}广场")
         minecraftVersions: List[schemas.MinecraftGameVersion] = data["minecraftVersions"]
         modCategories: List[schemas.Category] = getStructureCategories(data["modCategories"], 6)  # Mod
         pluginCategories: List[schemas.Category] = getStructureCategories(data["pluginCategories"], 5)  # Plugin
@@ -189,7 +194,10 @@ def searchMod(self):
                 except TypeError:  # 上次搜索无结果
                     pass
                 print("Canceled last page task.")
-            self.lastPageTaskFuture.deleteLater()  # delete last page task
+            try:
+                self.lastPageTaskFuture.deleteLater() # delete last page task
+            except RuntimeError as e:
+                print(e)
         self.thumbnailImages = 0
 
         self.titleLabel.setText(f"{CLASS_NAME}广场 (正在搜索...)")
@@ -449,7 +457,7 @@ def setupUI(self):
 
         self.gridLayout.addLayout(self.horizontalLayout_5, 5, 1, 1, 3)
 
-        self.titleLabel.setText(f"{CLASS_NAME}广场")
+        self.titleLabel.setText(f"{CLASS_NAME}广场 (正在加载...)")
         self.sortTypeTitle.setText("排序方式        ")
         self.mcVersionTitle.setText("Minecraft版本")
         self.searchSrcTitle.setText("搜索源  ")

diff --git a/ui/singleModWidget.py → src/ui/singleModWidget.py b/ui/singleModWidget.py → src/ui/singleModWidget.py
@@ -8,7 +8,7 @@
     CardWidget,
 )
 
-from Plugins.Mod_Plaza.curseforge import SchemaClasses as schemas
+from ..curseforge import SchemaClasses as schemas
 
 
 class SingleModWidget(CardWidget):

diff --git a/utils/CacheDB.py → src/utils/CacheDB.py b/utils/CacheDB.py → src/utils/CacheDB.py
diff --git a/utils/FetchImageManager.py → src/utils/FetchImageManager.py b/utils/FetchImageManager.py → src/utils/FetchImageManager.py
@@ -1,17 +1,16 @@
 from typing import Callable, List, Tuple, Optional, Dict
 
-from PyQt5.QtCore import QSize
 from PyQt5.QtGui import QPixmap
 from PyQt5.QtWidgets import QWidget
 
-from Plugins.Mod_Plaza.concurrent import TaskManager, Task, Future, FetchImageTask
+from ..concurrent import TaskManager, Task, Future, FetchImageTask
 
 
 class FetchImageManager(TaskManager):
 
     def __init__(self, useGlobalThreadPool=False):
         super().__init__(useGlobalThreadPool)
-        self.threadPool.setMaxThreadCount(16)
+        # self.threadPool.setMaxThreadCount(16)
 
     def asyncFetch(
             self,

diff --git a/src/utils/__init__.py b/src/utils/__init__.py