Fix 3.12 FileFinder no find_module error

README.md

@@ -13,7 +13,7 @@
 
 # 如何安装差速器
 
-> 可以移步我的[博客](https://lg.to/dft)查看详细的教程
+> 可以移步我的[博客](https://2cn.io/dft)查看详细的教程
 > 也可以到[Telegram群组](https://t.me/ptdft)来讨论各种问题
 
 ## Linux

differential/constants.py

@@ -26,7 +26,7 @@
     "create_folder",
 )
 
-URL_SHORTENER_PATH = "https://lg.to"
+URL_SHORTENER_PATH = "https://2cn.io"
 
 
 class ImageHosting(Enum):

differential/plugins/__init__.py

@@ -10,10 +10,10 @@ def __getattr__(self, item):
 
 __all__ = []
 for loader, name, is_pkg in pkgutil.walk_packages(__path__):
-    m = loader.find_module(name)
-    if not m:
+    spec = loader.find_spec(name)
+    if not spec:
         continue
-    module = m.load_module(name)
+    module = spec.loader.load_module()
     for name, value in inspect.getmembers(module):
         if name.startswith('__'):
             continue

differential/utils/image/__init__.py

@@ -1,29 +1,18 @@
 from pathlib import Path
-from itertools import chain
-
-
-class ImageUploaded:
-    def __init__(self, url, thumb=None):
-        self.url = url
-        self.thumb = thumb
+from differential.utils.image.types import ImageUploaded
+from differential.utils.image.byr import byr_upload
+from differential.utils.image.hdbits import hdbits_upload
+from differential.utils.image.imgbox import imgbox_upload
+from differential.utils.image.smms import smms_upload
+from differential.utils.image.ptpimg import ptpimg_upload
+from differential.utils.image.imgurl import imgurl_upload
+from differential.utils.image.chevereto import chevereto_api_upload, chevereto_cookie_upload, chevereto_username_upload
+from differential.utils.image.cloudinary import cloudinary_upload
 
-    def __str__(self):
-        if self.thumb:
-            return f"[url={self.url}][img]{self.thumb}[/img][/url]"
-        return f"[img]{self.url}[/img]"
 
 
 def get_all_images(folder: str) -> list:
     image_types = ("png", "jpg", "jpeg", "gif", "webp")
     for t in image_types:
         for i in Path(folder).glob("*.{}".format(t)):
             yield i
-
-from differential.utils.image.byr import byr_upload
-from differential.utils.image.hdbits import hdbits_upload
-from differential.utils.image.imgbox import imgbox_upload
-from differential.utils.image.smms import smms_upload
-from differential.utils.image.ptpimg import ptpimg_upload
-from differential.utils.image.imgurl import imgurl_upload
-from differential.utils.image.chevereto import chevereto_api_upload, chevereto_cookie_upload, chevereto_username_upload
-from differential.utils.image.cloudinary import cloudinary_upload

differential/utils/image/byr.py

@@ -5,7 +5,7 @@
 import requests
 from loguru import logger
 
-from differential.utils.image import ImageUploaded
+from differential.utils.image.types import ImageUploaded
 
 
 def byr_upload(img: Path, authorization: str, url: Optional[str] = None) -> Optional[ImageUploaded]:

differential/utils/image/chevereto.py

@@ -6,7 +6,7 @@
 import requests
 from loguru import logger
 
-from differential.utils.image import ImageUploaded
+from differential.utils.image.types import ImageUploaded
 
 sessions = {}
 

differential/utils/image/cloudinary.py

@@ -9,7 +9,7 @@
 import requests
 from loguru import logger
 
-from differential.utils.image import ImageUploaded
+from differential.utils.image.types import ImageUploaded
 
 
 def cloudinary_upload(img: Path, folder: str, cloud_name: str, api_key: str, api_secret: str) -> Optional[ImageUploaded]:

differential/utils/image/hdbits.py

@@ -9,7 +9,7 @@
 from loguru import logger
 from lxml.html import fromstring
 
-from differential.utils.image import ImageUploaded
+from differential.utils.image.types import ImageUploaded
 
 
 def get_uploadid(cookie: str) -> str:

differential/utils/image/imgbox.py

@@ -9,7 +9,7 @@
 from loguru import logger
 from lxml.html import fromstring
 
-from differential.utils.image import ImageUploaded
+from differential.utils.image.types import ImageUploaded
 
 
 def get_csrf_token(session) -> Optional[str]:

differential/utils/image/imgurl.py

@@ -5,7 +5,7 @@
 import requests
 from loguru import logger
 
-from differential.utils.image import ImageUploaded
+from differential.utils.image.types import ImageUploaded
 
 def imgurl_upload(img: Path, url: str, api_key: str) -> Optional[ImageUploaded]:
     data = {'token': api_key}

differential/utils/image/ptpimg.py

@@ -5,7 +5,7 @@
 import requests
 from loguru import logger
 
-from differential.utils.image import ImageUploaded
+from differential.utils.image.types import ImageUploaded
 
 def ptpimg_upload(img: Path, api_key: str) -> Optional[ImageUploaded]:
     data = {'api_key': api_key}

differential/utils/image/smms.py

@@ -5,7 +5,7 @@
 import requests
 from loguru import logger
 
-from differential.utils.image import ImageUploaded
+from differential.utils.image.types import ImageUploaded
 
 
 def smms_upload(img: Path, api_key: str) -> Optional[ImageUploaded]:

differential/utils/image/types.py

@@ -0,0 +1,11 @@
+
+
+class ImageUploaded:
+    def __init__(self, url, thumb=None):
+        self.url = url
+        self.thumb = thumb
+
+    def __str__(self):
+        if self.thumb:
+            return f"[url={self.url}][img]{self.thumb}[/img][/url]"
+        return f"[img]{self.url}[/img]"