Sync scrapers with recent versions in scraper repo

8 files changed, 22 insertions, 224 deletions

diff --git a/addons/metadata.themoviedb.org.python/addon.xml b/addons/metadata.themoviedb.org.python/addon.xml
index 93fcb2f8a7..53af3d8d1a 100644
--- a/addons/metadata.themoviedb.org.python/addon.xml
+++ b/addons/metadata.themoviedb.org.python/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.themoviedb.org.python"
        name="The Movie Database Python"
-       version="1.3.0+matrix.1"
+       version="1.3.1+matrix.1"
        provider-name="Team Kodi">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>
@@ -11,14 +11,14 @@
              library="python/scraper.py"/>
   <extension point="xbmc.addon.metadata">
     <reuselanguageinvoker>true</reuselanguageinvoker>
-    <news>v1.3.0 (2020-10-04)
+    <news>v1.3.1 (2020-11-02)
+- Change: simplify artwork selection options
+- Fix: strip region to pick correct poster language
+
+v1.3.0 (2020-10-04)
 - Change: removed dependencies on requests, tmdbsimple, and trakt modules
 - Change: images now returned with initial API call instead of during fallback
 - Change: settings language for TMDb now use culture name (i.e. en-US) - required for direct API call
-
-v1.2.1 (2020-08-08)
-- Fix: Prefer movies that exactly match search title and year
-- Fix: Change 'landscape from TMDb' option disabled behavior to keep titled fanart
 </news>
     <summary lang="af_ZA">TMDB Fliek Skraper</summary>
     <summary lang="be_BY">TMDB Movie Scraper</summary>
diff --git a/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/tmdb.py b/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/tmdb.py
index 7ce9422daf..2852f9eaa3 100644
--- a/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/tmdb.py
+++ b/addons/metadata.themoviedb.org.python/python/lib/tmdbscraper/tmdb.py
@@ -160,6 +160,9 @@ def _get_moviecollection(collection_id, language=None):
         return response
 
 def _parse_artwork(movie, collection, urlbases, language):
+    if language:
+        # Image languages don't have regional variants
+        language = language.split('-')[0]
     posters = []
     landscape = []
     fanart = []
diff --git a/addons/metadata.themoviedb.org.python/python/scraper.py b/addons/metadata.themoviedb.org.python/python/scraper.py
index 8561d6d357..c976407a0b 100644
--- a/addons/metadata.themoviedb.org.python/python/scraper.py
+++ b/addons/metadata.themoviedb.org.python/python/scraper.py
@@ -12,7 +12,7 @@ from lib.tmdbscraper.traktratings import get_trakt_ratinginfo
 from scraper_datahelper import combine_scraped_details_info_and_ratings, \
     combine_scraped_details_available_artwork, find_uniqueids_in_text, get_params
 from scraper_config import configure_scraped_details, PathSpecificSettings, \
-    configure_fanarttv_artwork, configure_tmdb_artwork, is_fanarttv_configured
+    configure_tmdb_artwork, is_fanarttv_configured
 
 ADDON_SETTINGS = xbmcaddon.Addon()
 ID = ADDON_SETTINGS.getAddonInfo('id')
@@ -85,6 +85,8 @@ def add_artworks(listitem, artworks):
     listitem.setAvailableFanart(fanart_to_set)
 
 def get_details(input_uniqueids, handle, settings):
+    if not input_uniqueids:
+        return False
     details = get_tmdb_scraper(settings).get_details(input_uniqueids)
     if not details:
         return False
@@ -113,7 +115,6 @@ def get_details(input_uniqueids, handle, settings):
             settings.getSettingString('fanarttv_clientkey'),
             settings.getSettingString('fanarttv_language'),
             details['_info']['set_tmdbid'])
-        fanarttv_info = configure_fanarttv_artwork(fanarttv_info, settings)
         details = combine_scraped_details_available_artwork(details, fanarttv_info)
 
     details = configure_scraped_details(details, settings)
@@ -144,7 +145,11 @@ def build_lookup_string(uniqueids):
     return json.dumps(uniqueids)
 
 def parse_lookup_string(uniqueids):
-    return json.loads(uniqueids)
+    try:
+        return json.loads(uniqueids)
+    except ValueError:
+        log("Can't parse this lookup string, is it from another add-on?\n" + uniqueids, xbmc.LOGWARNING)
+        return None
 
 def run():
     params = get_params(sys.argv[1:])
diff --git a/addons/metadata.themoviedb.org.python/python/scraper_config.py b/addons/metadata.themoviedb.org.python/python/scraper_config.py
index c39d4c9e64..76a042bcfa 100644
--- a/addons/metadata.themoviedb.org.python/python/scraper_config.py
+++ b/addons/metadata.themoviedb.org.python/python/scraper_config.py
@@ -30,23 +30,8 @@ def configure_tmdb_artwork(details, settings):
 
     return details
 
-_fanarttv_arttypes = ['fanart', 'poster', 'clearlogo', 'clearart', 'discart', 'banner', 'landscape', 'keyart']
-_fanarttv_arttypes += ['set.' + t for t in _fanarttv_arttypes]
-def configure_fanarttv_artwork(details, settings):
-    if 'available_art' not in details:
-        return details
-    art = details['available_art']
-    for arttype in _fanarttv_arttypes:
-        if arttype in art and not settings.getSettingBool('enable_fanarttv_' + arttype):
-            del art[arttype]
-
-    return details
-
 def is_fanarttv_configured(settings):
-    for arttype in _fanarttv_arttypes:
-        if settings.getSettingBool('enable_fanarttv_' + arttype):
-            return True
-    return False
+    return settings.getSettingBool('enable_fanarttv_artwork')
 
 def _configure_rating_prefix(details, settings):
     if details['info'].get('mpaa'):
diff --git a/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_gb/strings.po b/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_gb/strings.po
index f977ba8507..2f29815ab5 100644
--- a/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_gb/strings.po
+++ b/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_gb/strings.po
@@ -77,65 +77,5 @@ msgid "Fanart.tv personal API key (optional)"
 msgstr ""
 
 msgctxt "#30102"
-msgid "Enable fanart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30103"
-msgid "Enable poster from Fanart.tv"
-msgstr ""
-
-msgctxt "#30104"
-msgid "Enable clearlogo from Fanart.tv"
-msgstr ""
-
-msgctxt "#30105"
-msgid "Enable clearart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30106"
-msgid "Enable discart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30107"
-msgid "Enable banner from Fanart.tv"
-msgstr ""
-
-msgctxt "#30108"
-msgid "Enable landscape from Fanart.tv"
-msgstr ""
-
-msgctxt "#30109"
-msgid "Enable set fanart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30110"
-msgid "Enable set poster from Fanart.tv"
-msgstr ""
-
-msgctxt "#30111"
-msgid "Enable set clearlogo from Fanart.tv"
-msgstr ""
-
-msgctxt "#30112"
-msgid "Enable set clearart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30113"
-msgid "Enable set discart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30114"
-msgid "Enable set banner from Fanart.tv"
-msgstr ""
-
-msgctxt "#30115"
-msgid "Enable set landscape from Fanart.tv"
-msgstr ""
-
-msgctxt "#30116"
-msgid "Enable keyart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30117"
-msgid "Enable set keyart from Fanart.tv"
+msgid "Enable artwork from Fanart.tv"
 msgstr ""
diff --git a/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_nz/strings.po b/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_nz/strings.po
index f977ba8507..2f29815ab5 100644
--- a/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_nz/strings.po
+++ b/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_nz/strings.po
@@ -77,65 +77,5 @@ msgid "Fanart.tv personal API key (optional)"
 msgstr ""
 
 msgctxt "#30102"
-msgid "Enable fanart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30103"
-msgid "Enable poster from Fanart.tv"
-msgstr ""
-
-msgctxt "#30104"
-msgid "Enable clearlogo from Fanart.tv"
-msgstr ""
-
-msgctxt "#30105"
-msgid "Enable clearart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30106"
-msgid "Enable discart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30107"
-msgid "Enable banner from Fanart.tv"
-msgstr ""
-
-msgctxt "#30108"
-msgid "Enable landscape from Fanart.tv"
-msgstr ""
-
-msgctxt "#30109"
-msgid "Enable set fanart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30110"
-msgid "Enable set poster from Fanart.tv"
-msgstr ""
-
-msgctxt "#30111"
-msgid "Enable set clearlogo from Fanart.tv"
-msgstr ""
-
-msgctxt "#30112"
-msgid "Enable set clearart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30113"
-msgid "Enable set discart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30114"
-msgid "Enable set banner from Fanart.tv"
-msgstr ""
-
-msgctxt "#30115"
-msgid "Enable set landscape from Fanart.tv"
-msgstr ""
-
-msgctxt "#30116"
-msgid "Enable keyart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30117"
-msgid "Enable set keyart from Fanart.tv"
+msgid "Enable artwork from Fanart.tv"
 msgstr ""
diff --git a/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_us/strings.po b/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_us/strings.po
index f977ba8507..2f29815ab5 100644
--- a/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_us/strings.po
+++ b/addons/metadata.themoviedb.org.python/resources/language/resource.language.en_us/strings.po
@@ -77,65 +77,5 @@ msgid "Fanart.tv personal API key (optional)"
 msgstr ""
 
 msgctxt "#30102"
-msgid "Enable fanart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30103"
-msgid "Enable poster from Fanart.tv"
-msgstr ""
-
-msgctxt "#30104"
-msgid "Enable clearlogo from Fanart.tv"
-msgstr ""
-
-msgctxt "#30105"
-msgid "Enable clearart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30106"
-msgid "Enable discart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30107"
-msgid "Enable banner from Fanart.tv"
-msgstr ""
-
-msgctxt "#30108"
-msgid "Enable landscape from Fanart.tv"
-msgstr ""
-
-msgctxt "#30109"
-msgid "Enable set fanart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30110"
-msgid "Enable set poster from Fanart.tv"
-msgstr ""
-
-msgctxt "#30111"
-msgid "Enable set clearlogo from Fanart.tv"
-msgstr ""
-
-msgctxt "#30112"
-msgid "Enable set clearart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30113"
-msgid "Enable set discart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30114"
-msgid "Enable set banner from Fanart.tv"
-msgstr ""
-
-msgctxt "#30115"
-msgid "Enable set landscape from Fanart.tv"
-msgstr ""
-
-msgctxt "#30116"
-msgid "Enable keyart from Fanart.tv"
-msgstr ""
-
-msgctxt "#30117"
-msgid "Enable set keyart from Fanart.tv"
+msgid "Enable artwork from Fanart.tv"
 msgstr ""
diff --git a/addons/metadata.themoviedb.org.python/resources/settings.xml b/addons/metadata.themoviedb.org.python/resources/settings.xml
index b63ae0c789..2ade0e3e97 100644
--- a/addons/metadata.themoviedb.org.python/resources/settings.xml
+++ b/addons/metadata.themoviedb.org.python/resources/settings.xml
@@ -19,23 +19,8 @@
 		<setting id="previewUrl" type="text" default="" visible="false" />
 	</category>
 	<category label="Fanart.tv">
+		<setting label="30102" type="bool" id="enable_fanarttv_artwork" default="true"/>
         <setting id="fanarttv_language" label="30100" type="select" default="en" values="en|fr|de|ja|zh|es|it|pt|sv|ru|nl|ar|ko|no|hu|da|hi|is|pl|he|bg|fi|ml" />
-		<setting label="30102" type="bool" id="enable_fanarttv_fanart" default="false"/>
-		<setting label="30103" type="bool" id="enable_fanarttv_poster" default="false"/>
-		<setting label="30116" type="bool" id="enable_fanarttv_keyart" default="false"/>
-		<setting label="30104" type="bool" id="enable_fanarttv_clearlogo" default="false"/>
-		<setting label="30105" type="bool" id="enable_fanarttv_clearart" default="false"/>
-		<setting label="30106" type="bool" id="enable_fanarttv_discart" default="false"/>
-		<setting label="30107" type="bool" id="enable_fanarttv_banner" default="false"/>
-		<setting label="30108" type="bool" id="enable_fanarttv_landscape" default="false"/>
-		<setting label="30109" type="bool" id="enable_fanarttv_set.fanart" default="false"/>
-		<setting label="30110" type="bool" id="enable_fanarttv_set.poster" default="false"/>
-		<setting label="30117" type="bool" id="enable_fanarttv_set.keyart" default="false"/>
-		<setting label="30111" type="bool" id="enable_fanarttv_set.clearlogo" default="false"/>
-		<setting label="30112" type="bool" id="enable_fanarttv_set.clearart" default="false"/>
-		<setting label="30113" type="bool" id="enable_fanarttv_set.discart" default="false"/>
-		<setting label="30114" type="bool" id="enable_fanarttv_set.banner" default="false"/>
-		<setting label="30115" type="bool" id="enable_fanarttv_set.landscape" default="false"/>
 		<setting label="30101" type="text" id="fanarttv_clientkey" default="" />
 	</category>
 </settings>