cyberdrop-dl-patched 5.7.2.dev6__tar.gz → 5.7.2.dev8__tar.gz

{cyberdrop_dl_patched-5.7.2.dev6 → cyberdrop_dl_patched-5.7.2.dev8}/PKG-INFO

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

{cyberdrop_dl_patched-5.7.2.dev6 → cyberdrop_dl_patched-5.7.2.dev8}/cyberdrop_dl/scraper/crawlers/simpcity_crawler.py

@@ -79,7 +79,7 @@ class SimpCityCrawler(Crawler):
         if not self.logged_in and self.login_attempts == 1:
             log("SimpCity login failed. Scraping without an account.", 40)
 
-        self.client.client_manager.cookies.update_cookies({name: cookie for name, cookie in self.client.client_manager.cookies.items() if 'ddg' in name}, response_url=self.primary_base_domain)
+        self.client.client_manager.cookies.update_cookies({name: cookie for name, cookie in host_cookies.items() if 'ddg' in name}, response_url=self.primary_base_domain)
 
         await self.forum(scrape_item)
 

{cyberdrop_dl_patched-5.7.2.dev6 → cyberdrop_dl_patched-5.7.2.dev8}/cyberdrop_dl/ui/prompts/settings_authentication_prompts.py

@@ -131,26 +131,31 @@ def edit_forum_authentication_values_prompt(manager: Manager) -> None:
                 continue
 
             # Browser Selection
+            
+            profile = manager.config_manager.settings_data["Browser_Cookies"]["profiles"]
+            if profile == "Default":
+                profile = None
+            
             if action == "chrome":
-                get_cookies_from_browser(manager, "chrome")
+                get_cookies_from_browser(manager, "chrome", profile=profile)
             elif action == "firefox":
-                get_cookies_from_browser(manager, "firefox")
+                get_cookies_from_browser(manager, "firefox", profile=profile)
             elif action == "edge":
-                get_cookies_from_browser(manager, "edge")
+                get_cookies_from_browser(manager, "edge", profile=profile)
             elif action == "safari":
-                get_cookies_from_browser(manager, "safari")
+                get_cookies_from_browser(manager, "safari", profile=profile)
             elif action == "opera":
-                get_cookies_from_browser(manager, "opera")
+                get_cookies_from_browser(manager, "opera", profile=profile)
             elif action == "brave":
-                get_cookies_from_browser(manager, "brave")
+                get_cookies_from_browser(manager, "brave", profile=profile)
             elif action == "libreWolf":
-                get_cookies_from_browser(manager, "librewolf")
+                get_cookies_from_browser(manager, "librewolf", profile=profile)
             elif action == "opera_gx":
-                get_cookies_from_browser(manager, "opera_gx")
+                get_cookies_from_browser(manager, "opera_gx", profile=profile)
             elif action == "vivaldi":
-                get_cookies_from_browser(manager, "vivaldi")
+                get_cookies_from_browser(manager, "vivaldi", profile=profile)
             elif action == "chromium":
-                get_cookies_from_browser(manager, "chromium")
+                get_cookies_from_browser(manager, "chromium", profile=profile)
             return
 
         # Enter Cred Values Manually

{cyberdrop_dl_patched-5.7.2.dev6 → cyberdrop_dl_patched-5.7.2.dev8}/cyberdrop_dl/utils/args/browser_cookie_extraction.py

@@ -78,7 +78,7 @@ def cookie_wrapper(func: Callable) -> CookieJar:
 
 
 @cookie_wrapper
-def get_cookies_from_browser(manager: Manager, browsers: str | None = None) -> None:
+def get_cookies_from_browser(manager: Manager, browsers: str | None = None, profiles: str | None = None) -> None:
     """Get the cookies for the supported sites."""
     manager.path_manager.cookies_dir.mkdir(exist_ok=True)
     browsers = browsers or manager.config_manager.settings_data["Browser_Cookies"]["browsers"]
@@ -102,28 +102,30 @@ def get_cookies_from_browser(manager: Manager, browsers: str | None = None) -> N
         cookie_jar.save(cookie_file_path, ignore_discard=True, ignore_expires=True)
 
 
-def get_cookie(browser: str, domain: str) -> CookieJar:
+def get_cookie(browser: str, domain: str, profile: str) -> CookieJar:
     """Get the cookies for a specific domain."""
+    if profile == "Default":
+        profile = None
     if browser == "chrome":
-        cookie = browser_cookie3.chrome(domain_name=domain)
+        cookie = browser_cookie3.chrome(domain_name=domain, profile=profile)
     elif browser == "firefox":
-        cookie = browser_cookie3.firefox(domain_name=domain)
+        cookie = browser_cookie3.firefox(domain_name=domain, profile=profile)
     elif browser == "edge":
-        cookie = browser_cookie3.edge(domain_name=domain)
+        cookie = browser_cookie3.edge(domain_name=domain, profile=profile)
     elif browser == "safari":
-        cookie = browser_cookie3.safari(domain_name=domain)
+        cookie = browser_cookie3.safari(domain_name=domain, profile=profile)
     elif browser == "opera":
-        cookie = browser_cookie3.opera(domain_name=domain)
+        cookie = browser_cookie3.opera(domain_name=domain, profile=profile)
     elif browser == "brave":
-        cookie = browser_cookie3.brave(domain_name=domain)
+        cookie = browser_cookie3.brave(domain_name=domain, profile=profile)
     elif browser == "chromium":
-        cookie = browser_cookie3.chromium(domain_name=domain)
+        cookie = browser_cookie3.chromium(domain_name=domain, profile=profile)
     elif browser == "librewolf":
-        cookie = browser_cookie3.librewolf(domain_name=domain)
+        cookie = browser_cookie3.librewolf(domain_name=domain, profile=profile)
     elif browser == "opera_gx":
-        cookie = browser_cookie3.opera_gx(domain_name=domain)
+        cookie = browser_cookie3.opera_gx(domain_name=domain, profile=profile)
     elif browser == "vivaldi":
-        cookie = browser_cookie3.vivaldi(domain_name=domain)
+        cookie = browser_cookie3.vivaldi(domain_name=domain, profile=profile)
     elif browser is None:
         msg = "Value cannot be None"
         raise ValueError(msg)

{cyberdrop_dl_patched-5.7.2.dev6 → cyberdrop_dl_patched-5.7.2.dev8}/cyberdrop_dl/utils/args/config_definitions.py

@@ -127,6 +127,7 @@ settings: dict = {
     },
     "Browser_Cookies": {
         "browsers": "Chrome",
+        "profiles": "Default",
         "auto_import": False,
         "sites": None,
     },

{cyberdrop_dl_patched-5.7.2.dev6 → cyberdrop_dl_patched-5.7.2.dev8}/pyproject.toml

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