Fix for newer artists only having hdlogos

Author: stefansielaff

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.cdartmanager"
        name="cdART Manager"
-       version="4.1.0"
+       version="4.1.1"
        provider-name="stef.an">
     <requires>
         <import addon="xbmc.python" version="2.19.0"/>

changelog.txt

@@ -1,3 +1,6 @@
+4.1.1
+- Fix: fanart.tv deprecated non-hd-clearart for artists, causing the download to crash under certain circumstances
+
 4.1.0
 - first "official" release by stef.an
 - compatible with Helix and newer releases of Kodi

default.py

@@ -38,7 +38,8 @@
 __dbversionancient__ = "1.5.3"
 __addon_path__ = __addon__.getAddonInfo('path')
 __useragent__ = "%s\\%s (https://github.com/stefansielaff/script.cdartmanager)" % (__scriptname__, __version__)
-enable_hdlogos = eval(__addon__.getSetting("enable_hdlogos"))
+# enable_hdlogos = eval(__addon__.getSetting("enable_hdlogos"))
+enable_hdlogos = True # fanart.tv has deprecated low res art, so we always pefer hd from now on
 mbid_match_number = int(__addon__.getSetting("mbid_match_number"))
 use_musicbrainz = eval(__addon__.getSetting("use_musicbrainz"))
 musicbrainz_server = __addon__.getSetting("musicbrainz_server")

resources/lib/download.py

@@ -310,13 +310,16 @@ def auto_download(type, artist_list, background=False):
                 if type == "fanart":
                     art = remote_fanart_list(auto_art)
                 elif type == "clearlogo":
-                    art = remote_clearlogo_list(auto_art)
-                    arthd = remote_hdlogo_list(auto_art)
+#                    art = remote_clearlogo_list(auto_art)
+#                    arthd = remote_hdlogo_list(auto_art)
+                    art = remote_hdlogo_list(auto_art)
+                    if not art:
+                        art = remote_clearlogo_list(auto_art)
                 elif type == "musicbanner":
                     art = remote_banner_list(auto_art)
                 else:
                     art = remote_artistthumb_list(auto_art)
-                if art or arthd:
+                if art:
                     if type == "fanart":
                         temp_art["path"] = path
                         auto_art["path"] = os.path.join(path, "extrafanart").replace("\\\\", "\\")
@@ -368,13 +371,14 @@ def auto_download(type, artist_list, background=False):
                                 log("    Path: %s" % auto_art["path"], xbmc.LOGDEBUG)
                                 d_error = True
                     else:
-                        if type == "clearlogo":
-                            if arthd and enable_hdlogos:
-                                artwork = arthd[0]
-                            else:
-                                artwork = art[0]
-                        else:
-                            artwork = art[0]
+#                        if type == "clearlogo":
+#                            if arthd and enable_hdlogos:
+#                                artwork = arthd[0]
+#                            else:
+#                                artwork = art[0]
+#                        else:
+#                            artwork = art[0]
+                        artwork = art[0]
                         if type == "artistthumb":
                             if resizeondownload:
                                 low_res = check_size(auto_art["path"], key_label, 1000, 1000)
@@ -390,11 +394,12 @@ def auto_download(type, artist_list, background=False):
                                                                                                   "artistthumb", "auto",
                                                                                                   0, background)
                         elif type == "clearlogo":
-                            if enable_hdlogos and resizeondownload and arthd:
-                                low_res = check_size(auto_art["path"], key_label, 800, 310)
-                            else:
-                                low_res = False
-                            if exists(os.path.join(auto_art["path"], "logo.png")) and not low_res:
+#                            if enable_hdlogos and resizeondownload and arthd:
+#                                low_res = check_size(auto_art["path"], key_label, 800, 310)
+#                            else:
+#                                low_res = False
+#                            if exists(os.path.join(auto_art["path"], "logo.png")) and not low_res:
+                            if exists(os.path.join(auto_art["path"], "logo.png")):
                                 log("ClearLOGO already exists, skipping", xbmc.LOGDEBUG)
                                 continue
                             else:

resources/settings.xml

@@ -37,7 +37,6 @@
         <setting label="32176" type="text" id="illegal_characters" visible="eq(-1,true)" default=":*&lt;&gt;/\|?&quot;" />
         <setting label="32177" type="text" id="replace_character" visible="eq(-2,true)" default="_" />
         <setting label="32180" type="bool" id="change_period_atend" visible="eq(-3,true)" default="true" />
-        <setting label="32171" type="bool" id="enable_hdlogos" default="true" />
         <setting label="32183" type="bool" id="enable_fanart_limit" default="false" />
         <setting label="32184" type="slider" id="fanart_limit" option="int" visible="eq(-1,true)" range="1,60" default="10" />
         <setting type="sep" />
@@ -56,5 +55,6 @@
         <setting label="32190" type="slider" id="mb_delay" option="int" visible="eq(-2,false)" range="0,9" default="9" />
         <setting type="sep" />
         <setting label="32106" type="bool" id="resizeondownload" default="false" enable="false"/>
+        <setting label="32171" type="bool" id="enable_hdlogos" default="true" enabled="false" />
     </category>
 </settings>