The branch, frodo has been updated
via ea09a364f6f5bbe1c94c08bea08828a22ce4f784 (commit)
via c423bd15fd35c8ce5a71289296f152039462d128 (commit)
from e760753a0c1644abaa4999e41ce741e08e5fd28f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=ea09a364f6f5bbe1c94c08bea08828a22ce4f784
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=c423bd15fd35c8ce5a71289296f152039462d128
commit c423bd15fd35c8ce5a71289296f152039462d128
Author: Martijn Kaijser <[email protected]>
Date: Thu Jan 2 09:26:40 2014 +0100
[script.module.metahandler] 2.4.0
diff --git a/script.module.metahandler/addon.xml
b/script.module.metahandler/addon.xml
index d779314..06079c4 100644
--- a/script.module.metahandler/addon.xml
+++ b/script.module.metahandler/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.module.metahandler"
name="metahandler"
- version="2.3.1"
+ version="2.4.0"
provider-name="Eldorado">
<requires>
<import addon="xbmc.python" version="2.1.0" />
diff --git a/script.module.metahandler/changelog.txt
b/script.module.metahandler/changelog.txt
index 59f7ba0..28970fc 100644
--- a/script.module.metahandler/changelog.txt
+++ b/script.module.metahandler/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 2.4.0[/B]
+- New TMDB API key
+- Updated calls to TMDB so we only make one request per movie
+
[B]Version 2.3.1[/B]
- Fixed bug on getting tvshows from cache - returns None instead of letting
exception pass
- Re-added db initialization - stupid mistake
diff --git a/script.module.metahandler/lib/metahandler/TMDB.py
b/script.module.metahandler/lib/metahandler/TMDB.py
index 7bd7683..2c8160f 100644
--- a/script.module.metahandler/lib/metahandler/TMDB.py
+++ b/script.module.metahandler/lib/metahandler/TMDB.py
@@ -28,7 +28,7 @@ class TMDB(object):
or if there is data missing on TMDB, another call is made to IMDB to fill
in the missing information.
'''
- def __init__(self, api_key='b91e899ce561dd19695340c3b26e0a02',
view='json', lang='en'):
+ def __init__(self, api_key='af95ef8a4fe1e697f86b8c194f2e5e11',
view='json', lang='en'):
#view = yaml json xml
self.view = view
self.lang = self.__get_language(lang)
@@ -275,9 +275,9 @@ class TMDB(object):
return meta
- def _get_info(self, tmdb_id, q = False):
+ def _get_info(self, tmdb_id, values='', q = False):
''' Helper method to start a TMDB getInfo request '''
- r = self._do_request('movie/'+str(tmdb_id), '')
+ r = self._do_request('movie/'+str(tmdb_id), values)
if q: q.put(r)
return r
@@ -385,22 +385,15 @@ class TMDB(object):
tmdb_id = imdb_id
if tmdb_id:
- #metaQueue = queue.Queue()
- castQueue = queue.Queue()
- trailerQueue = queue.Queue()
- #Thread(target=self._get_info, args=(tmdb_id,metaQueue)).start()
- #meta = metaQueue.get()
-
- #Only grab extra info if initial search returns results
- meta = self._get_info(tmdb_id)
+
+ #Attempt to grab all info in one request
+ meta = self._get_info(tmdb_id, 'append_to_response=casts,trailers')
if meta is None: # fall through to IMDB lookup
meta = {}
- else:
- #Grab extra info on threads
- Thread(target=self._get_cast, args=(tmdb_id,castQueue)).start()
- Thread(target=self._get_trailer,
args=(tmdb_id,trailerQueue)).start()
- cast = castQueue.get()
- trailers = trailerQueue.get()
+ else:
+ #Parse out extra info from request
+ cast = meta['casts']
+ trailers = meta['trailers']
if meta.has_key('poster_path') and meta['poster_path']:
meta['cover_url'] = self.poster_prefix +
meta['poster_path']
-----------------------------------------------------------------------
Summary of changes:
script.module.metahandler/addon.xml | 2 +-
script.module.metahandler/changelog.txt | 4 +
script.module.metahandler/lib/metahandler/TMDB.py | 27 +-
.../LICENSE.txt | 0
script.skinshortcuts/README.txt | 231 +++++
script.skinshortcuts/addon.xml | 18 +
script.skinshortcuts/changelog.txt | 2 +
script.skinshortcuts/default.py | 480 +++++++++++
script.skinshortcuts/fanart.jpg | Bin 0 -> 17407 bytes
script.skinshortcuts/icon.png | Bin 0 -> 41945 bytes
script.skinshortcuts/resources/labelID.txt | 79 ++
.../resources/language/English/strings.po | 163 ++++
script.skinshortcuts/resources/lib/gui.py | 886 ++++++++++++++++++++
.../resources/shortcuts/dvd.shortcuts | 1 +
.../resources/shortcuts/livetv.shortcuts | 1 +
.../resources/shortcuts/mainmenu.shortcuts | 1 +
.../resources/shortcuts/movies.shortcuts | 1 +
.../resources/shortcuts/music.shortcuts | 1 +
.../resources/shortcuts/pictures.shortcuts | 1 +
.../resources/shortcuts/settings.shortcuts | 1 +
.../resources/shortcuts/tvshows.shortcuts | 1 +
.../resources/shortcuts/videos.shortcuts | 1 +
.../skins/Default/720p/script-skinshortcuts.xml | 419 +++++++++
.../resources/skins/Default/media/black.png | Bin 140 -> 140 bytes
.../resources/skins/Default/media/blue.png | Bin 2910 -> 2910 bytes
.../resources/skins/Default/media/grey.png | Bin 2919 -> 2919 bytes
.../skins/Default/media/scroll-down-2.png | Bin 4804 -> 4804 bytes
.../skins/Default/media/scroll-down-focus-2.png | Bin 4483 -> 4483 bytes
.../resources/skins/Default/media/scroll-up-2.png | Bin 4779 -> 4779 bytes
.../skins/Default/media/scroll-up-focus-2.png | Bin 4500 -> 4500 bytes
.../skins/Default/media/scrollbar-back.png | Bin 0 -> 534 bytes
.../Default/media/scrollbar-front-nofocus.png | Bin 0 -> 263 bytes
.../skins/Default/media/scrollbar-front.png | Bin 0 -> 184 bytes
.../skins/Default/media/scrollbar-nib-nofocus.png | Bin 0 -> 305 bytes
.../skins/Default/media/scrollbar-nib.png | Bin 0 -> 310 bytes
35 files changed, 2302 insertions(+), 18 deletions(-)
copy {script.advanced.wol => script.skinshortcuts}/LICENSE.txt (100%)
create mode 100644 script.skinshortcuts/README.txt
create mode 100644 script.skinshortcuts/addon.xml
create mode 100644 script.skinshortcuts/changelog.txt
create mode 100644 script.skinshortcuts/default.py
create mode 100644 script.skinshortcuts/fanart.jpg
create mode 100644 script.skinshortcuts/icon.png
create mode 100644 script.skinshortcuts/resources/labelID.txt
create mode 100644 script.skinshortcuts/resources/language/English/strings.po
create mode 100644 script.skinshortcuts/resources/lib/gui.py
create mode 100644 script.skinshortcuts/resources/shortcuts/dvd.shortcuts
create mode 100644 script.skinshortcuts/resources/shortcuts/livetv.shortcuts
create mode 100644 script.skinshortcuts/resources/shortcuts/mainmenu.shortcuts
create mode 100644 script.skinshortcuts/resources/shortcuts/movies.shortcuts
create mode 100644 script.skinshortcuts/resources/shortcuts/music.shortcuts
create mode 100644 script.skinshortcuts/resources/shortcuts/pictures.shortcuts
create mode 100644 script.skinshortcuts/resources/shortcuts/settings.shortcuts
create mode 100644 script.skinshortcuts/resources/shortcuts/tvshows.shortcuts
create mode 100644 script.skinshortcuts/resources/shortcuts/videos.shortcuts
create mode 100644
script.skinshortcuts/resources/skins/Default/720p/script-skinshortcuts.xml
copy {script.globalsearch =>
script.skinshortcuts}/resources/skins/Default/media/black.png (100%)
copy {script.globalsearch =>
script.skinshortcuts}/resources/skins/Default/media/blue.png (100%)
copy {script.globalsearch =>
script.skinshortcuts}/resources/skins/Default/media/grey.png (100%)
copy {script.globalsearch =>
script.skinshortcuts}/resources/skins/Default/media/scroll-down-2.png (100%)
copy {script.globalsearch =>
script.skinshortcuts}/resources/skins/Default/media/scroll-down-focus-2.png
(100%)
copy {script.globalsearch =>
script.skinshortcuts}/resources/skins/Default/media/scroll-up-2.png (100%)
copy {script.globalsearch =>
script.skinshortcuts}/resources/skins/Default/media/scroll-up-focus-2.png (100%)
create mode 100644
script.skinshortcuts/resources/skins/Default/media/scrollbar-back.png
create mode 100644
script.skinshortcuts/resources/skins/Default/media/scrollbar-front-nofocus.png
create mode 100644
script.skinshortcuts/resources/skins/Default/media/scrollbar-front.png
create mode 100644
script.skinshortcuts/resources/skins/Default/media/scrollbar-nib-nofocus.png
create mode 100644
script.skinshortcuts/resources/skins/Default/media/scrollbar-nib.png
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
