Fix and Format something

Author: manduted

kubespider/core/webhook_server.py

@@ -82,8 +82,8 @@ def download_handler():
 
     err = source_manager.source_provider_manager.download_with_source_provider(event)
 
-    if err is None or type(err) is dict:
-        if type(err) is dict and err['Status'] == "Success":
+    if err is None or isinstance(err, dict):
+        if isinstance(err, dict) and err['Status'] == "Success":
             notification_server.kubespider_notification_server.send_message(
                 title="[webhook] start download", name=err['Name'], source=source, path=path
             )

kubespider/download_provider/xunlei_download_provider/provider.py

@@ -136,7 +136,7 @@ def send_task(self, token: str, file_info: dict, url: str, path: str) -> TypeErr
                 logging.error("Create tasks error:%s", req.text)
                 return ValueError("Create task error")
             if url.startswith("magnet:?"):
-                magnet_name = MagnetUrl(url).Resolve()
+                magnet_name = MagnetUrl(url).resolve()
                 logging.info("Check MagnetLink Name:%s", magnet_name)
                 return {"Status":"Success", "Name":magnet_name}
             if url.startswith("ed2k://"):

kubespider/notification_provider/dingtalk_notification_provider/provider.py

@@ -70,9 +70,8 @@ def build_sign(self, secret: str):
         # 计算加签后的密钥
         timestamp = str(round(time.time() * 1000))
         secret_enc = secret.encode('utf-8')
-        string_to_sign = '{}\n{}'.format(timestamp, secret)
+        string_to_sign = f"{timestamp}\n{secret}"
         string_to_sign_enc = string_to_sign.encode('utf-8')
         hmac_code = hmac.new(secret_enc, string_to_sign_enc, digestmod=hashlib.sha256).digest()
         sign = urllib.parse.quote_plus(base64.b64encode(hmac_code))
-        return timestamp, sign
-
+        return timestamp, sign

kubespider/notification_provider/feishu_notification_provider/provider.py

@@ -84,7 +84,7 @@ def format_message(self, title, **kwargs) -> str:
     def build_sign(self, secret: str):
         # 计算加签后的密钥
         timestamp = str(round(time.time()))
-        string_to_sign = '{}\n{}'.format(timestamp, secret)
+        string_to_sign = f"{timestamp}\n{secret}"
         hmac_code = hmac.new(string_to_sign.encode("utf-8"), digestmod=hashlib.sha256).digest()
         sign = base64.b64encode(hmac_code).decode('utf-8')
-        return timestamp, sign
+        return timestamp, sign

kubespider/utils/magnet_url.py

@@ -1,6 +1,7 @@
+import re
 from urllib.parse import urlparse, parse_qs
 
-class MagnetUrl(object):
+class MagnetUrl:
     url = None
     xturn_delimiter = ':'
 
@@ -57,26 +58,22 @@ def data_index(self, fieldname, index=None):
     def __hash_type(self, index=None):
         xturn = self.data_index('xt', index)
         if not xturn:
-            return
+            return None
         return ' '.join(xturn.split(self.xturn_delimiter)[1:-1])
 
     def __hash(self, index=None):
         xturn = self.data_index('xt', index)
         if not xturn:
-            return
+            return None
         return xturn.split(self.xturn_delimiter)[-1]
 
     def __data_size(self, index=None):
         return self.data_index('xl', index)
 
     def __file_entry(self, index):
-        return dict(
-            display_name=self.__display_name(index),
-            data_size=self.__data_size(index),
-            hash_type=self.__hash_type(index),
-            hash=self.__hash(index))
+        return {"display_name": self.__display_name(index), "data_size": self.__data_size(index), "hash_type": self.__hash_type(index), "hash": self.__hash(index)}
 
-    def Resolve(self):
+    def resolve(self):
         char = ".torrent"
         if self.files[0]['display_name'] is not None:
             result = self.files[0]['display_name']
@@ -85,9 +82,15 @@ def Resolve(self):
                 if "dn" in key:
                     result = self.data[key]
                     break
-                else:
-                    result = "No Name Found"
         if result.endswith(char):
             result = result[:-len(char)]
-
-        return result
+        return result
+        
+    def ed2k_filename(self):
+        pattern = r'ed2k://\|file\|(.+)\|(\d+)\|([a-fA-F0-9]+)\|/'
+        match = re.match(pattern, self.url)
+        if match:
+            filename = match.group(1)
+            return filename
+        else:
+            raise ValueError("Invalid ed2k link")