The branch, frodo has been updated via c333ab12b54047dcb925eb653ca9ad41e3e2a3a5 (commit) from aaf8244b72a06ccb59a4adf297082a08fdbc046d (commit)
- Log ----------------------------------------------------------------- http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=c333ab12b54047dcb925eb653ca9ad41e3e2a3a5 commit c333ab12b54047dcb925eb653ca9ad41e3e2a3a5 Author: Martijn Kaijser <mcm.kaij...@gmail.com> Date: Sun Apr 13 13:07:52 2014 +0200 [script.artwork.downloader] 12.0.25 diff --git a/script.artwork.downloader/addon.xml b/script.artwork.downloader/addon.xml index 1d0e7b9..86272bd 100644 --- a/script.artwork.downloader/addon.xml +++ b/script.artwork.downloader/addon.xml @@ -2,7 +2,7 @@ <addon id="script.artwork.downloader" name="Artwork Downloader" - version="12.0.24" + version="12.0.25" provider-name="Martijn" > <requires> @@ -15,7 +15,6 @@ <extension point="xbmc.python.script" library="default.py"> <provides>executable</provides> </extension> - <extension point="xbmc.service" library="service.py" start="login"/> <extension point="xbmc.addon.metadata"> <summary lang="be">Downloads Artwork for TV shows, Movies and Musicvideos in your library</summary> <summary lang="da">Downloader grafik til TV-serier, Film og Musikvideoer i dit bibliotek</summary> diff --git a/script.artwork.downloader/changelog.txt b/script.artwork.downloader/changelog.txt index 1f92c00..63dd0ce 100644 --- a/script.artwork.downloader/changelog.txt +++ b/script.artwork.downloader/changelog.txt @@ -1,3 +1,6 @@ +v12.0.25 +- Always apply language filters else you end up with a random language + v12.0.24 - Fix unicode error in season query diff --git a/script.artwork.downloader/lib/apply_filters.py b/script.artwork.downloader/lib/apply_filters.py index 5b7b244..d72ec50 100644 --- a/script.artwork.downloader/lib/apply_filters.py +++ b/script.artwork.downloader/lib/apply_filters.py @@ -95,7 +95,7 @@ def fanart(data): reason = 'Has text' limited = True # Correct language - #elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language'), 'n/a']: + #elif not data.get('artwork')['language'] in [data.get('language'), 'n/a']: # reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') # limited = True return [limited, reason] @@ -146,7 +146,7 @@ def poster(data): reason = 'Size was to small: %s' % data.get('artwork')['height'] limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language')]: + elif not data.get('artwork')['language'] in [data.get('language')]: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -163,7 +163,7 @@ def seasonposter(data): reason = 'Size was to small: %s' % data.get('artwork')['height'] limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language')]: + elif not data.get('artwork')['language'] in [data.get('language')]: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -176,7 +176,7 @@ def banner(data): reason = 'Max number banner reached: %s' % limit.get('limit_artwork_max') limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language')]: + elif not data.get('artwork')['language'] in [data.get('language')]: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -193,7 +193,7 @@ def seasonbanner(data): reason = 'No season' limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language')]: + elif not data.get('artwork')['language'] in [data.get('language')]: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -206,7 +206,7 @@ def clearlogo(data): reason = 'Max number logos reached: %s' % limit.get('limit_artwork_max') limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language'), 'n/a']: + elif not data.get('artwork')['language'] in [data.get('language'), 'n/a']: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -219,7 +219,7 @@ def clearart(data): reason = 'Max number clearart reached: %s' % limit.get('limit_artwork_max') limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language'), 'n/a']: + elif not data.get('artwork')['language'] in [data.get('language'), 'n/a']: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -232,7 +232,7 @@ def characterart(data): reason = 'Max number characterart reached: %s' % limit.get('limit_artwork_max') limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language'), 'n/a']: + elif not data.get('artwork')['language'] in [data.get('language'), 'n/a']: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -245,7 +245,7 @@ def landscape(data): reason = 'Max number landscape reached: %s' % limit.get('limit_artwork_max') limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language'), 'n/a']: + elif not data.get('artwork')['language'] in [data.get('language'), 'n/a']: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -258,7 +258,7 @@ def seasonlandscape(data): reason = 'Max number seasonthumb reached: %s' % limit.get('limit_artwork_max') limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language'), 'n/a']: + elif not data.get('artwork')['language'] in [data.get('language'), 'n/a']: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -271,7 +271,7 @@ def defaultthumb(data): reason = 'Max number defaultthumb reached: %s' % limit.get('limit_artwork_max') limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language'), 'n/a']: + elif not data.get('artwork')['language'] in [data.get('language'), 'n/a']: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] @@ -292,7 +292,7 @@ def discart(data): reason = "Doesn't match preferred disctype: %s" % data.get('disctype') limited = True # Correct language - elif limit.get('limit_artwork') and not data.get('artwork')['language'] in [data.get('language'), 'n/a']: + elif not data.get('artwork')['language'] in [data.get('language'), 'n/a']: reason = "Doesn't match preferred language: %s" % limit.get('limit_preferred_language') limited = True return [limited, reason] \ No newline at end of file diff --git a/script.artwork.downloader/resources/settings.xml b/script.artwork.downloader/resources/settings.xml index badf7b6..2a7d414 100644 --- a/script.artwork.downloader/resources/settings.xml +++ b/script.artwork.downloader/resources/settings.xml @@ -25,10 +25,10 @@ <setting type="sep" /> <setting label="32052" type="lsep" /> <setting type="sep" /> + <setting label="32055" type="select" id="limit_preferred_language" default="English" values="Chinese|Dutch|English|Finnish|French|German|Hungarian|Italian|Japanese|Polish|Portuguese|Russian|Spanish|Swedish" /> <setting label="32051" type="bool" id="limit_artwork" default="true"/> <setting label="32053" type="slider" id="limit_extrafanart_maximum" subsetting="true" enable="eq(-1,true)" visible="eq(-1,true)" default="5" range="5,5,20" option="int" /> <setting label="32054" type="slider" id="limit_extrafanart_rating" subsetting="true" enable="eq(-2,true)" visible="eq(-2,true)" default="5" range="0,10" option="int" /> - <setting label="32055" type="select" id="limit_preferred_language" subsetting="true" enable="eq(-3,true)" visible="eq(-3,true)" default="English" values="Chinese|Dutch|English|Finnish|French|German|Hungarian|Italian|Japanese|Polish|Portuguese|Russian|Spanish|Swedish" /> <setting label="32056" type="bool" id="limit_notext" subsetting="true" enable="eq(-4,true)" visible="eq(-4,true)" default="true" /> <setting label="32057" type="select" id="limit_size_moviefanart" subsetting="true" enable="eq(-5,true)" visible="eq(-5,true)" default="720" values="480|720|1080" /> <setting label="32058" type="select" id="limit_size_tvshowfanart" subsetting="true" enable="eq(-6,true)" visible="eq(-6,true)" default="720" values="480|720|1080" /> ----------------------------------------------------------------------- Summary of changes: script.artwork.downloader/addon.xml | 3 +- script.artwork.downloader/changelog.txt | 3 ++ script.artwork.downloader/lib/apply_filters.py | 24 +++++++++++----------- script.artwork.downloader/resources/settings.xml | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) hooks/post-receive -- Scripts ------------------------------------------------------------------------------ Put Bad Developers to Shame Dominate Development with Jenkins Continuous Integration Continuously Automate Build, Test & Deployment Start a new project now. Try Jenkins in the cloud. http://p.sf.net/sfu/13600_Cloudbees _______________________________________________ Xbmc-addons mailing list Xbmc-addons@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xbmc-addons