diff --git a/plextraktsync/util/Factory.py b/plextraktsync/util/Factory.py index a8c2dfc999..23c43273a4 100644 --- a/plextraktsync/util/Factory.py +++ b/plextraktsync/util/Factory.py @@ -117,11 +117,16 @@ def server_config(self): return server_config.get_server(server_name) @cached_property - def session(self): - from requests_cache import CachedSession - + def urls_expire_after(self): from plextraktsync.decorators.flatten import flatten_dict + if not self.run_config.cache: + from requests_cache import DO_NOT_CACHE + + return { + "*": DO_NOT_CACHE, + } + @flatten_dict def patch_plex_urls(patterns, base_urls, glob="*.plex.direct:*"): """ @@ -138,20 +143,18 @@ def patch_plex_urls(patterns, base_urls, glob="*.plex.direct:*"): url = pattern.replace(glob, url) yield url, expire - if self.run_config.cache: - urls_expire_after = patch_plex_urls( - self.config.http_cache.urls_expire_after, - self.server_config.base_urls, - ) - else: - from requests_cache import DO_NOT_CACHE - urls_expire_after = { - "*": DO_NOT_CACHE, - } + return patch_plex_urls( + self.config.http_cache.urls_expire_after, + self.server_config.base_urls, + ) + + @cached_property + def session(self): + from requests_cache import CachedSession return CachedSession( cache_name=self.config.cache_path, - urls_expire_after=urls_expire_after, + urls_expire_after=self.urls_expire_after, ) @cached_property