Merge pull request #607 from pkscout/tmdb-tvshows-202

[metadata.tvshows.themoviedb.org.python] v.2.0.2

Author: pkscout

metadata.tvshows.themoviedb.org.python/.github/workflows/sync-addon-metadata-translations.yml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.tvshows.themoviedb.org.python"
   name="TMDb TV Shows"
-  version="2.0.1"
+  version="2.0.2"
   provider-name="Team Kodi">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
@@ -10,13 +10,10 @@
   <extension point="xbmc.metadata.scraper.tvshows" library="main.py"/>
   <extension point="xbmc.addon.metadata">
     <reuselanguageinvoker>true</reuselanguageinvoker>
-    <news>2.0.1
-- Season-aware artwork selection
-- Better artwork distribution across all art types
-- Fix Fanart.tv URLs with special characters
-- Fanart.tv source preference settings
-- Artwork scoring: language + resolution
-- Punctuation agnostic title matching, year filter fallback
+    <news>2.0.2
+- Log Fanart.tv and Trakt 404s as info instead of error
+- Wipe in-memory caches after 15 min idle
+- updated Trakt access
     </news>
     <platform>all</platform>
     <license>GPL-3.0-or-later</license>

metadata.tvshows.themoviedb.org.python/addon.xml

@@ -1,3 +1,8 @@
+2.0.2
+Log Fanart.tv and Trakt 404s as info instead of error
+Wipe in-memory caches after 15 min idle
+updated Trackt access
+
 2.0.1
 ground up rewrite by MikeSiLVO
 Season-aware artwork selection

metadata.tvshows.themoviedb.org.python/changelog.txt

@@ -105,5 +105,9 @@ def _fetch(tvdb_id, client_key):
         with urlopen(req, timeout=10) as resp:
             return json.loads(resp.read().decode('utf-8'))
     except Exception as exc:
-        log.error('Fanart.tv GET /tv/{} failed: {}'.format(tvdb_id, exc))
+        from urllib.error import HTTPError
+        if isinstance(exc, HTTPError) and exc.code == 404:
+            log.info('Fanart.tv GET /tv/{}: not found'.format(tvdb_id))
+        else:
+            log.error('Fanart.tv GET /tv/{} failed: {}'.format(tvdb_id, exc))
         return None

metadata.tvshows.themoviedb.org.python/lib/api/fanarttv.py

@@ -103,5 +103,9 @@ def _get(path, params=None):
         with urlopen(req, timeout=10) as resp:
             return json.loads(resp.read().decode('utf-8'))
     except Exception as exc:
-        log.error('Trakt GET {} failed: {}'.format(path, exc))
+        from urllib.error import HTTPError
+        if isinstance(exc, HTTPError) and exc.code == 404:
+            log.info('Trakt GET {}: not found'.format(path))
+        else:
+            log.error('Trakt GET {} failed: {}'.format(path, exc))
         return None

metadata.tvshows.themoviedb.org.python/lib/api/trakt.py

@@ -17,7 +17,7 @@
 
 TMDB_API_KEY = 'af3a53eb387d57fc935e9128468b1899'
 
-TRAKT_CLIENTID = '90901c6be3b2de5a4fa0edf9ab5c75e9a5a0fef2b4ee7373d8b63dcf61f95697'
+TRAKT_CLIENTID = '07b40ae3e7c2aa7be77053b27469bfc599aafca58dafda41597c721e1293dd01'
 
 FANARTTV_BASE = 'https://webservice.fanart.tv/v3.2'
 FANARTTV_KEY = 'b018086af0e1478479adfc55634db97d'

metadata.tvshows.themoviedb.org.python/lib/config.py

@@ -4,13 +4,15 @@
 
 import json
 import re
+import time
 
 import xbmc
 import xbmcgui
 import xbmcplugin
 
 from lib import art_cache, log
 from lib.artwork import set_artwork
+from lib.api import trakt
 from lib.api.fanarttv import merge_fanarttv_artwork
 from lib.api.tmdb import TmdbApi, get_image_base, _cache
 from lib.api.imdb import get_rating as imdb_rating, check_update as imdb_check
@@ -51,9 +53,25 @@
 
 _active_show = ''
 
+_IDLE_TTL = 15 * 60
+_last_activity = 0
+
+
+def _clear_in_memory_caches():
+    _cache.clear()
+    trakt._cached_shows.clear()
+    trakt._episode_cache.clear()
+
 
 def run_action(handle, action, params):
     """Dispatch a Kodi scraper action."""
+    global _last_activity
+    now = time.time()
+    if _last_activity and now - _last_activity > _IDLE_TTL:
+        log.debug('idle > {}s, wiping in-memory caches'.format(_IDLE_TTL))
+        _clear_in_memory_caches()
+    _last_activity = now
+
     settings = get_settings()
     log.init(settings.get('verbose_log', False))