The branch, eden has been updated
via afb16200948b6540c02a71fadf89936161a10c61 (commit)
via eeff22073b18ec41e4dbb0f2e5df2342f1734fd0 (commit)
from 72c91b3c162c7c561e3d2557bf05f1e3c32bf286 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=afb16200948b6540c02a71fadf89936161a10c61
commit afb16200948b6540c02a71fadf89936161a10c61
Author: Martijn Kaijser <[email protected]>
Date: Wed Sep 5 18:37:08 2012 +0200
[script.artwork.downloader] -v1.0.17
diff --git a/script.artwork.downloader/addon.xml
b/script.artwork.downloader/addon.xml
index 6dc6087..b7639b2 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="1.0.15"
+ version="1.0.17"
provider-name="paddycarey, putneyj, Martijn"
>
<requires>
diff --git a/script.artwork.downloader/changelog.txt
b/script.artwork.downloader/changelog.txt
index 83c57b5..19944cd 100644
--- a/script.artwork.downloader/changelog.txt
+++ b/script.artwork.downloader/changelog.txt
@@ -1,3 +1,11 @@
+[B]1.0.17[/B]
+- Forgot to update settings.xml
+
+[B]1.0.16[/B]
+- Added: Movie Thumb
+- Added: Movie Banner
+- Added: HD artwork takes priority
+
[B]1.0.15[/B]
- Disable autorun
- Disable fanart deletion and reduce max number of image
diff --git a/script.artwork.downloader/resources/lib/apply_filters.py
b/script.artwork.downloader/resources/lib/apply_filters.py
index 948496b..f1cb21a 100644
--- a/script.artwork.downloader/resources/lib/apply_filters.py
+++ b/script.artwork.downloader/resources/lib/apply_filters.py
@@ -161,10 +161,6 @@ class apply_filters:
if downloaded_artwork >= self.settings.limit_artwork_max:
reason = 'Max number banner reached: %s' %
self.settings.limit_artwork_max
limited = True
- # Minimal rating
- elif self.settings.limit_artwork and artwork['rating'] <
self.settings.limit_extrafanart_rating:
- reason = 'Rating too low: %s' % artwork['rating']
- limited = True
# Correct language
elif self.settings.limit_artwork and not artwork['language'] in [
language ]:
reason = "Doesn't match preferred language: %s" % pref_language
@@ -182,10 +178,6 @@ class apply_filters:
if not 'season' in artwork:
reason = 'No season'
limited = True
- # Minimal rating
- elif self.settings.limit_artwork and artwork['rating'] <
self.settings.limit_extrafanart_rating:
- reason = 'Rating too low: %s' % artwork['rating']
- limited = True
# Correct language
elif self.settings.limit_artwork and not artwork['language'] in [
language ]:
reason = "Doesn't match preferred language: %s" % pref_language
diff --git a/script.artwork.downloader/resources/lib/provider/fanarttv.py
b/script.artwork.downloader/resources/lib/provider/fanarttv.py
index 2b82bd4..b63793c 100644
--- a/script.artwork.downloader/resources/lib/provider/fanarttv.py
+++ b/script.artwork.downloader/resources/lib/provider/fanarttv.py
@@ -16,7 +16,22 @@ API_KEY = '586118be1ac673f74963cc284d46bd8e'
API_URL_TV = 'http://fanart.tv/webservice/series/%s/%s/json/all/1/2'
API_URL_MOVIE = 'http://fanart.tv/webservice/movie/%s/%s/json/all/1/2/'
-IMAGE_TYPES = ['clearlogo', 'clearart', 'tvthumb', 'seasonthumb',
'characterart','movielogo', 'movieart', 'moviedisc']
+IMAGE_TYPES = ['clearlogo',
+ 'hdtvlogo',
+ 'clearart',
+ 'hdclearart',
+ 'tvthumb',
+ 'seasonthumb',
+ 'characterart',
+ 'tvbanner',
+ 'seasonbanner',
+ 'movielogo',
+ 'hdmovielogo',
+ 'movieart',
+ 'moviedisc',
+ 'hdmovieclearart',
+ 'moviethumb',
+ 'moviebanner']
class FTV_TVProvider():
@@ -34,16 +49,36 @@ class FTV_TVProvider():
for art in IMAGE_TYPES:
if value.has_key(art):
for item in value[art]:
+ # Check on what type and use the general tag
+ arttypes = {'clearlogo': 'clearlogo',
+ 'hdtvlogo': 'clearlogo',
+ 'clearart': 'clearart',
+ 'hdclearart': 'clearart',
+ 'tvthumb': 'tvthumb',
+ 'seasonthumb': 'seasonthumb',
+ 'characterart': 'characterart',
+ 'tvbanner': 'tvbanner',
+ 'seasonbanner': 'seasonbanner',
+ }
+ if art in ['hdtvlogo', 'hdclearart']:
+ size = 'HD'
+ elif art in ['clearlogo', 'clearart']:
+ size = 'SD'
+ else:
+ size = ''
# Create GUI info tag
generalinfo = '%s: %s | ' %(
__localize__(32141), get_language(item.get('lang')).capitalize())
if item.get('season'):
generalinfo += '%s: %s | ' %(
__localize__(32144), item.get('season'))
generalinfo += '%s: %s | ' %(
__localize__(32143), item.get('likes'))
+ if art in ['hdtvlogo', 'hdclearart', 'clearlogo',
'clearart']:
+ generalinfo += '%s: %s | ' %(
__localize__(32145), size)
# Fill list
image_list.append({'url':
urllib.quote(item.get('url'), ':/'),
'preview': item.get('url') +
'/preview',
'id': item.get('id'),
- 'type': art,
+ 'type': arttypes[art],
+ 'size': size,
'season':
item.get('season','n/a'),
'language': item.get('lang'),
'votes': item.get('likes'),
@@ -53,6 +88,7 @@ class FTV_TVProvider():
else:
# Sort the list before return. Last sort method is primary
image_list = sorted(image_list, key=itemgetter('votes'),
reverse=True)
+ image_list = sorted(image_list, key=itemgetter('size'),
reverse=False)
image_list = sorted(image_list, key=itemgetter('language'))
return image_list
@@ -75,18 +111,30 @@ class FTV_MovieProvider():
# Check on what type and use the general tag
arttypes = {'movielogo': 'clearlogo',
'moviedisc': 'discart',
- 'movieart': 'clearart'}
- #arttype = arttypes[art]
+ 'movieart': 'clearart',
+ 'hdmovielogo': 'clearlogo',
+ 'hdmovieclearart': 'clearart',
+ 'moviebanner': 'banner',
+ 'moviethumb': 'thumb'}
+ if art in ['hdmovielogo', 'hdmovieclearart']:
+ size = 'HD'
+ elif art in ['movielogo', 'movieart']:
+ size = 'SD'
+ else:
+ size = ''
# Create GUI info tag
generalinfo = '%s: %s | ' %(
__localize__(32141), get_language(item.get('lang')).capitalize())
if item.get('disc_type'):
generalinfo += '%s: %s (%s) | ' %(
__localize__(32146), item.get('disc'), item.get('disc_type'))
+ if art in ['hdmovielogo', 'hdmovieclearart',
'movielogo', 'movieclearart']:
+ generalinfo += '%s: %s | ' %(
__localize__(32145), size)
generalinfo += '%s: %s | ' %(
__localize__(32143), item.get('likes'))
# Fill list
image_list.append({'url':
urllib.quote(item.get('url'), ':/'),
'preview': item.get('url') +
'/preview',
'id': item.get('id'),
'type': arttypes[art],
+ 'size': size,
'season':
item.get('season','n/a'),
'language': item.get('lang'),
'votes': item.get('likes'),
@@ -98,5 +146,6 @@ class FTV_MovieProvider():
else:
# Sort the list before return. Last sort method is primary
image_list = sorted(image_list, key=itemgetter('votes'),
reverse=True)
+ image_list = sorted(image_list, key=itemgetter('size'),
reverse=False)
image_list = sorted(image_list, key=itemgetter('language'))
return image_list
\ No newline at end of file
diff --git a/script.artwork.downloader/resources/lib/provider/tmdb.py
b/script.artwork.downloader/resources/lib/provider/tmdb.py
index 6b81f80..7745955 100644
--- a/script.artwork.downloader/resources/lib/provider/tmdb.py
+++ b/script.artwork.downloader/resources/lib/provider/tmdb.py
@@ -66,7 +66,7 @@ class TMDBProvider():
image_list.append({'url': BASE_IMAGEURL + 'w780' +
item['file_path'],
'preview': BASE_IMAGEURL + 'w300' +
item['file_path'],
'id':
item.get('file_path').lstrip('/').replace('.jpg', ''),
- 'type': ['thumb','extrathumbs'],
+ 'type': ['extrathumbs'],
'height': item.get('height'),
'width': item.get('width'),
'language': item.get('iso_639_1','n/a'),
diff --git a/script.artwork.downloader/resources/lib/settings.py
b/script.artwork.downloader/resources/lib/settings.py
index 5756ced..92f1904 100644
--- a/script.artwork.downloader/resources/lib/settings.py
+++ b/script.artwork.downloader/resources/lib/settings.py
@@ -28,9 +28,11 @@ class settings:
self.movie_extrafanart =
__addon__.getSetting("movie_extrafanart") == 'true'
self.movie_extrathumbs =
__addon__.getSetting("movie_extrathumbs") == 'true'
self.movie_logo = __addon__.getSetting("movie_logo")
== 'true'
- self.movie_clearart = __addon__.getSetting("tvshow_clearart")
== 'true'
+ self.movie_clearart = __addon__.getSetting("movie_clearart")
== 'true'
self.movie_discart = __addon__.getSetting("movie_discart")
== 'true'
-
+ self.movie_thumb = __addon__.getSetting("movie_thumb")
== 'true'
+ self.movie_banner = __addon__.getSetting("movie_banner")
== 'true'
+
self.tvshow_enable = __addon__.getSetting("tvshow_enable")
== 'true'
self.tvshow_poster = __addon__.getSetting("tvshow_poster")
== 'true'
self.tvshow_seasonposter =
__addon__.getSetting("tvshow_seasonposter") == 'true'
@@ -110,6 +112,8 @@ class settings:
log('## - ExtraThumbs = %s' % str(self.movie_extrathumbs))
log('## - Logo = %s' % str(self.movie_logo))
log('## - DiscArt = %s' % str(self.movie_discart))
+ log('## - Thumbs = %s' % str(self.movie_thumb))
+ log('## - Banner = %s' % str(self.movie_banner))
log('##')
log('## TV Show Artwork = %s' % str(self.tvshow_enable))
log('## - Poster = %s' % str(self.tvshow_poster))
@@ -203,6 +207,20 @@ class settings:
'art_type': 'discart',
'filename': 'disc.png'},
+ {'media_type': 'movie',
+ 'bulk_enabled': self.movie_thumb,
+ 'solo_enabled': 'true',
+ 'gui_string': __localize__(32130),
+ 'art_type': 'thumb',
+ 'filename': 'landscape.jpg'},
+
+ {'media_type': 'movie',
+ 'bulk_enabled': self.movie_banner,
+ 'solo_enabled': 'true',
+ 'gui_string': __localize__(32123),
+ 'art_type': 'banner',
+ 'filename': 'banner.jpg'},
+
# append tv show list
{'media_type': 'tvshow',
'bulk_enabled': self.tvshow_poster,
@@ -342,7 +360,7 @@ class settings:
self._get_artwork()
# Check if faulty setting in movie section
if self.movie_enable:
- if not self.movie_poster and not self.movie_fanart and not
self.movie_extrafanart and not self.movie_extrathumbs and not self.movie_logo
and not self.movie_clearart and not self.movie_discart:
+ if not self.movie_poster and not self.movie_fanart and not
self.movie_extrafanart and not self.movie_extrathumbs and not self.movie_logo
and not self.movie_clearart and not self.movie_discart and not self.movie_thumb
and not self.movie_banner:
check_movie = False
log('Setting check: No subsetting of movies enabled')
else: check_movie = True
diff --git a/script.artwork.downloader/resources/settings.xml
b/script.artwork.downloader/resources/settings.xml
index 215892a..c590499 100644
--- a/script.artwork.downloader/resources/settings.xml
+++ b/script.artwork.downloader/resources/settings.xml
@@ -47,6 +47,8 @@
<setting label="32126" type="bool" id="movie_logo"
subsetting="true" enable="eq(-5,true)" default="false"/>
<setting label="32125" type="bool" id="movie_clearart"
subsetting="true" enable="eq(-6,true)" default="true" />
<setting label="32132" type="bool" id="movie_discart"
subsetting="true" enable="eq(-7,true)" default="false"/>
+ <setting label="32123" type="bool" id="movie_banner"
subsetting="true" enable="eq(-8,true)" default="false" />
+ <setting label="32130" type="bool" id="movie_thumb"
subsetting="true" enable="eq(-9,true)" default="false"/>
</category>
<!-- Plugin settings: TV Show section -->
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=eeff22073b18ec41e4dbb0f2e5df2342f1734fd0
-----------------------------------------------------------------------
Summary of changes:
script.artwork.downloader/addon.xml | 2 +-
script.artwork.downloader/changelog.txt | 8 +
.../resources/lib/apply_filters.py | 8 -
.../resources/lib/provider/fanarttv.py | 57 ++++-
.../resources/lib/provider/tmdb.py | 2 +-
.../resources/lib/settings.py | 24 ++-
script.artwork.downloader/resources/settings.xml | 2 +
.../LICENSE.txt | 0
script.module.xbmcswift2/README | 5 +
script.module.xbmcswift2/addon.xml | 9 +
script.module.xbmcswift2/changelog.txt | 14 +
.../lib/xbmcswift2/__init__.py | 73 ++++++
script.module.xbmcswift2/lib/xbmcswift2/cache.py | 178 +++++++++++++
script.module.xbmcswift2/lib/xbmcswift2/common.py | 125 +++++++++
.../lib/xbmcswift2/constants.py | 46 ++++
.../lib/xbmcswift2/ext}/__init__.py | 0
.../lib/xbmcswift2}/ext/playlist.py | 0
.../lib/xbmcswift2/listitem.py | 210 +++++++++++++++
script.module.xbmcswift2/lib/xbmcswift2/logger.py | 96 +++++++
script.module.xbmcswift2/lib/xbmcswift2/module.py | 136 ++++++++++
script.module.xbmcswift2/lib/xbmcswift2/plugin.py | 263 +++++++++++++++++++
script.module.xbmcswift2/lib/xbmcswift2/request.py | 43 +++
script.module.xbmcswift2/lib/xbmcswift2/urls.py | 185 +++++++++++++
.../lib/xbmcswift2/xbmcmixin.py | 270 ++++++++++++++++++++
script.module.xbmcswift2/xbmcswift2_version | 1 +
25 files changed, 1740 insertions(+), 17 deletions(-)
copy {script.module.brightcove => script.module.xbmcswift2}/LICENSE.txt (100%)
create mode 100644 script.module.xbmcswift2/README
create mode 100644 script.module.xbmcswift2/addon.xml
create mode 100644 script.module.xbmcswift2/changelog.txt
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/__init__.py
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/cache.py
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/common.py
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/constants.py
copy {script.artwork.downloader/resources =>
script.module.xbmcswift2/lib/xbmcswift2/ext}/__init__.py (100%)
copy {script.module.xbmcswift/lib/xbmcswift =>
script.module.xbmcswift2/lib/xbmcswift2}/ext/playlist.py (100%)
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/listitem.py
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/logger.py
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/module.py
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/plugin.py
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/request.py
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/urls.py
create mode 100644 script.module.xbmcswift2/lib/xbmcswift2/xbmcmixin.py
create mode 100644 script.module.xbmcswift2/xbmcswift2_version
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
