Add Ice Age: Continental Drift (2012) BDRip file to test filenames

renamer/cache.py

@@ -11,13 +11,16 @@ class Cache:
     """File-based cache with TTL support."""
 
     def __init__(self, cache_dir: Optional[Path] = None):
-        if cache_dir is None:
-            cache_dir = Path.home() / ".cache" / "renamer"
+        # Always use the default cache dir to avoid creating cache in scan dir
+        cache_dir = Path.home() / ".cache" / "renamer"
         self.cache_dir = cache_dir
         self.cache_dir.mkdir(parents=True, exist_ok=True)
+        self._memory_cache = {}  # In-memory cache for faster access
 
     def _get_cache_file(self, key: str) -> Path:
         """Get cache file path with hashed filename and subdirs."""
+        import logging
+        logging.info(f"Cache _get_cache_file called with key: {key!r}")
         # Parse key format: ClassName.method_name.param_hash
         if '.' in key:
             parts = key.split('.')
@@ -26,12 +29,27 @@ class Cache:
                 method_name = parts[1]
                 param_hash = parts[2]
                 
+                # Use class name as subdir, but if it contains '/', use general to avoid creating nested dirs
+                if '/' in class_name or '\\' in class_name:
+                    subdir = "general"
+                    subkey = key
+                    file_ext = "json"
+                else:
+                    subdir = class_name
+                    file_ext = "pkl"
+                
                 # Use class name as subdir
-                cache_subdir = self.cache_dir / class_name
+                cache_subdir = self.cache_dir / subdir
+                logging.info(f"Cache parsed key, class_name: {class_name!r}, cache_subdir: {cache_subdir!r}")
                 cache_subdir.mkdir(parents=True, exist_ok=True)
                 
-                # Use method_name.param_hash as filename
-                return cache_subdir / f"{method_name}.{param_hash}.pkl"
+                if file_ext == "pkl":
+                    # Use method_name.param_hash as filename
+                    return cache_subdir / f"{method_name}.{param_hash}.pkl"
+                else:
+                    # Hash the subkey for filename
+                    key_hash = hashlib.md5(subkey.encode('utf-8')).hexdigest()
+                    return cache_subdir / f"{key_hash}.json"
         
         # Fallback for old keys (tmdb_, poster_, etc.)
         if key.startswith("tmdb_"):
@@ -40,12 +58,16 @@ class Cache:
         elif key.startswith("poster_"):
             subdir = "posters"
             subkey = key[7:]  # Remove "poster_" prefix
+        elif key.startswith("extractor_"):
+            subdir = "extractors"
+            subkey = key[10:]  # Remove "extractor_" prefix
         else:
             subdir = "general"
             subkey = key
         
         # Create subdir
         cache_subdir = self.cache_dir / subdir
+        logging.info(f"Cache fallback, subdir: {subdir!r}, cache_subdir: {cache_subdir!r}")
         cache_subdir.mkdir(parents=True, exist_ok=True)
         
         # Hash the subkey for filename
@@ -54,6 +76,14 @@ class Cache:
 
     def get(self, key: str) -> Optional[Any]:
         """Get cached value if not expired."""
+        # Check memory cache first
+        if key in self._memory_cache:
+            data = self._memory_cache[key]
+            if time.time() > data.get('expires', 0):
+                del self._memory_cache[key]
+                return None
+            return data.get('value')
+        
         cache_file = self._get_cache_file(key)
         if not cache_file.exists():
             return None
@@ -67,6 +97,8 @@ class Cache:
                 cache_file.unlink(missing_ok=True)
                 return None
             
+            # Store in memory cache
+            self._memory_cache[key] = data
             return data.get('value')
         except (json.JSONDecodeError, IOError):
             # Corrupted, remove
@@ -75,11 +107,14 @@ class Cache:
 
     def set(self, key: str, value: Any, ttl_seconds: int) -> None:
         """Set cached value with TTL."""
-        cache_file = self._get_cache_file(key)
         data = {
             'value': value,
             'expires': time.time() + ttl_seconds
         }
+        # Store in memory cache
+        self._memory_cache[key] = data
+        
+        cache_file = self._get_cache_file(key)
         try:
             with open(cache_file, 'w') as f:
                 json.dump(data, f)
@@ -154,6 +189,14 @@ class Cache:
 
     def get_object(self, key: str) -> Optional[Any]:
         """Get pickled object from cache if not expired."""
+        # Check memory cache first
+        if key in self._memory_cache:
+            data = self._memory_cache[key]
+            if time.time() > data.get('expires', 0):
+                del self._memory_cache[key]
+                return None
+            return data.get('value')
+        
         cache_file = self._get_cache_file(key)
         if not cache_file.exists():
             return None
@@ -167,6 +210,8 @@ class Cache:
                 cache_file.unlink(missing_ok=True)
                 return None
             
+            # Store in memory cache
+            self._memory_cache[key] = data
             return data.get('value')
         except (pickle.PickleError, IOError):
             # Corrupted, remove
@@ -175,11 +220,14 @@ class Cache:
 
     def set_object(self, key: str, obj: Any, ttl_seconds: int) -> None:
         """Pickle and cache object with TTL."""
-        cache_file = self._get_cache_file(key)
         data = {
             'value': obj,
             'expires': time.time() + ttl_seconds
         }
+        # Store in memory cache
+        self._memory_cache[key] = data
+        
+        cache_file = self._get_cache_file(key)
         try:
             with open(cache_file, 'wb') as f:
                 pickle.dump(data, f)