mkv-episode-matcher 0.1.13__py3-none-any.whl → 0.2.0__py3-none-any.whl

mkv_episode_matcher/__main__.py

@@ -10,7 +10,6 @@ from mkv_episode_matcher.config import get_config, set_config
 logger.info("Starting the application")
 
 
-
 # Check if the configuration directory exists, if not create it
 if not os.path.exists(os.path.join(os.path.expanduser("~"), ".mkv-episode-matcher")):
     os.makedirs(os.path.join(os.path.expanduser("~"), ".mkv-episode-matcher"))
@@ -31,10 +30,16 @@ if not os.path.exists(log_dir):
     os.mkdir(log_dir)
 
 # Add a new handler for stdout logs
-logger.add(os.path.join(log_dir,"stdout.log"), format="{time} {level} {message}", level="DEBUG", rotation="10 MB")
+logger.add(
+    os.path.join(log_dir, "stdout.log"),
+    format="{time} {level} {message}",
+    level="DEBUG",
+    rotation="10 MB",
+)
 
 # Add a new handler for error logs
-logger.add(os.path.join(log_dir,"stderr.log"), level="ERROR", rotation="10 MB")
+logger.add(os.path.join(log_dir, "stderr.log"), level="ERROR", rotation="10 MB")
+
 
 @logger.catch
 def main():
@@ -55,7 +60,6 @@ def main():
     The function logs its progress to two separate log files: one for standard output and one for errors.
     """
 
-
     # Parse command-line arguments
     parser = argparse.ArgumentParser(description="Process shows with TMDb API")
     parser.add_argument("--tmdb-api-key", help="TMDb API key")

mkv_episode_matcher/episode_matcher.py

@@ -8,7 +8,12 @@ from mkv_episode_matcher.__main__ import CACHE_DIR, CONFIG_FILE
 from mkv_episode_matcher.config import get_config
 from mkv_episode_matcher.mkv_to_srt import convert_mkv_to_srt
 from mkv_episode_matcher.tmdb_client import fetch_show_id
-from mkv_episode_matcher.utils import check_filename, cleanup_ocr_files, get_subtitles,clean_text
+from mkv_episode_matcher.utils import (
+    check_filename,
+    clean_text,
+    cleanup_ocr_files,
+    get_subtitles,
+)
 
 
 # hash_data = {}
@@ -25,7 +30,7 @@ def process_show(season=None, dry_run=False, get_subs=False):
     show_dir = config.get("show_dir")
     show_name = clean_text(os.path.basename(show_dir))
     logger.info(f"Processing show '{show_name}'...")
-    
+
     show_id = fetch_show_id(show_name)
     if show_id is None:
         logger.error(f"Could not find show '{os.path.basename(show_dir)}' on TMDb.")
@@ -41,10 +46,7 @@ def process_show(season=None, dry_run=False, get_subs=False):
     # Filter seasons to only include those with .mkv files
     valid_season_paths = []
     for season_path in season_paths:
-        mkv_files = [
-            f for f in os.listdir(season_path)
-            if f.endswith(".mkv")
-        ]
+        mkv_files = [f for f in os.listdir(season_path) if f.endswith(".mkv")]
         if mkv_files:
             valid_season_paths.append(season_path)
 
@@ -58,7 +60,7 @@ def process_show(season=None, dry_run=False, get_subs=False):
 
     # Extract season numbers from valid paths
     seasons_to_process = [
-        int(os.path.basename(season_path).split()[-1]) 
+        int(os.path.basename(season_path).split()[-1])
         for season_path in valid_season_paths
     ]
 
@@ -71,34 +73,43 @@ def process_show(season=None, dry_run=False, get_subs=False):
         if season_path not in valid_season_paths:
             logger.warning(f"Season {season} has no .mkv files to process")
             return
-        
+
+        season_paths_to_process = [season_path]
+    else:
+        # Process all valid seasons
+        season_paths_to_process = valid_season_paths
+
+    # Process each season
+    for season_path in season_paths_to_process:
+        logger.info(f"Processing season path: {season_path}")
         mkv_files = [
             os.path.join(season_path, f)
             for f in os.listdir(season_path)
             if f.endswith(".mkv")
         ]
-    else:
-        # Process all valid seasons
-        for season_path in valid_season_paths:
-            mkv_files = [
-                os.path.join(season_path, f)
-                for f in os.listdir(season_path)
-                if f.endswith(".mkv")
-            ]
-    # Filter out files that have already been processed
-    for f in mkv_files:
-        if check_filename(f):
-            logger.info(f"Skipping {f}, already processed")
-            mkv_files.remove(f)
-    if len(mkv_files) == 0:
-        logger.info("No new files to process")
-        return
-    convert_mkv_to_srt(season_path, mkv_files)
+        
+        # Filter out files that have already been processed
+        unprocessed_files = []
+        for f in mkv_files:
+            if check_filename(f):
+                logger.info(f"Skipping {f}, already processed")
+            else:
+                unprocessed_files.append(f)
+
+        if not unprocessed_files:
+            logger.info(f"No new files to process in {season_path}")
+            continue
+
+        logger.info(f"Processing {len(unprocessed_files)} files in {season_path}")
+        convert_mkv_to_srt(season_path, unprocessed_files)
+        
+    # Process reference and SRT files after all seasons are converted
     reference_text_dict = process_reference_srt_files(show_name)
     srt_text_dict = process_srt_files(show_dir)
     compare_and_rename_files(srt_text_dict, reference_text_dict, dry_run=dry_run)
     cleanup_ocr_files(show_dir)
 
+
 def check_filename(filename):
     """
     Check if the filename is in the correct format.
@@ -112,6 +123,8 @@ def check_filename(filename):
     # Check if the filename matches the expected format
     match = re.match(r".*S\d+E\d+", filename)
     return bool(match)
+
+
 def extract_srt_text(filepath):
     """
     Extracts the text from an SRT file.
@@ -242,7 +255,7 @@ def compare_and_rename_files(srt_files, reference_files, dry_run=False):
     for srt_text in srt_files.keys():
         parent_dir = os.path.dirname(os.path.dirname(srt_text))
         for reference in reference_files.keys():
-            season, episode = extract_season_episode(reference)
+            _season, _episode = extract_season_episode(reference)
             mkv_file = os.path.join(
                 parent_dir, os.path.basename(srt_text).replace(".srt", ".mkv")
             )

mkv_episode_matcher/libraries/pgs2srt/Libraries/SubZero/SubZero.py

@@ -51,6 +51,7 @@ class Processor:
     """
     Processor base class
     """
+
     name = None
     parent = None
     supported = None
@@ -69,7 +70,7 @@ class Processor:
         return content
 
     def __repr__(self):
-        return "Processor <%s %s>" % (self.__class__.__name__, self.info)
+        return f"Processor <{self.__class__.__name__} {self.info}>"
 
     def __str__(self):
         return repr(self)
@@ -82,10 +83,13 @@ class ReProcessor(Processor):
     """
     Regex processor
     """
+
     pattern = None
     replace_with = None
 
-    def __init__(self, pattern, replace_with, name=None, supported=None, entry=False, **kwargs):
+    def __init__(
+        self, pattern, replace_with, name=None, supported=None, entry=False, **kwargs
+    ):
         super(ReProcessor, self).__init__(name=name, supported=supported)
         self.pattern = pattern
         self.replace_with = replace_with
@@ -116,6 +120,7 @@ class MultipleWordReProcessor(ReProcessor):
     }
     replaces found key in pattern with the corresponding value in data
     """
+
     def __init__(self, snr_dict, name=None, parent=None, supported=None, **kwargs):
         super(ReProcessor, self).__init__(name=name, supported=supported)
         self.snr_dict = snr_dict
@@ -124,7 +129,9 @@ class MultipleWordReProcessor(ReProcessor):
         if not self.snr_dict["data"]:
             return content
 
-        return self.snr_dict["pattern"].sub(lambda x: self.snr_dict["data"][x.group(0)], content)
+        return self.snr_dict["pattern"].sub(
+            lambda x: self.snr_dict["data"][x.group(0)], content
+        )
 
 
 class EmptyEntryError(Exception):
@@ -151,7 +158,9 @@ class SubtitleModification:
     def __init__(self):
         return
 
-    def _process(self, content, processors, debug=False, parent=None, index=None, **kwargs):
+    def _process(
+        self, content, processors, debug=False, parent=None, index=None, **kwargs
+    ):
         if not content:
             return
 
@@ -184,13 +193,19 @@ class SubtitleModification:
         return new_content
 
     def pre_process(self, content, debug=False, parent=None, **kwargs):
-        return self._process(content, self.pre_processors, debug=debug, parent=parent, **kwargs)
+        return self._process(
+            content, self.pre_processors, debug=debug, parent=parent, **kwargs
+        )
 
     def process(self, content, debug=False, parent=None, **kwargs):
-        return self._process(content, self.processors, debug=debug, parent=parent, **kwargs)
+        return self._process(
+            content, self.processors, debug=debug, parent=parent, **kwargs
+        )
 
     def post_process(self, content, debug=False, parent=None, **kwargs):
-        return self._process(content, self.post_processors, debug=debug, parent=parent, **kwargs)
+        return self._process(
+            content, self.post_processors, debug=debug, parent=parent, **kwargs
+        )
 
     def modify(self, content, debug=False, parent=None, procs=None, **kwargs):
         if not content:
@@ -200,15 +215,22 @@ class SubtitleModification:
         for method in procs or ("pre_process", "process", "post_process"):
             if not new_content:
                 return
-            new_content = self._process(new_content, getattr(self, "%sors" % method),
-                                        debug=debug, parent=parent, **kwargs)
+            new_content = self._process(
+                new_content,
+                getattr(self, f"{method}ors"),
+                debug=debug,
+                parent=parent,
+                **kwargs,
+            )
 
         return new_content
 
     @classmethod
     def get_signature(cls, **kwargs):
-        string_args = ",".join(["%s=%s" % (key, value) for key, value in kwargs.items()])
-        return "%s(%s)" % (cls.identifier, string_args)
+        string_args = ",".join([
+            f"{key}={value}" for key, value in kwargs.items()
+        ])
+        return f"{cls.identifier}({string_args})"
 
     @classmethod
     def merge_args(cls, args1, args2):
@@ -224,7 +246,9 @@ class StringProcessor(Processor):
     String replacement processor base
     """
 
-    def __init__(self, search, replace, name=None, parent=None, supported=None, **kwargs):
+    def __init__(
+        self, search, replace, name=None, parent=None, supported=None, **kwargs
+    ):
         super(StringProcessor, self).__init__(name=name, supported=supported)
         self.search = search
         self.replace = replace
@@ -243,6 +267,7 @@ class MultipleLineProcessor(Processor):
         "data": {"old_value": "new_value"}
     }
     """
+
     def __init__(self, snr_dict, name=None, parent=None, supported=None, **kwargs):
         super(MultipleLineProcessor, self).__init__(name=name, supported=supported)
         self.snr_dict = snr_dict
@@ -286,6 +311,7 @@ class MultipleWordProcessor(MultipleLineProcessor):
         "data": {"old_value": "new_value"}
     }
     """
+
     def process(self, content, debug=False, **kwargs):
         words = content.split(" ")
         new_words = []