Merge pull request #1870 from glensc/http-cache

Update http cache rules to be more effective
Taxel · Jan 16, 2025 · 8053a81 · 8053a81
2 parents 970a3f3 + c507f90
commit 8053a81
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/plextraktsync/config/HttpCacheConfig.py b/plextraktsync/config/HttpCacheConfig.py
@@ -34,12 +34,12 @@ class HttpCacheConfig:
         "api.trakt.tv/shows/*/seasons?extended=episodes": 28800,
         "api.trakt.tv/shows/*/seasons": DO_NOT_CACHE,
         "api.trakt.tv/sync/collection/shows": "1m",
-        "api.trakt.tv/users/*/collection/movies?extended=metadata": "1m",
+        "api.trakt.tv/users/*/collection/movies?extended=metadata": "10s",
         "api.trakt.tv/users/*/collection/movies": DO_NOT_CACHE,
         "api.trakt.tv/users/*/collection/shows": "1m",
-        "api.trakt.tv/users/*/ratings/episodes": "1m",
-        "api.trakt.tv/users/*/ratings/shows": "1m",
-        "api.trakt.tv/users/*/ratings/movies": "1m",
+        "api.trakt.tv/users/*/ratings/episodes": "10s",
+        "api.trakt.tv/users/*/ratings/shows": "10s",
+        "api.trakt.tv/users/*/ratings/movies": "10s",
         # Trakt search urls
         "api.trakt.tv/search/imdb/tt*?type=movie": "1d",
         "api.trakt.tv/search/imdb/tt*?type=show": "1d",
@@ -55,10 +55,10 @@ class HttpCacheConfig:
         # Watchlist better be fresh for next run
         "api.trakt.tv/users/*/watchlist/movies": "1s",
         "api.trakt.tv/users/*/watchlist/shows": "1s",
-        "metadata.provider.plex.tv/library/sections/watchlist/all?*includeUserState=0": "1s",
-        "metadata.provider.plex.tv/library/sections/watchlist/all": "1s",
-        "api.trakt.tv/users/likes/lists": DO_NOT_CACHE,
-        "api.trakt.tv/users/me": DO_NOT_CACHE,
+        "metadata.provider.plex.tv/library/sections/watchlist/all?*includeUserState=0": "60m",
+        "metadata.provider.plex.tv/library/sections/watchlist/all": "10m",
+        "api.trakt.tv/users/likes/lists": "5m",
+        "api.trakt.tv/users/me": "60m",
         # Public Lists
         "api.trakt.tv/lists/*": "1d",
         # Online Plex patterns
@@ -73,25 +73,26 @@ class HttpCacheConfig:
         # Plex account
         # Cache for some time, this activates 304 responses
         "plex.tv/users/account": "1m",
-        "plex.tv/api/v2/user": "1m",
+        "plex.tv/api/v2/user": "15m",
         # Plex patterns
         # Ratings search
-        "*/library/sections/*/all?*userRating%3E%3E=-1*": "1m",
+        "*/library/sections/*/all?*userRating*=-1*": "10s",
         # len(PlexLibrarySection)
-        "*/library/sections/*/all?includeCollections=0&X-Plex-Container-Size=0&X-Plex-Container-Start=0": DO_NOT_CACHE,
+        "*/library/sections/*/all?*X-Plex-Container-Size=0": DO_NOT_CACHE,
         # __iter__(PlexLibrarySection)
         "*/library/sections/*/all?includeGuids=1": DO_NOT_CACHE,
         # find_by_title
         "*/library/sections/*/all?includeGuids=1&title=*": DO_NOT_CACHE,
+        # episodes
+        "*/library/sections/*/all?includeGuids=1&type=4*": DO_NOT_CACHE,
         # fetch_item, fetch_items
         "*/library/sections/*/all?*": DO_NOT_CACHE,
+        "*/library/sections/*/collections?*X-Plex-Container-Size=0": DO_NOT_CACHE,
         "*/library/sections/*/collections": DO_NOT_CACHE,
         # library_sections
         "*/library/sections": DO_NOT_CACHE,
         # reloads
         "*/library/metadata/*?*include*": DO_NOT_CACHE,
-        # episodes
-        "*/library/sections/*/all?includeGuids=1&type=4*": DO_NOT_CACHE,
         # find_by_id
         "*/library/metadata/*": DO_NOT_CACHE,
         # mark played, mark unplayed
@@ -109,8 +110,9 @@ class HttpCacheConfig:
         "*/devices": DO_NOT_CACHE,
         # system_account
         "*/accounts": DO_NOT_CACHE,
+        # Plex server root
         # version, updated_at
-        # "*/": DO_NOT_CACHE,
+        "*/": "10m",
     }
 
     @property

diff --git a/plextraktsync/factory/Factory.py b/plextraktsync/factory/Factory.py
@@ -137,8 +137,11 @@ def session(self):
 
         return CachedSession(
             cache_name=self.config.cache_path,
-            cache_control=True,
+            # Plex sends "Cache-Control: no-cache" headers to requests we want to cache
+            cache_control=False,
             urls_expire_after=self.urls_expire_after,
+            # Plex doesn't Send Vary: X-Plex-Container-Start
+            match_headers=["X-Plex-Container-Start"],
         )
 
     @cached_property

diff --git a/plextraktsync/plex/PlexServerConnection.py b/plextraktsync/plex/PlexServerConnection.py
@@ -7,7 +7,6 @@
 from requests.exceptions import ConnectionError, SSLError
 
 from plextraktsync.config import PLEX_PLATFORM
-from plextraktsync.decorators.nocache import nocache
 from plextraktsync.factory import Factory, logging
 
 
@@ -29,7 +28,6 @@ def config(self):
     def session(self):
         return self.factory.session
 
-    @nocache
     def connect(self, urls: list[str], token: str):
         plexapi.X_PLEX_PLATFORM = PLEX_PLATFORM
         plexapi.TIMEOUT = self.timeout