mkv-episode-matcher 0.3.5__tar.gz → 0.3.6__tar.gz

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mkv-episode-matcher
-Version: 0.3.5
+Version: 0.3.6
 Summary: The MKV Episode Matcher is a tool for identifying TV series episodes from MKV files and renaming the files accordingly.
 Home-page: https://github.com/Jsakkos/mkv-episode-matcher
 Author: Jonathan Sakkos
@@ -65,10 +65,11 @@ Automatically match and rename your MKV TV episodes using The Movie Database (TM
 ```bash
 pip install mkv-episode-matcher
 ```
+2. Download .srt subtitles files to ~/.mkv-episode-matcher/cache/data/Show Name/
 
-2. Run on your show directory:
+3. Run on your show directory:
 ```bash
-mkv-match --show-dir "path/to/your/show" --get-subs true
+mkv-match --show-dir "path/to/your/show"
 ```
 
 ## Documentation

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/README.md

@@ -36,10 +36,11 @@ Automatically match and rename your MKV TV episodes using The Movie Database (TM
 ```bash
 pip install mkv-episode-matcher
 ```
+2. Download .srt subtitles files to ~/.mkv-episode-matcher/cache/data/Show Name/
 
-2. Run on your show directory:
+3. Run on your show directory:
 ```bash
-mkv-match --show-dir "path/to/your/show" --get-subs true
+mkv-match --show-dir "path/to/your/show"
 ```
 
 ## Documentation

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/docs/cli.md

@@ -16,14 +16,14 @@ mkv-match --show-dir "/path/to/show" --season 1
 
 ## Command Options
 
-| Option | Description | Default |
-|--------|-------------|---------|
-| `--show-dir` | Show directory path | None |
-| `--season` | Season number to process | None (all) |
-| `--dry-run` | Test without making changes | False |
-| `--get-subs` | Download subtitles | False |
-| `--tmdb-api-key` | TMDb API key | None |
-| `--tesseract-path` | Path to Tesseract | None |
+| Option             | Description                 | Default    |
+| ------------------ | --------------------------- | ---------- |
+| `--show-dir`       | Show directory path         | None       |
+| `--season`         | Season number to process    | None (all) |
+| `--dry-run`        | Test without making changes | False      |
+| `--get-subs`       | Download subtitles          | False      |
+| `--tmdb-api-key`   | TMDb API key                | None       |
+| `--tesseract-path` | Path to Tesseract           | None       |
 
 ## Examples
 
@@ -55,25 +55,6 @@ mkv-match \
   --dry-run true
 ```
 
-## Environment Variables
-
-Alternative to command line options:
-
-```bash
-export TMDB_API_KEY="your_key"
-export SHOW_DIR="/path/to/shows"
-mkv-match
-```
-
-## Exit Codes
-
-| Code | Meaning |
-|------|---------|
-| 0 | Success |
-| 1 | General error |
-| 2 | Configuration error |
-| 3 | API error |
-
 ## Logging
 
 Logs are stored in:
@@ -89,3 +70,4 @@ Logs are stored in:
 2. Use dry-run first to test
 3. Check logs for details
 4. Use full paths for reliability
+5. Avoid using a trailing slash in paths

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/docs/quickstart.md

@@ -41,7 +41,6 @@ Show Name/
 │   ├── episode1.mkv
 │   └── episode2.mkv
 ```
-<!-- Add a note about the .srt reference files -->
 
 ## Reference Subtitle File Structure
 
@@ -60,10 +59,14 @@ The configuration file is automatically generated at `~/.mkv-episode-matcher/con
 
 ```ini
 [Config]
-tmdb_api_key = your_api_key
-open_subtitles_api_key = your_opensubs_key
-show_dir = /path/to/shows
+tmdb_api_key = your_tmdb_api_key
+show_dir = /path/to/show
 max_threads = 4
+open_subtitles_api_key = your_opensubs_key
+open_subtitles_user_agent = your_user_agent
+open_subtitles_username = your_username
+open_subtitles_password = your_password
+tesseract_path = C:\Program Files\Tesseract-OCR\tesseract.exe
 ```
 
 ## Next Steps

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/mkv_episode_matcher/episode_identification.py

@@ -96,14 +96,27 @@ class EpisodeMatcher:
             # Load Whisper model
             model = whisper.load_model("base", device=self.device)
             
-            # Get season-specific reference files
+            # Get season-specific reference files using multiple patterns
             reference_dir = self.cache_dir / "data" / self.show_name
-            season_pattern = f"S{season_number:02d}E"
-            reference_files = [
-                f for f in reference_dir.glob("*.srt")
-                if season_pattern in f.name
+            
+            # Create season patterns for different formats
+            patterns = [
+                f"S{season_number:02d}E",  # S01E01
+                f"S{season_number}E",      # S1E01
+                f"{season_number:02d}x",   # 01x01
+                f"{season_number}x",       # 1x01
             ]
             
+            reference_files = []
+            for pattern in patterns:
+                files = [f for f in reference_dir.glob("*.srt") 
+                        if any(re.search(f"{p}\\d+", f.name, re.IGNORECASE) 
+                        for p in patterns)]
+                reference_files.extend(files)
+            
+            # Remove duplicates while preserving order
+            reference_files = list(dict.fromkeys(reference_files))
+            
             if not reference_files:
                 logger.error(f"No reference files found for season {season_number}")
                 return None

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/mkv_episode_matcher/episode_matcher.py

@@ -29,6 +29,14 @@ def process_show(season=None, dry_run=False, get_subs=False):
     show_name = clean_text(os.path.basename(show_dir))
     matcher = EpisodeMatcher(CACHE_DIR, show_name)
     
+    # Early check for reference files
+    reference_dir = Path(CACHE_DIR) / "data" / show_name
+    reference_files = list(reference_dir.glob("*.srt"))
+    if not reference_files:
+        logger.error(f"No reference subtitle files found in {reference_dir}")
+        logger.info("Please download reference subtitles first")
+        return
+        
     season_paths = get_valid_seasons(show_dir)
     if not season_paths:
         logger.warning(f"No seasons with .mkv files found")

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/mkv_episode_matcher/utils.py

@@ -300,7 +300,7 @@ def extract_srt_text(filepath):
 
 def extract_season_episode(filename):
     """
-    Extract season and episode numbers from filename.
+    Extract season and episode numbers from filename with support for multiple formats.
     
     Args:
         filename (str): Filename to parse
@@ -308,10 +308,20 @@ def extract_season_episode(filename):
     Returns:
         tuple: (season_number, episode_number)
     """
-    match = re.search(r'S(\d+)E(\d+)', filename)
-    if match:
-        return int(match.group(1)), int(match.group(2))
+    # List of patterns to try
+    patterns = [
+        r'S(\d+)E(\d+)',          # S01E01
+        r'(\d+)x(\d+)',           # 1x01 or 01x01
+        r'Season\s*(\d+).*?(\d+)' # Season 1 - 01
+    ]
+    
+    for pattern in patterns:
+        match = re.search(pattern, filename, re.IGNORECASE)
+        if match:
+            return int(match.group(1)), int(match.group(2))
+            
     return None, None
+
 def process_srt_files(show_dir):
     """
     Process all SRT files in the given directory and its subdirectories.

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/mkv_episode_matcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mkv-episode-matcher
-Version: 0.3.5
+Version: 0.3.6
 Summary: The MKV Episode Matcher is a tool for identifying TV series episodes from MKV files and renaming the files accordingly.
 Home-page: https://github.com/Jsakkos/mkv-episode-matcher
 Author: Jonathan Sakkos
@@ -65,10 +65,11 @@ Automatically match and rename your MKV TV episodes using The Movie Database (TM
 ```bash
 pip install mkv-episode-matcher
 ```
+2. Download .srt subtitles files to ~/.mkv-episode-matcher/cache/data/Show Name/
 
-2. Run on your show directory:
+3. Run on your show directory:
 ```bash
-mkv-match --show-dir "path/to/your/show" --get-subs true
+mkv-match --show-dir "path/to/your/show"
 ```
 
 ## Documentation

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mkv_episode_matcher
-version = 0.3.5
+version = 0.3.6
 author = Jonathan Sakkos
 author_email = jonathansakkos@gmail.com
 description = The MKV Episode Matcher is a tool for identifying TV series episodes from MKV files and renaming the files accordingly.

{mkv_episode_matcher-0.3.5 → mkv_episode_matcher-0.3.6}/uv.lock

@@ -383,7 +383,7 @@ wheels = [
 
 [[package]]
 name = "mkv-episode-matcher"
-version = "0.3.4.post1.dev3+g95f005b.d20250112"
+version = "0.3.5.post1.dev0+g1beb2cf.d20250112"
 source = { editable = "." }
 dependencies = [
     { name = "configparser" },