Fix Kodi support and work around some Giant Bomb bustedness

jimporter · Dec 28, 2014 · 083c383 · 083c383
1 parent 011e9b7
commit 083c383
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 XBMC_PROFILE?=$(HOME)/.xbmc
 ADDON_NAME=plugin.video.giantbomb
+ADDON_VERSION=4.1.1
 ADDON_INSTALL_DIR=$(XBMC_PROFILE)/addons/$(ADDON_NAME)
 
 .PHONY: uninstall-dev
@@ -12,7 +13,7 @@ install-dev: uninstall-dev
 
 .PHONY: package
 package:
-	zip $(ADDON_NAME).zip $(ADDON_NAME)
+	zip -r $(ADDON_NAME)-$(ADDON_VERSION).zip $(ADDON_NAME)
 
 .PHONY: test
 test:

diff --git a/plugin.video.giantbomb/addon.xml b/plugin.video.giantbomb/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.giantbomb"
        name="Giant Bomb"
-       version="4.0.0"
+       version="4.1.1"
        provider-name="Jim">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>

diff --git a/plugin.video.giantbomb/changelog.txt b/plugin.video.giantbomb/changelog.txt
@@ -1,3 +1,9 @@
+[B]4.1.1[/B]
+- Fix support for Kodi 14
+
+[B]4.1.0[/B]
+- Show watch history for videos
+
 [B]4.0.0[/B]
 - Display more metadata for videos
 - Add podcast support

diff --git a/plugin.video.giantbomb/default.py b/plugin.video.giantbomb/default.py
@@ -173,10 +173,18 @@ def list_videos(data, page, plugin_params=None):
             # XXX: This assumes the URL already has a query string!
             remote_url += '&' + urllib.urlencode({ 'api_key': gb.api_key })
 
+        # XXX: Work around https URLs in the Latest videos section
+        remote_url = re.sub(r'^https:', 'http:', remote_url)
+
         fileid = videodb.get_file_id(remote_url)
         name = video['name']
         date = time.strptime(video['publish_date'], '%Y-%m-%d %H:%M:%S')
 
+        # XXX: Work around broken thumbnail URLs in the Latest videos section
+        thumb = video['image']['super_url']
+        if thumb[0] == '/':
+            thumb = 'http://static.giantbomb.com' + thumb
+
         li = xbmcgui.ListItem(name, iconImage='DefaultVideo.png',
                               thumbnailImage=video['image']['super_url'])
         li.setInfo('video', infoLabels={

diff --git a/plugin.video.giantbomb/resources/lib/videodb.py b/plugin.video.giantbomb/resources/lib/videodb.py
@@ -17,6 +17,8 @@ def __init__(self, path=None):
                 path = 'special://profile/Database/MyVideos75.db'
             elif xbmc.__version__ == '2.14.0':
                 path = 'special://profile/Database/MyVideos78.db'
+            elif xbmc.__version__ == '2.19.0':
+                path = 'special://profile/Database/MyVideos90.db'
             else:
                 raise Exception('Unknown XBMC Python version: ' +
                                 xbmc.__version__)