mkv-episode-matcher 0.4.1__py3-none-any.whl → 0.4.5__py3-none-any.whl

mkv_episode_matcher/__main__.py

@@ -112,71 +112,49 @@ def main():
         check_gpu_support()
         return
     logger.debug(f"Command-line arguments: {args}")
-    open_subtitles_api_key = ""
-    open_subtitles_user_agent = ""
-    open_subtitles_username = ""
-    open_subtitles_password = ""
-    # Check if API key is provided via command-line argument
-    tmdb_api_key = args.tmdb_api_key
-
-    # If API key is not provided, try to get it from the cache
-    if not tmdb_api_key:
-        cached_config = get_config(CONFIG_FILE)
-        if cached_config:
-            tmdb_api_key = cached_config.get("tmdb_api_key")
 
-    # If API key is still not available, prompt the user to input it
+    # Load configuration once
+    config = get_config(CONFIG_FILE)
+
+    # Get TMDb API key
+    tmdb_api_key = args.tmdb_api_key or config.get("tmdb_api_key")
     if not tmdb_api_key:
         tmdb_api_key = input("Enter your TMDb API key: ")
-        # Cache the API key
-
     logger.debug(f"TMDb API Key: {tmdb_api_key}")
+    
     logger.debug("Getting OpenSubtitles API key")
-    cached_config = get_config(CONFIG_FILE)
-    try:
-        open_subtitles_api_key = cached_config.get("open_subtitles_api_key")
-        open_subtitles_user_agent = cached_config.get("open_subtitles_user_agent")
-        open_subtitles_username = cached_config.get("open_subtitles_username")
-        open_subtitles_password = cached_config.get("open_subtitles_password")
-    except:
-        pass
+    open_subtitles_api_key = config.get("open_subtitles_api_key")
+    open_subtitles_user_agent = config.get("open_subtitles_user_agent")
+    open_subtitles_username = config.get("open_subtitles_username")
+    open_subtitles_password = config.get("open_subtitles_password")
+    
     if args.get_subs:
         if not open_subtitles_api_key:
             open_subtitles_api_key = input("Enter your OpenSubtitles API key: ")
-
         if not open_subtitles_user_agent:
             open_subtitles_user_agent = input("Enter your OpenSubtitles User Agent: ")
-
         if not open_subtitles_username:
             open_subtitles_username = input("Enter your OpenSubtitles Username: ")
-
         if not open_subtitles_password:
             open_subtitles_password = input("Enter your OpenSubtitles Password: ")
-
-    # If show directory is provided via command-line argument, use it
-    show_dir = args.show_dir
+    
+    # Use config for show directory and tesseract path
+    show_dir = args.show_dir or config.get("show_dir")
+    if not show_dir:
+        show_dir = input("Enter the main directory of the show:")
+    logger.info(f"Show Directory: {show_dir}")
     if not show_dir:
-        show_dir = cached_config.get("show_dir")
-        if not show_dir:
-            # If show directory is not provided, prompt the user to input it
-            show_dir = input("Enter the main directory of the show:")
-        logger.info(f"Show Directory: {show_dir}")
-        # if the user does not provide a show directory, make the default show directory the current working directory
-        if not show_dir:
-            show_dir = os.getcwd()
+        show_dir = os.getcwd()
+    
     if not args.tesseract_path:
-        tesseract_path = cached_config.get("tesseract_path")
-
+        tesseract_path = config.get("tesseract_path")
         if not tesseract_path:
-            tesseract_path = input(
-                r"Enter the path to the tesseract executable: ['C:\Program Files\Tesseract-OCR\tesseract.exe']"
-            )
-
+            tesseract_path = input(r"Enter the path to the tesseract executable: ['C:\Program Files\Tesseract-OCR\tesseract.exe']")
     else:
         tesseract_path = args.tesseract_path
     logger.debug(f"Teesseract Path: {tesseract_path}")
     logger.debug(f"Show Directory: {show_dir}")
-
+    
     # Set the configuration
     set_config(
         tmdb_api_key,

mkv_episode_matcher/episode_matcher.py

@@ -32,7 +32,7 @@ def process_show(season=None, dry_run=False, get_subs=False):
     # Early check for reference files
     reference_dir = Path(CACHE_DIR) / "data" / show_name
     reference_files = list(reference_dir.glob("*.srt"))
-    if not reference_files:
+    if (not get_subs) and (not reference_files):
         logger.error(f"No reference subtitle files found in {reference_dir}")
         logger.info("Please download reference subtitles first")
         return
@@ -67,7 +67,7 @@ def process_show(season=None, dry_run=False, get_subs=False):
             if get_subs:
                 show_id = fetch_show_id(matcher.show_name)
                 if show_id:
-                    get_subtitles(show_id, seasons={season_num})
+                    get_subtitles(show_id, seasons={season_num}, config=config)
                     
             unmatched_files = []
             for mkv_file in mkv_files:
@@ -105,4 +105,4 @@ def process_show(season=None, dry_run=False, get_subs=False):
         finally:
             if not dry_run:
                 shutil.rmtree(temp_dir)
-                cleanup_ocr_files(show_dir)
+                cleanup_ocr_files(show_dir)

mkv_episode_matcher/utils.py

@@ -121,16 +121,17 @@ def rename_episode_file(original_file_path, new_filename):
         logger.error(f"Failed to rename file: {e}")
         return None
         
-def get_subtitles(show_id, seasons: set[int]):
+def get_subtitles(show_id, seasons: set[int], config=None):
     """
     Retrieves and saves subtitles for a given TV show and seasons.
 
     Args:
         show_id (int): The ID of the TV show.
         seasons (Set[int]): A set of season numbers for which subtitles should be retrieved.
+        config (Config object, optional): Preloaded configuration.
     """
-    logger.info(f"Getting subtitles for show ID {show_id}")
-    config = get_config(CONFIG_FILE)
+    if config is None:
+        config = get_config(CONFIG_FILE)
     show_dir = config.get("show_dir")
     series_name = sanitize_filename(os.path.basename(show_dir))
     tmdb_api_key = config.get("tmdb_api_key")

{mkv_episode_matcher-0.4.1.dist-info → mkv_episode_matcher-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mkv-episode-matcher
-Version: 0.4.1
+Version: 0.4.5
 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

{mkv_episode_matcher-0.4.1.dist-info → mkv_episode_matcher-0.4.5.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mkv_episode_matcher/.gitattributes,sha256=Gh2-F2vCM7SZ01pX23UT8pQcmauXWfF3gwyRSb6ZAFs,66
 mkv_episode_matcher/__init__.py,sha256=aNlpgTo1kHVrBcR3SH6wRmCgKu8KjNTki1ZvFfAud6s,240
-mkv_episode_matcher/__main__.py,sha256=0ZwFXw30744lZ8HIMzUN4F2abpTRCT4glBCM9XQdD3k,7328
+mkv_episode_matcher/__main__.py,sha256=NJdbYc5ht52uSw7PSO4EvJ2EbrrQqv1N9YhpUcZPH-Q,6517
 mkv_episode_matcher/config.py,sha256=zDDKBcsDt5fME9BRqiTi7yWKeast1pZh36BNYMvIBYM,2419
 mkv_episode_matcher/episode_identification.py,sha256=_6M1UJkq1RGfmLI32u9dNOVvgp5Vf2MjqW2MTx0Gl8E,10329
-mkv_episode_matcher/episode_matcher.py,sha256=vunYpHQxyXo3l88BUScXa7_kMYMCV1pXpQxaLa-plZA,4325
+mkv_episode_matcher/episode_matcher.py,sha256=4pSFr7MDDdjqCFlKMkn8qGTjT_Xw6Abd4mN8YS94yVw,4362
 mkv_episode_matcher/mkv_to_srt.py,sha256=4yxBHRVhgVby0UtQ2aTXGuoQpid8pkgjMIaHU6GCdzc,10857
 mkv_episode_matcher/speech_to_text.py,sha256=wVDrFFR7oASGMyq5cfOWmInEIeU9b3MPCLs9EyJrOMw,3128
 mkv_episode_matcher/subtitle_utils.py,sha256=rYSbd393pKYQW0w4sXgals02WFGqMYYYkQHDbEkWF8c,2666
 mkv_episode_matcher/tmdb_client.py,sha256=LbMCgjmp7sCbrQo_CDlpcnryKPz5S7inE24YY9Pyjk4,4172
-mkv_episode_matcher/utils.py,sha256=VASbougN3rb2iu40iZWkGjKIbahW713TOrFBo_TR9wo,14269
+mkv_episode_matcher/utils.py,sha256=OkOwAjLB0yI3XYzQx5HONywxL4F9OenfQJR97SI8QAM,14316
 mkv_episode_matcher/libraries/pgs2srt/.gitignore,sha256=mt3uxWYZaFurMw_yGE258gWhtGKPVR7e3Ll4ALJpyj4,23
 mkv_episode_matcher/libraries/pgs2srt/README.md,sha256=olb25G17tj0kxPgp_LcH5I2QWXjgP1m8JFyjYRGz4UU,1374
 mkv_episode_matcher/libraries/pgs2srt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,8 +19,8 @@ mkv_episode_matcher/libraries/pgs2srt/requirements.txt,sha256=sg87dqWw_qpbwciw-M
 mkv_episode_matcher/libraries/pgs2srt/Libraries/SubZero/SubZero.py,sha256=geT1LXdVd8yED9zoJ9K1XfP2JzGcM7u1SslHYrJI09o,10061
 mkv_episode_matcher/libraries/pgs2srt/Libraries/SubZero/post_processing.py,sha256=GKtVy_Lxv-z27mkRG8pJF2znKWXwZTot7jL6kN-zIxM,10503
 mkv_episode_matcher/libraries/pgs2srt/Libraries/SubZero/dictionaries/data.py,sha256=AlJHUYXl85J95OzGRik-AHVfzDd7Q8BJCvD4Nr8kRIk,938598
-mkv_episode_matcher-0.4.1.dist-info/METADATA,sha256=IWKnIxGcG_W1EEtPfYasyMCfyZL7-NL_ScYfNl0HVlg,5579
-mkv_episode_matcher-0.4.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-mkv_episode_matcher-0.4.1.dist-info/entry_points.txt,sha256=IglJ43SuCZq2eQ3shMFILCkmQASJHnDCI3ogohW2Hn4,64
-mkv_episode_matcher-0.4.1.dist-info/top_level.txt,sha256=XRLbd93HUaedeWLtkyTvQjFcE5QcBRYa3V-CfHrq-OI,20
-mkv_episode_matcher-0.4.1.dist-info/RECORD,,
+mkv_episode_matcher-0.4.5.dist-info/METADATA,sha256=iUd6UImRy4goGJSgJcZVDk0oCjCz3rfsi3DkO9PG2pU,5579
+mkv_episode_matcher-0.4.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mkv_episode_matcher-0.4.5.dist-info/entry_points.txt,sha256=IglJ43SuCZq2eQ3shMFILCkmQASJHnDCI3ogohW2Hn4,64
+mkv_episode_matcher-0.4.5.dist-info/top_level.txt,sha256=XRLbd93HUaedeWLtkyTvQjFcE5QcBRYa3V-CfHrq-OI,20
+mkv_episode_matcher-0.4.5.dist-info/RECORD,,