cyberdrop-dl-patched 5.7.2.dev0__tar.gz → 5.7.2.dev2__tar.gz

{cyberdrop_dl_patched-5.7.2.dev0 → cyberdrop_dl_patched-5.7.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cyberdrop-dl-patched
-Version: 5.7.2.dev0
+Version: 5.7.2.dev2
 Summary: Bulk downloader for multiple file hosts
 Home-page: https://github.com/jbsparrow/CyberDropDownloader
 Author: Jacob B

{cyberdrop_dl_patched-5.7.2.dev0 → cyberdrop_dl_patched-5.7.2.dev2}/cyberdrop_dl/scraper/crawlers/coomer_crawler.py

@@ -11,8 +11,8 @@ from yarl import URL
 from cyberdrop_dl.clients.errors import MaxChildrenError, ScrapeError
 from cyberdrop_dl.scraper.crawler import Crawler
 from cyberdrop_dl.utils.dataclasses.url_objects import FILE_HOST_ALBUM, FILE_HOST_PROFILE, ScrapeItem
-from cyberdrop_dl.utils.utilities import error_handling_wrapper, get_filename_and_ext
 from cyberdrop_dl.utils.logger import log
+from cyberdrop_dl.utils.utilities import error_handling_wrapper, get_filename_and_ext
 
 if TYPE_CHECKING:
     from bs4 import BeautifulSoup
@@ -106,7 +106,7 @@ class CoomerCrawler(Crawler):
                     )
                     # Check cache to see if responses match
                     cached_response = await self.manager.cache_manager.request_cache.get_response(str(query_api_call))
-                    cached_json = await cached_response.json()
+                    cached_json = await cached_response.json() if cached_response else None
                     if JSON_Resp != cached_json:
                         await log(f"New posts founr for {user_str}, invalidating cache", 20)
                         await self.manager.cache_manager.request_cache.delete_url(api_call)

{cyberdrop_dl_patched-5.7.2.dev0 → cyberdrop_dl_patched-5.7.2.dev2}/cyberdrop_dl/scraper/crawlers/kemono_crawler.py

@@ -12,8 +12,8 @@ from yarl import URL
 from cyberdrop_dl.clients.errors import MaxChildrenError, NoExtensionError
 from cyberdrop_dl.scraper.crawler import Crawler
 from cyberdrop_dl.utils.dataclasses.url_objects import FILE_HOST_ALBUM, FILE_HOST_PROFILE, ScrapeItem
-from cyberdrop_dl.utils.utilities import error_handling_wrapper, get_filename_and_ext
 from cyberdrop_dl.utils.logger import log
+from cyberdrop_dl.utils.utilities import error_handling_wrapper, get_filename_and_ext
 
 if TYPE_CHECKING:
     from bs4 import BeautifulSoup
@@ -82,7 +82,7 @@ class KemonoCrawler(Crawler):
                     )
                     # Check to see if the responses match
                     cached_response = await self.manager.cache_manager.request_cache.get_response(str(query_api_call))
-                    cached_json = await cached_response.json()
+                    cached_json = await cached_response.json() if cached_response else None
                     if JSON_Resp != cached_json:
                         await log(f"New posts founr for {user_str}, invalidating cache", 20)
                         await self.manager.cache_manager.request_cache.delete_url(api_call)

{cyberdrop_dl_patched-5.7.2.dev0 → cyberdrop_dl_patched-5.7.2.dev2}/cyberdrop_dl/utils/utilities.py

@@ -200,8 +200,8 @@ async def check_partials_and_empty_folders(manager: Manager) -> None:
     if not manager.config_manager.settings_data["Runtime_Options"]["skip_check_for_empty_folders"]:
         log_with_color("Checking for empty folders...", "yellow", 20)
         purge_dir_tree(manager.path_manager.download_dir)
-        if isinstance(manager.path_manager.sorted_dir, Path):
-            purge_dir_tree(manager.path_manager.sorted_dir)
+        # if isinstance(manager.path_manager.sorted_dir, Path):
+        #     purge_dir_tree(manager.path_manager.sorted_dir)
 
 
 def check_latest_pypi(log_to_console: bool = True, call_from_ui: bool = False) -> tuple[str, str]:

{cyberdrop_dl_patched-5.7.2.dev0 → cyberdrop_dl_patched-5.7.2.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cyberdrop-dl-patched"
-version = "5.7.2.dev0"
+version = "5.7.2.dev2"
 description = "Bulk downloader for multiple file hosts"
 authors = ["Jacob B <admin@script-ware.net>"]
 readme = "README.md"