cobweb-launcher 1.1.9__tar.gz → 1.1.10__tar.gz

{cobweb-launcher-1.1.9/cobweb_launcher.egg-info → cobweb-launcher-1.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.1.9
+Version: 1.1.10
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.1.9 → cobweb-launcher-1.1.10}/cobweb/__init__.py

@@ -1,2 +1,2 @@
 from .launchers import Launcher, LauncherPro
-from .constant import Crawler
+from .constant import CrawlerModel

{cobweb-launcher-1.1.9 → cobweb-launcher-1.1.10}/cobweb/constant.py

@@ -1,5 +1,5 @@
 
-class Crawler:
+class CrawlerModel:
 
     default = "cobweb.crawlers.Crawler"
     file_air = "cobweb.crawlers.FileCrawlerAir"

{cobweb-launcher-1.1.9 → cobweb-launcher-1.1.10}/cobweb/crawlers/file_crawler.py

@@ -17,7 +17,7 @@ class FileCrawlerAir(Crawler):
         seed_dict = item.seed.to_dict
         bucket_name = oss_util.bucket
         try:
-            key = item.seed.oss_path
+            key = item.seed.oss_path or getattr(item, "oss_path", None)
             if oss_util.exists(key):
                 content_length = oss_util.head(key).content_length
                 yield Response(item.seed, "exists", bucket_name=bucket_name, data_size=content_length, **seed_dict)
@@ -90,14 +90,14 @@ class FileCrawlerAir(Crawler):
             yield Seed(seed_dict, identifier="merge")
 
 
-class FileCrawlerPro(Crawler):
+class VideoCrawler(FileCrawlerAir):
 
     @staticmethod
     def download(item: Request) -> Union[Seed, BaseItem, Response, str]:
         seed_dict = item.seed.to_dict
         bucket_name = oss_util.bucket
         try:
-            key = item.seed.oss_path
+            key = item.seed.oss_path or getattr(item, "oss_path", None)
             if oss_util.exists(key):
                 content_length = oss_util.head(key).content_length
                 yield Response(item.seed, "exists", bucket_name=bucket_name, data_size=content_length, **seed_dict)

{cobweb-launcher-1.1.9 → cobweb-launcher-1.1.10}/cobweb/launchers/launcher.py

@@ -59,7 +59,7 @@ class Launcher(threading.Thread):
         _setting.update(**kwargs)
 
         for k, v in _setting.items():
-            setattr(setting, k, v)
+            setattr(setting, k.upper(), v)
 
         self._Crawler = dynamic_load_class(setting.CRAWLER)
         self._Pipeline = dynamic_load_class(setting.PIPELINE)

{cobweb-launcher-1.1.9 → cobweb-launcher-1.1.10}/cobweb/setting.py

@@ -26,6 +26,7 @@ OSS_SECRET_KEY = os.getenv("OSS_SECRET_KEY")
 OSS_CHUNK_SIZE = 10 * 1024 ** 2
 OSS_MIN_UPLOAD_SIZE = 1024
 
+
 # 采集器选择
 CRAWLER = "cobweb.crawlers.Crawler"
 

{cobweb-launcher-1.1.9 → cobweb-launcher-1.1.10}/cobweb/utils/oss.py

@@ -15,11 +15,13 @@ class OssUtil:
         secret_key=None,
         chunk_size=None,
         min_upload_size=None,
+        **kwargs
     ):
         self.bucket = bucket or setting.OSS_BUCKET
         self.endpoint = endpoint or setting.OSS_ENDPOINT
         self.chunk_size = int(chunk_size or setting.OSS_CHUNK_SIZE)
         self.min_upload_size = int(min_upload_size or setting.OSS_MIN_UPLOAD_SIZE)
+
         self._auth = Auth(
             access_key_id=access_key or setting.OSS_ACCESS_KEY,
             access_key_secret=secret_key or setting.OSS_SECRET_KEY
@@ -28,6 +30,7 @@ class OssUtil:
             auth=self._auth,
             endpoint=self.endpoint,
             bucket_name=self.bucket,
+            **kwargs
         )
 
     def exists(self, key: str) -> bool:

{cobweb-launcher-1.1.9 → cobweb-launcher-1.1.10/cobweb_launcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.1.9
+Version: 1.1.10
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.1.9 → cobweb-launcher-1.1.10}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="cobweb-launcher",
-    version="1.1.9",
+    version="1.1.10",
     packages=find_packages(),
     url="https://github.com/Juannie-PP/cobweb",
     license="MIT",