Commit

src/utils/network_utils.py

@@ -1,14 +1,7 @@
-# --- Standard Library Imports ---
 import os
 import re
 from urllib.parse import urlparse
 
-# --- Third-Party Library Imports ---
-# This module might not require third-party libraries directly,
-# but 'requests' is a common dependency for network operations.
-# import requests
-
-
 def parse_cookie_string(cookie_string):
     """
     Parses a 'name=value; name2=value2' cookie string into a dictionary.
@@ -106,13 +99,11 @@ def prepare_cookies_for_request(use_cookie_flag, cookie_text_input, selected_coo
     if not use_cookie_flag:
         return None
 
-    # Priority 1: Use the specifically browsed file first
     if selected_cookie_file_path and os.path.exists(selected_cookie_file_path):
         cookies = load_cookies_from_netscape_file(selected_cookie_file_path, logger_func, target_domain)
         if cookies:
             return cookies
 
-    # Priority 2: Look for a domain-specific cookie file
     if app_base_dir and target_domain:
         domain_specific_path = os.path.join(app_base_dir, "data", f"{target_domain}_cookies.txt")
         if os.path.exists(domain_specific_path):
@@ -120,7 +111,6 @@ def prepare_cookies_for_request(use_cookie_flag, cookie_text_input, selected_coo
             if cookies:
                 return cookies
 
-    # Priority 3: Look for a generic cookies.txt
     if app_base_dir:
         default_path = os.path.join(app_base_dir, "appdata", "cookies.txt")
         if os.path.exists(default_path):
@@ -128,7 +118,6 @@ def prepare_cookies_for_request(use_cookie_flag, cookie_text_input, selected_coo
             if cookies:
                 return cookies
 
-    # Priority 4: Fall back to manually entered text
     if cookie_text_input:
         cookies = parse_cookie_string(cookie_text_input)
         if cookies:
@@ -148,6 +137,16 @@ def extract_post_info(url_string):
 
     stripped_url = url_string.strip()
 
+    # --- Danbooru Check ---
+    danbooru_match = re.search(r'danbooru\.donmai\.us|safebooru\.donmai\.us', stripped_url)
+    if danbooru_match:
+        return 'danbooru', None, None
+        
+    # --- Gelbooru Check ---
+    gelbooru_match = re.search(r'gelbooru\.com', stripped_url)
+    if gelbooru_match:
+        return 'gelbooru', None, None
+
     # --- Bunkr Check ---
     bunkr_pattern = re.compile(
         r"(?:https?://)?(?:[a-zA-Z0-9-]+\.)?bunkr\.(?:si|la|ws|red|black|media|site|is|to|ac|cr|ci|fi|pk|ps|sk|ph|su|ru)|bunkrr\.ru"
@@ -155,17 +154,28 @@ def extract_post_info(url_string):
     if bunkr_pattern.search(stripped_url):
         return 'bunkr', stripped_url, None
 
+    # --- SimpCity Check (Corrected version) ---
+    simpcity_match = re.search(r'simpcity\.cr/threads/([^/]+)(?:/post-(\d+))?', stripped_url)
+    if simpcity_match:
+        thread_info = simpcity_match.group(1)
+        post_id = simpcity_match.group(2)
+        return 'simpcity', thread_info, post_id
+
     # --- nhentai Check ---
     nhentai_match = re.search(r'nhentai\.net/g/(\d+)', stripped_url)
     if nhentai_match:
         return 'nhentai', nhentai_match.group(1), None
-    
-    # --- Hentai2Read Check (Updated) ---
-    # This regex now captures the manga slug (id1) and optionally the chapter number (id2)
+
+    # --- Hentai2Read Check (Corrected to match series, chapter, and image URLs) ---
     hentai2read_match = re.search(r'hentai2read\.com/([^/]+)(?:/(\d+))?/?', stripped_url)
     if hentai2read_match:
         manga_slug, chapter_num = hentai2read_match.groups()
-        return 'hentai2read', manga_slug, chapter_num # chapter_num will be None for series URLs
+        return 'hentai2read', manga_slug, chapter_num
+
+    # --- Pixeldrain Check ---
+    pixeldrain_match = re.search(r'pixeldrain\.com/[lud]/([^/?#]+)', stripped_url)
+    if pixeldrain_match:
+        return 'pixeldrain', stripped_url, None
 
     discord_channel_match = re.search(r'discord\.com/channels/(@me|\d+)/(\d+)', stripped_url)
     if discord_channel_match:
@@ -196,7 +206,7 @@ def extract_post_info(url_string):
         print(f"Debug: Exception during URL parsing for '{url_string}': {e}")
 
     return None, None, None
-    
+        
 def get_link_platform(url):
     """
     Identifies the platform of a given URL based on its domain.