Update Cache(...) params when allocating

grantjenks · grantjenks · commit f3fcdffee88a · 2023-04-10T22:27:48.000-07:00
diff --git a/diskcache/fanout.py b/diskcache/fanout.py
@@ -573,9 +573,11 @@ def reset(self, key, value=ENOVAL):
                     break
         return result
 
-    def cache(self, name):
+    def cache(self, name, timeout=60, disk=None, **settings):
         """Return Cache with given `name` in subdirectory.
 
+        If disk is none (default), uses the fanout cache disk.
+
         >>> fanout_cache = FanoutCache()
         >>> cache = fanout_cache.cache('test')
         >>> cache.set('abc', 123)
@@ -588,6 +590,9 @@ def cache(self, name):
         True
 
         :param str name: subdirectory name for Cache
+        :param float timeout: SQLite connection timeout
+        :param disk: Disk type or subclass for serialization
+        :param settings: any of DEFAULT_SETTINGS
         :return: Cache with given name
 
         """
@@ -598,7 +603,12 @@ def cache(self, name):
         except KeyError:
             parts = name.split('/')
             directory = op.join(self._directory, 'cache', *parts)
-            temp = Cache(directory=directory, disk=self._disk)
+            temp = Cache(
+                directory=directory,
+                timeout=timeout,
+                disk=self._disk if disk is None else Disk,
+                **settings,
+            )
             _caches[name] = temp
             return temp
 
@@ -626,7 +636,11 @@ def deque(self, name):
         except KeyError:
             parts = name.split('/')
             directory = op.join(self._directory, 'deque', *parts)
-            cache = Cache(directory=directory, disk=self._disk)
+            cache = Cache(
+                directory=directory,
+                disk=self._disk,
+                eviction_policy='none',
+            )
             deque = Deque.fromcache(cache)
             _deques[name] = deque
             return deque
@@ -658,7 +672,11 @@ def index(self, name):
         except KeyError:
             parts = name.split('/')
             directory = op.join(self._directory, 'index', *parts)
-            cache = Cache(directory=directory, disk=self._disk)
+            cache = Cache(
+                directory=directory,
+                disk=self._disk,
+                eviction_policy='none',
+            )
             index = Index.fromcache(cache)
             _indexes[name] = index
             return index
