mkv-episode-matcher 0.9.6__tar.gz → 0.9.7__tar.gz

{mkv_episode_matcher-0.9.6 → mkv_episode_matcher-0.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkv-episode-matcher
-Version: 0.9.6
+Version: 0.9.7
 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.9.6 → mkv_episode_matcher-0.9.7}/mkv_episode_matcher/utils.py

@@ -24,6 +24,7 @@ def normalize_path(path_str):
     """
     Normalize a path string to handle cross-platform path issues.
     Properly handles trailing slashes and backslashes in both Windows and Unix paths.
+    Also strips surrounding quotes that might be present in command line arguments.
 
     Args:
         path_str (str): The path string to normalize
@@ -35,6 +36,9 @@ def normalize_path(path_str):
     if isinstance(path_str, Path):
         path_str = str(path_str)
 
+    # Strip surrounding quotes (both single and double)
+    path_str = path_str.strip().strip('"').strip("'")
+    
     # Remove trailing slashes or backslashes
     path_str = path_str.rstrip("/").rstrip("\\")
 

{mkv_episode_matcher-0.9.6 → mkv_episode_matcher-0.9.7}/mkv_episode_matcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkv-episode-matcher
-Version: 0.9.6
+Version: 0.9.7
 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.9.6 → mkv_episode_matcher-0.9.7}/mkv_episode_matcher.egg-info/SOURCES.txt

@@ -46,4 +46,5 @@ tests/test_config_special_characters.py
 tests/test_episode_identification.py
 tests/test_main.py
 tests/test_path_handling.py
+tests/test_path_spaces_quotes.py
 tests/test_trailing_slash.py

{mkv_episode_matcher-0.9.6 → mkv_episode_matcher-0.9.7}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mkv_episode_matcher
-version = 0.9.6
+version = 0.9.7
 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.9.7/tests/test_path_spaces_quotes.py

@@ -0,0 +1,309 @@
+import unittest
+import tempfile
+import argparse
+from pathlib import Path
+from unittest.mock import Mock, patch, MagicMock
+
+from mkv_episode_matcher.utils import normalize_path, get_subtitles, get_valid_seasons
+from mkv_episode_matcher.config import get_config, set_config
+
+
+class TestPathHandlingWithSpacesAndQuotes(unittest.TestCase):
+    """Test path handling for issues 61 and 62 - paths with spaces and quotes."""
+
+    def setUp(self):
+        """Set up test fixtures."""
+        self.temp_dir = tempfile.TemporaryDirectory()
+        self.temp_path = Path(self.temp_dir.name)
+        
+    def tearDown(self):
+        """Clean up test fixtures."""
+        self.temp_dir.cleanup()
+
+    def test_normalize_path_with_spaces(self):
+        """Test that normalize_path handles paths with spaces correctly."""
+        paths_with_spaces = [
+            "C:\\my rips\\show name",
+            "/home/user/TV Shows/My Show",
+            "C:/Program Files/My TV Shows/Show With Spaces",
+            "/mnt/c/Users/John Doe/Shows/Breaking Bad",
+            "D:\\Users\\Jane Smith\\My Videos\\Game of Thrones\\",
+        ]
+        
+        for path_str in paths_with_spaces:
+            with self.subTest(path=path_str):
+                normalized = normalize_path(path_str)
+                # Should return a valid Path object
+                self.assertIsInstance(normalized, Path)
+                # Should preserve the directory name with spaces
+                self.assertIn(" ", normalized.name, 
+                            f"Path with spaces should preserve spaces: {path_str}")
+
+    def test_normalize_path_with_quotes(self):
+        """Test that normalize_path handles paths with quotes correctly."""
+        paths_with_quotes = [
+            '"C:\\my rips\\show name"',
+            '"/home/user/TV Shows/My Show"',
+            "'C:/Program Files/My TV Shows/Show With Spaces'",
+            '"D:\\Users\\Jane Smith\\My Videos\\Game of Thrones\\"',
+        ]
+        
+        for path_str in paths_with_quotes:
+            with self.subTest(path=path_str):
+                normalized = normalize_path(path_str)
+                # Should return a valid Path object
+                self.assertIsInstance(normalized, Path)
+                # Should not contain quotes in the final path
+                self.assertNotIn('"', str(normalized))
+                self.assertNotIn("'", str(normalized))
+
+    def test_get_valid_seasons_with_spaces(self):
+        """Test that get_valid_seasons works with directories containing spaces."""
+        # Create test directory structure with spaces
+        show_dir = self.temp_path / "My Test Show"
+        show_dir.mkdir()
+        
+        season1_dir = show_dir / "Season 1"
+        season2_dir = show_dir / "Season 2 - Special Edition"
+        season1_dir.mkdir()
+        season2_dir.mkdir()
+        
+        # Create some .mkv files
+        (season1_dir / "Episode 1.mkv").touch()
+        (season1_dir / "Episode 2.mkv").touch()
+        (season2_dir / "Special Episode.mkv").touch()
+        
+        # Test with path containing spaces
+        seasons = get_valid_seasons(str(show_dir))
+        
+        # Should find both seasons
+        self.assertEqual(len(seasons), 2)
+        self.assertTrue(any("Season 1" in str(season) for season in seasons))
+        self.assertTrue(any("Season 2 - Special Edition" in str(season) for season in seasons))
+
+    def test_command_line_parsing_with_spaces(self):
+        """Test that command line argument parsing handles paths with spaces."""
+        from mkv_episode_matcher.__main__ import main
+        
+        test_cases = [
+            ['--show-dir', 'C:\\my rips\\show name'],
+            ['--show-dir', '/home/user/TV Shows/My Show'],
+            ['--show-dir', 'D:\\Users\\Jane Smith\\My Videos'],
+        ]
+        
+        for args in test_cases:
+            with self.subTest(args=args):
+                parser = argparse.ArgumentParser()
+                parser.add_argument('--show-dir', help='Main directory of the show')
+                
+                # This should not raise an exception
+                parsed_args = parser.parse_args(args)
+                self.assertIsNotNone(parsed_args.show_dir)
+                # Spaces should be preserved
+                self.assertIn(" ", parsed_args.show_dir)
+
+    def test_command_line_parsing_with_quotes(self):
+        """Test that command line argument parsing handles quoted paths."""
+        test_cases = [
+            ['--show-dir', '"C:\\my rips\\show name"'],
+            ['--show-dir', '"/home/user/TV Shows/My Show"'],
+            ['--show-dir', "'D:\\Users\\Jane Smith\\My Videos'"],
+        ]
+        
+        for args in test_cases:
+            with self.subTest(args=args):
+                parser = argparse.ArgumentParser()
+                parser.add_argument('--show-dir', help='Main directory of the show')
+                
+                # This should not raise an exception
+                parsed_args = parser.parse_args(args)
+                self.assertIsNotNone(parsed_args.show_dir)
+                # Should handle quotes appropriately
+                # Note: argparse typically strips outer quotes automatically
+
+    @patch('mkv_episode_matcher.utils.get_config')
+    def test_config_storage_with_spaces(self, mock_get_config):
+        """Test that configuration correctly stores and retrieves paths with spaces."""
+        # Test path with spaces
+        test_path = "C:\\Users\\John Doe\\My TV Shows\\Breaking Bad"
+        
+        # Create a temporary config file
+        config_file = self.temp_path / "test_config.ini"
+        
+        # Set config with path containing spaces
+        set_config(
+            tmdb_api_key="test_key",
+            open_subtitles_api_key="test_key",
+            open_subtitles_user_agent="test_agent", 
+            open_subtitles_username="test_user",
+            open_subtitles_password="test_pass",
+            show_dir=test_path,
+            file=config_file
+        )
+        
+        # Read back the config
+        config = get_config(config_file)
+        
+        # Should preserve spaces in the path
+        self.assertEqual(config.get("show_dir"), test_path)
+        self.assertIn(" ", config.get("show_dir"))
+
+    @patch('mkv_episode_matcher.utils.get_config')
+    @patch('mkv_episode_matcher.utils.OpenSubtitles')
+    @patch('mkv_episode_matcher.tmdb_client.fetch_season_details')
+    def test_get_subtitles_with_spaces_in_path(self, mock_fetch_season, mock_opensubtitles, mock_get_config):
+        """Test that get_subtitles function works with show directories containing spaces."""
+        # Mock configuration with path containing spaces
+        mock_config = {
+            "show_dir": "C:\\Users\\John Doe\\My TV Shows\\Breaking Bad",
+            "tmdb_api_key": "test_tmdb_key",
+            "open_subtitles_api_key": "test_os_key",
+            "open_subtitles_user_agent": "test_agent",
+            "open_subtitles_username": "test_user", 
+            "open_subtitles_password": "test_pass"
+        }
+        mock_get_config.return_value = mock_config
+        
+        # Mock OpenSubtitles client
+        mock_client = Mock()
+        mock_opensubtitles.return_value = mock_client
+        
+        # Mock season details
+        mock_fetch_season.return_value = {
+            'season_number': 1,
+            'episodes': [
+                {'episode_number': 1, 'name': 'Pilot'},
+                {'episode_number': 2, 'name': 'Cat\'s in the Bag...'}
+            ]
+        }
+        
+        # This should not raise an exception with spaces in the path
+        try:
+            get_subtitles(show_id=1396, seasons={1}, config=mock_config)
+        except Exception as e:
+            # If there's an exception, it shouldn't be related to path handling
+            # OpenSubtitles exceptions are expected in a test environment
+            self.assertNotIn("path", str(e).lower())
+            self.assertNotIn("space", str(e).lower())
+
+    def test_path_edge_cases(self):
+        """Test edge cases for path handling."""
+        edge_cases = [
+            # Multiple spaces
+            "C:\\My  TV  Shows\\Show  With  Multiple  Spaces",
+            # Leading/trailing spaces  
+            " C:\\My TV Shows\\Show With Spaces ",
+            # Mixed quotes and spaces
+            '"C:\\My TV Shows"\\Show Name',
+            # Unicode characters with spaces
+            "C:\\My TV Shows\\Café Français",
+            # Very long path with spaces
+            "C:\\A Very Long Path Name With Many Spaces\\And Another Very Long Directory Name\\Show Name",
+        ]
+        
+        for path_str in edge_cases:
+            with self.subTest(path=path_str):
+                # normalize_path should handle these without raising exceptions
+                try:
+                    result = normalize_path(path_str)
+                    self.assertIsInstance(result, Path)
+                except Exception as e:
+                    self.fail(f"normalize_path failed on edge case '{path_str}': {e}")
+
+    def test_issue_61_reproduction(self):
+        """Reproduce issue 61: Show-dir path cannot contain spaces."""
+        # This test reproduces the exact issue described in #61
+        problem_path = "C:\\my rips\\show_name"
+        
+        # The issue is that --get-subs fails when the path has spaces
+        # Let's test the path normalization that's used in get_subtitles
+        normalized = normalize_path(problem_path)
+        
+        # Should successfully normalize without losing information
+        self.assertIsInstance(normalized, Path)
+        self.assertEqual(normalized.name, "show_name")
+        
+        # The normalized path should be usable for directory operations
+        self.assertTrue(str(normalized))  # Should not be empty
+
+    def test_issue_62_reproduction(self):
+        """Reproduce issue 62: show-dir cannot have quotes.""" 
+        # This test reproduces the exact issue described in #62
+        quoted_paths = [
+            '"C:\\my rips\\show name"',
+            "'C:\\my rips\\show name'",
+            '"C:/my rips/show name"',
+        ]
+        
+        for quoted_path in quoted_paths:
+            with self.subTest(path=quoted_path):
+                # The issue is that quoted paths aren't handled properly
+                normalized = normalize_path(quoted_path)
+                
+                # Should successfully normalize and remove quotes
+                self.assertIsInstance(normalized, Path)
+                self.assertNotIn('"', str(normalized))
+                self.assertNotIn("'", str(normalized))
+
+
+class TestPathIntegration(unittest.TestCase):
+    """Integration tests for path handling across the application."""
+    
+    def setUp(self):
+        """Set up test fixtures."""
+        self.temp_dir = tempfile.TemporaryDirectory()
+        self.temp_path = Path(self.temp_dir.name)
+        
+    def tearDown(self):
+        """Clean up test fixtures."""
+        self.temp_dir.cleanup()
+
+    @patch('mkv_episode_matcher.episode_matcher.get_config')
+    def test_episode_matcher_with_spaces(self, mock_get_config):
+        """Test that EpisodeMatcher handles show names with spaces correctly."""
+        from mkv_episode_matcher.episode_identification import EpisodeMatcher
+        
+        # Mock config with path containing spaces
+        mock_config = {
+            "show_dir": "C:\\Users\\John Doe\\My TV Shows\\Breaking Bad"
+        }
+        mock_get_config.return_value = mock_config
+        
+        # This should not raise an exception
+        try:
+            matcher = EpisodeMatcher(
+                cache_dir=self.temp_path,
+                show_name="Breaking Bad"
+            )
+            self.assertIsNotNone(matcher)
+            self.assertEqual(matcher.show_name, "Breaking Bad")
+        except Exception as e:
+            self.fail(f"EpisodeMatcher failed with spaces in show name: {e}")
+
+    def test_end_to_end_path_handling(self):
+        """Test end-to-end path handling from command line to processing."""
+        # Create a test directory structure with spaces
+        show_dir = self.temp_path / "My Test Show With Spaces"
+        show_dir.mkdir()
+        
+        season_dir = show_dir / "Season 1"
+        season_dir.mkdir()
+        
+        # Create a test .mkv file
+        test_file = season_dir / "Test Episode.mkv"
+        test_file.touch()
+        
+        # Test that the path can be processed through the whole pipeline
+        normalized = normalize_path(str(show_dir))
+        self.assertIsInstance(normalized, Path)
+        
+        # Should be able to find seasons
+        seasons = get_valid_seasons(str(show_dir))
+        self.assertEqual(len(seasons), 1)
+        
+        # Season path should also contain spaces
+        self.assertIn("Season 1", str(seasons[0]))
+
+
+if __name__ == '__main__':
+    unittest.main()