mkv-episode-matcher 0.3.3__py3-none-any.whl → 1.0.0__py3-none-any.whl

mkv_episode_matcher/subtitle_utils.py

@@ -0,0 +1,82 @@
+import re
+from pathlib import Path
+
+
+def generate_subtitle_patterns(
+    series_name: str, season: int, episode: int
+) -> list[str]:
+    """
+    Generate various common subtitle filename patterns.
+
+    Args:
+        series_name (str): Name of the series
+        season (int): Season number
+        episode (int): Episode number
+
+    Returns:
+        List[str]: List of possible subtitle filenames
+    """
+    patterns = [
+        # Standard format: "Show Name - S01E02.srt"
+        f"{series_name} - S{season:02d}E{episode:02d}.srt",
+        # Season x Episode format: "Show Name - 1x02.srt"
+        f"{series_name} - {season}x{episode:02d}.srt",
+        # Separate season/episode: "Show Name - Season 1 Episode 02.srt"
+        f"{series_name} - Season {season} Episode {episode:02d}.srt",
+        # Compact format: "ShowName.S01E02.srt"
+        f"{series_name.replace(' ', '')}.S{season:02d}E{episode:02d}.srt",
+        # Numbered format: "Show Name 102.srt"
+        f"{series_name} {season:01d}{episode:02d}.srt",
+        # Dot format: "Show.Name.1x02.srt"
+        f"{series_name.replace(' ', '.')}.{season}x{episode:02d}.srt",
+        # Underscore format: "Show_Name_S01E02.srt"
+        f"{series_name.replace(' ', '_')}_S{season:02d}E{episode:02d}.srt",
+    ]
+
+    return patterns
+
+
+def find_existing_subtitle(
+    series_cache_dir: str, series_name: str, season: int, episode: int
+) -> str | None:
+    """
+    Check for existing subtitle files in various naming formats.
+
+    Args:
+        series_cache_dir (str): Directory containing subtitle files
+        series_name (str): Name of the series
+        season (int): Season number
+        episode (int): Episode number
+
+    Returns:
+        Optional[str]: Path to existing subtitle file if found, None otherwise
+    """
+    patterns = generate_subtitle_patterns(series_name, season, episode)
+
+    for pattern in patterns:
+        filepath = Path(series_cache_dir) / pattern
+        if filepath.exists():
+            return filepath
+
+    return None
+
+
+def sanitize_filename(filename: str) -> str:
+    """
+    Sanitize filename by removing/replacing invalid characters.
+
+    Args:
+        filename (str): Original filename
+
+    Returns:
+        str: Sanitized filename
+    """
+    # Replace problematic characters
+    filename = filename.replace(":", " -")
+    filename = filename.replace("/", "-")
+    filename = filename.replace("\\", "-")
+
+    # Remove any other invalid characters
+    filename = re.sub(r'[<>:"/\\|?*]', "", filename)
+
+    return filename.strip()

mkv_episode_matcher/tmdb_client.py

@@ -1,12 +1,51 @@
 # tmdb_client.py
 import time
+from functools import wraps
 from threading import Lock
+from typing import Any, Callable, TypeVar
 
 import requests
 from loguru import logger
 
-from mkv_episode_matcher.__main__ import CONFIG_FILE
-from mkv_episode_matcher.config import get_config
+F = TypeVar("F", bound=Callable[..., Any])
+
+
+def retry_network_operation(
+    max_retries: int = 3, base_delay: float = 1.0
+) -> Callable[[F], F]:
+    """Decorator for retrying network operations."""
+
+    def decorator(func: F) -> F:
+        @wraps(func)
+        def wrapper(*args: Any, **kwargs: Any) -> Any:
+            last_exception = None
+            delay = base_delay
+
+            for attempt in range(max_retries + 1):
+                try:
+                    return func(*args, **kwargs)
+                except (requests.RequestException, ConnectionError, TimeoutError) as e:
+                    last_exception = e
+                    if attempt == max_retries:
+                        logger.error(
+                            f"Max retries ({max_retries}) exceeded for {func.__name__}: {e}"
+                        )
+                        raise e
+
+                    logger.warning(
+                        f"Network retry {attempt + 1}/{max_retries + 1} for {func.__name__}: {e}"
+                    )
+                    time.sleep(delay)
+                    delay = min(delay * 2, 30)  # Cap at 30 seconds
+
+            raise last_exception
+
+        return wrapper  # type: ignore
+
+    return decorator
+
+
+from mkv_episode_matcher.core.config_manager import get_config_manager
 
 BASE_IMAGE_URL = "https://image.tmdb.org/t/p/original"
 
@@ -50,7 +89,7 @@ class RateLimitedRequest:
 
             self.requests_made += 1
 
-        response = requests.get(url)
+        response = requests.get(url, timeout=30)
         return response
 
 
@@ -58,7 +97,8 @@ class RateLimitedRequest:
 rate_limited_request = RateLimitedRequest(rate_limit=30, period=1)
 
 
-def fetch_show_id(show_name):
+@retry_network_operation(max_retries=3, base_delay=1.0)
+def fetch_show_id(show_name: str) -> str | None:
     """
     Fetch the TMDb ID for a given show name.
 
@@ -68,8 +108,8 @@ def fetch_show_id(show_name):
     Returns:
         str: The TMDb ID of the show, or None if not found.
     """
-    config = get_config(CONFIG_FILE)
-    tmdb_api_key = config.get("tmdb_api_key")
+    config = get_config_manager().load()
+    tmdb_api_key = config.tmdb_api_key
     url = f"https://api.themoviedb.org/3/search/tv?query={show_name}&api_key={tmdb_api_key}"
     response = requests.get(url)
     if response.status_code == 200:
@@ -79,7 +119,8 @@ def fetch_show_id(show_name):
     return None
 
 
-def fetch_season_details(show_id, season_number):
+@retry_network_operation(max_retries=3, base_delay=1.0)
+def fetch_season_details(show_id: str, season_number: int) -> int:
     """
     Fetch the total number of episodes for a given show and season from the TMDb API.
 
@@ -91,11 +132,11 @@ def fetch_season_details(show_id, season_number):
         int: The total number of episodes in the season, or 0 if the API request failed.
     """
     logger.info(f"Fetching season details for Season {season_number}...")
-    config = get_config(CONFIG_FILE)
-    tmdb_api_key = config.get("tmdb_api_key")
+    config = get_config_manager().load()
+    tmdb_api_key = config.tmdb_api_key
     url = f"https://api.themoviedb.org/3/tv/{show_id}/season/{season_number}?api_key={tmdb_api_key}"
     try:
-        response = requests.get(url)
+        response = requests.get(url, timeout=30)
         response.raise_for_status()
         season_data = response.json()
         total_episodes = len(season_data.get("episodes", []))
@@ -110,7 +151,8 @@ def fetch_season_details(show_id, season_number):
         return 0
 
 
-def get_number_of_seasons(show_id):
+@retry_network_operation(max_retries=3, base_delay=1.0)
+def get_number_of_seasons(show_id: str) -> int:
     """
     Retrieves the number of seasons for a given TV show from the TMDB API.
 
@@ -123,10 +165,10 @@ def get_number_of_seasons(show_id):
     Raises:
     - requests.HTTPError: If there is an error while making the API request.
     """
-    config = get_config(CONFIG_FILE)
-    tmdb_api_key = config.get("tmdb_api_key")
+    config = get_config_manager().load()
+    tmdb_api_key = config.tmdb_api_key
     url = f"https://api.themoviedb.org/3/tv/{show_id}?api_key={tmdb_api_key}"
-    response = requests.get(url)
+    response = requests.get(url, timeout=30)
     response.raise_for_status()
     show_data = response.json()
     num_seasons = show_data.get("number_of_seasons", 0)