Make 'Downloads' folder creation optional

Add --no-download-folder flag to prevent creating the 'Downloads' subfolder.

Author: Lysagxra

downloader.py

@@ -125,6 +125,7 @@ async def validate_and_download(
     download_path = create_download_directory(
         directory_name,
         custom_path=args.custom_path,
+        no_download_folder=args.no_download_folder,
     )
     session_info = SessionInfo(
         args=args,

src/config.py

@@ -38,7 +38,7 @@
 # ============================
 MEDIA_SLUG_REGEX = r'const\s+slug\s*=\s*"([a-zA-Z0-9_-]+)"'  # Extract media slug.
 VALID_SLUG_REGEX = r"^[a-zA-Z0-9_-]+$"                       # Validate media slug.
-VALID_CHARACTERS_REGEX = r'[<>:"/\\|?*\x00-\x1f]'  # Strip only filesystem-illegal chars
+VALID_CHARACTERS_REGEX = r'[<>:"/\\|?*\x00-\x1f]'            # Validate characters.
 
 # ============================
 # UI & Table Settings
@@ -224,6 +224,11 @@ def add_common_arguments(parser: ArgumentParser) -> None:
         default=None,
         help="The directory where the downloaded content will be saved.",
     )
+    parser.add_argument(
+        "--no-download-folder",
+        action="store_true",
+        help="Save files without a 'Downloads' subfolder.",
+    )
     parser.add_argument(
         "--disable-ui",
         action="store_true",

src/file_utils.py

@@ -91,7 +91,7 @@ def sanitize_directory_name(directory_name: str) -> str:
     """
     invalid_chars_dict = {
         "nt": r'[\\/:*?"<>|]',  # Windows
-        "posix": r"[/:]",  # macOS and Linux
+        "posix": r"[/:]",       # macOS and Linux
     }
     invalid_chars = invalid_chars_dict.get(os.name)
     return re.sub(invalid_chars, "_", directory_name)
@@ -100,6 +100,8 @@ def sanitize_directory_name(directory_name: str) -> str:
 def create_download_directory(
     directory_name: str,
     custom_path: str | None = None,
+    *,
+    no_download_folder: bool = False,
 ) -> str:
     """Create a directory for downloads if it doesn't exist."""
     # Sanitizing the directory name (album ID), if provided
@@ -108,9 +110,9 @@ def create_download_directory(
     )
 
     # Determine the base download path.
-    base_path = (
-        Path(custom_path) / DOWNLOAD_FOLDER if custom_path else Path(DOWNLOAD_FOLDER)
-    )
+    base_path = Path(custom_path or ".")  # default to current directory
+    if not no_download_folder:
+        base_path /= DOWNLOAD_FOLDER      # append DOWNLOAD_FOLDER only if needed
 
     # Albums containing a single file will be directly downloaded into the 'Downloads'
     # folder, without creating a subfolder for the album ID.
@@ -143,7 +145,7 @@ def create_urls_file_backup() -> None:
         sys.exit(1)
 
     timestamp = datetime.now(timezone.utc).strftime("%d%m%Y_%H%M%S")
-    backup_file = Path(f"URLs_{timestamp}.txt.bak")
+    backup_file = Path(f"URLs_{timestamp}.bak")
     shutil.copy2(URLS_FILE, backup_folder / backup_file)
 
 

src/general_utils.py

@@ -57,7 +57,6 @@ def handle_response(response: Response) -> BeautifulSoup | None:
             logging.exception(log_message)
             return None
 
-        # Use raw bytes to let BS4 detect encoding
         return BeautifulSoup(response.content, "html.parser")
 
     for attempt in range(retries):