✨ feat!: release v0.5.0 with api integration fixes and ux overhaul

- Critical functionality was broken and is now fixed
- Major user-facing improvements (colored logging, CLI, progress bars)
- Complete architecture restructuring

Author: rahaaatul

.gitignore

@@ -171,3 +171,11 @@ ruff.toml
 # Development docs
 audit.md
 TODO.md
+
+# uv lock file
+uv.lock
+
+# local
+backups/
+scripts/
+analysis/

README.md

@@ -38,5 +38,6 @@
 
 > [!NOTE]
 >
-> - If `-d` or `--directory` is not invoked, TokySnatcher will download the books in current directory.
+> - By default, TokySnatcher saves audiobooks to your system's Music folder in an "Audiobooks" subfolder (e.g., `C:\Users\User\Music\Audiobooks\` on Windows)
+> - Use `-d` or `--directory` to specify a custom location
 >

pyproject.toml

@@ -1,19 +1,13 @@
 [project]
 name = "tokysnatcher"
-version = "0.4.0"
+version = "0.5.0"
 description = "A simple audiobook downloader for tokybook.com"
 readme = "README.md"
 requires-python = ">=3.9,<3.15"
 dependencies = [
-  "gazpacho==1.1",
-  "halo==0.0.31",
-  "json5==0.12.0",
-  "pebble==5.1.3",
-
-  "questionary==2.1.1",
-  "requests==2.32.3",
+  "questionary>=2.1.1",
+  "requests>=2.32.3",
   "rich",
-  "urllib3==2.4.0",
 ]
 classifiers = [
   "Programming Language :: Python :: 3",
@@ -31,3 +25,6 @@ tokysnatcher = 'tokysnatcher.__main__:main'
 [build-system]
 requires = ["setuptools>=61.0", "wheel"]
 build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+exclude = ["analysis*"]

requirements.txt

@@ -1,38 +1,47 @@
+from dataclasses import dataclass
 import argparse
-from os import name, system
-import questionary
-import shutil
-import sys
 import logging
 import platform
+import shutil
+import sys
+from os import name, system
+from pathlib import Path
+
+import questionary
 
 from .chapters import get_chapters
 from .search import search_book
 
 # Terminal settings for Unix-like systems
 if platform.system() != "Windows":
     import termios
+
     fd: int = sys.stdin.fileno()
     old_term_settings: list[int] = termios.tcgetattr(fd)
 else:
     termios = None
 
+from .utils import setup_colored_logging
+
 # Configure logging
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s - %(levelname)s - %(message)s",
-    datefmt="%Y-%m-%d %H:%M:%S",
-)
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class DownloadConfig:
+    directory: Path | None
+    verbose: bool
+    show_all_chapter_bars: bool
 
 
 def check_ffmpeg() -> None:
     """Check if ffmpeg is available in PATH."""
     if not shutil.which("ffmpeg"):
-        print("Error: ffmpeg is required but not found in PATH")
-        print("Please install ffmpeg:")
-        print("  macOS: brew install ffmpeg")
-        print("  Ubuntu/Debian: sudo apt install ffmpeg")
-        print("  Windows: Download from https://ffmpeg.org/download.html")
+        logger.error("ffmpeg is required but not found in PATH")
+        logger.info("Please install ffmpeg:")
+        logger.info("  macOS: brew install ffmpeg")
+        logger.info("  Ubuntu/Debian: sudo apt install ffmpeg")
+        logger.info("  Windows: Download from https://ffmpeg.org/download.html")
         sys.exit(1)
 
 
@@ -41,77 +50,154 @@ def clear_terminal() -> None:
     system("cls" if name == "nt" else "clear")  # noqa: S605
 
 
-def get_input():
-    """Get URL input from user for manual download."""
-    url = input("Enter URL: ")
-
+def validate_url(url: str) -> str:
+    """Validate and return a validated url."""
     if not url.startswith("https://tokybook.com/"):
-        print("Invalid URL!")
-        return get_input()
-
+        raise ValueError(f"Invalid URL: {url}. Must start with https://tokybook.com/")
     return url
 
 
-def main() -> None:
-    """Get argument from CLI and execute the selected action."""
-    # Check for ffmpeg first
-    check_ffmpeg()
-
+def parse_arguments() -> argparse.Namespace:
+    """Parse command line arguments."""
     parser = argparse.ArgumentParser(
         description="TokySnatcher - Download Audiobooks from TokyBook"
     )
     parser.add_argument(
         "-d", "--directory", type=str, default=None, help="Custom download directory"
     )
     parser.add_argument(
-        "-s", "--search", type=str, default=None, help="Search query to bypass interactive menu"
+        "-s",
+        "--search",
+        type=str,
+        default=None,
+        help="Search query to bypass interactive menu",
     )
     parser.add_argument(
-        "-u", "--url", type=str, default=None, help="Direct URL to download, bypassing search"
+        "-u",
+        "--url",
+        type=str,
+        default=None,
+        help="Direct URL to download, bypassing search",
     )
-    args = parser.parse_args()
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="store_true",
+        help="Show detailed logs during download",
+    )
+    parser.add_argument(
+        "-a",
+        "--show-all-chapter-bars",
+        action="store_true",
+        default=False,
+        help="Show all chapter progress bars permanently",
+    )
+    return parser.parse_args()
 
+
+def execute_download(url: str, config: DownloadConfig) -> None:
+    """Execute the download process for a given URL."""
+    from .utils import _shutdown_requested
+
+    logger.info("Download starting.")
+    get_chapters(
+        url,
+        config.directory,
+        verbose=config.verbose,
+        show_all_chapter_bars=config.show_all_chapter_bars,
+    )
+
+    # Check if download was interrupted
+    if _shutdown_requested:
+        logger.warning("Download was cancelled by user.")
+
+
+def handle_url_action(url: str, config: DownloadConfig) -> None:
+    """Handle direct URL download."""
+    validated_url = validate_url(url)
+    logger.info("Downloading from provided URL.")
+    execute_download(validated_url, config)
+
+
+def handle_search_action(query: str, config: DownloadConfig) -> None:
+    """Handle search action."""
+    result = search_book(query, interactive=True)
+    if result:
+        execute_download(result, config)
+
+
+def handle_interactive_action(config: DownloadConfig) -> None:
+    """Handle interactive menu selection."""
+    choices = ["Search book", "Download from URL", "Exit"]
+    selected_action = questionary.select("Choose action:", choices=choices).ask()
+
+    if selected_action is None:
+        logger.info("No action selected. Exiting.")
+        return
+
+    actions = {
+        "Search book": lambda: handle_search_action(
+            input("Enter search query: "), config
+        ),
+        "Download from URL": lambda: handle_url_action(get_validated_input(), config),
+        "Exit": lambda: None,
+    }
+
+    action = actions.get(selected_action)
+    if action:
+        action()
+
+
+def get_validated_input() -> str:
+    """Get validated URL input from user."""
+    url = input("Enter URL: ")
     try:
-        # If URL provided, skip everything and download directly
-        if args.url:
-            logging.info("Downloading from provided URL.")
-            get_chapters(args.url, args.directory)
-            return
-
-        # If search query provided, skip interactive menu
-        if args.search:
-            result = search_book(args.search)
-            if result:
-                logging.info("Action completed successfully.")
-                get_chapters(result, args.directory)
-            return
-
-        # Define available choices
-        choices = ["Search book", "Download from URL", "Exit"]
-        selected_action = questionary.select("Choose action:", choices=choices).ask()
-
-        if selected_action is None:
-            logging.info("No action selected. Exiting.")
-            sys.exit(0)
-
-        # Map actions to corresponding functions
-        actions = [search_book, get_input, sys.exit]
-        action = actions[choices.index(selected_action)]
-        result = action()
-
-        if result:
-            logging.info("Action completed successfully.")
-            get_chapters(result, args.directory)
+        return validate_url(url)
+    except ValueError as e:
+        print(f"Error: {e}")
+        return get_validated_input()
+
+
+def get_input() -> str:
+    """Get URL input from user for manual download. Deprecated, use get_validated_input."""
+    while True:
+        url = input("Enter URL: ")
+        try:
+            return validate_url(url)
+        except ValueError as e:
+            print(f"Error: {e}")
+            continue
+
 
+def main() -> None:
+    """Get argument from CLI and execute the selected action."""
+    check_ffmpeg()
+    args = parse_arguments()
+    setup_colored_logging(args.verbose)
+
+    config = DownloadConfig(
+        directory=Path(args.directory) if args.directory else None,
+        verbose=args.verbose,
+        show_all_chapter_bars=args.show_all_chapter_bars,
+    )
+
+    try:
+        if args.url:
+            handle_url_action(args.url, config)
+        elif args.search:
+            handle_search_action(args.search, config)
+        else:
+            handle_interactive_action(config)
     except KeyboardInterrupt:
-        logging.warning("Process interrupted by user.")
+        logger.warning("Process interrupted by user.")
         sys.exit(0)
-    except Exception as e:
-        logging.error(f"An unexpected error occurred: {e}")
+    except Exception:
+        logger.exception("An unexpected error occurred")
         sys.exit(1)
     finally:
         if termios:
             termios.tcsetattr(fd, termios.TCSADRAIN, old_term_settings)
 
+
 if __name__ == "__main__":
     main()