The branch, eden has been updated
via 9a84ba75e78b5f4d22301b8ac0fae979493f4538 (commit)
from 4366e184cd3645fb4d7d0f2343c13e88834ca3ea (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=9a84ba75e78b5f4d22301b8ac0fae979493f4538
commit 9a84ba75e78b5f4d22301b8ac0fae979493f4538
Author: beenje <[email protected]>
Date: Thu Oct 31 21:27:12 2013 +0100
[plugin.video.vgtv] updated to version 1.0.8
diff --git a/plugin.video.vgtv/addon.py b/plugin.video.vgtv/addon.py
old mode 100644
new mode 100755
index 72e7459..c4df90d
--- a/plugin.video.vgtv/addon.py
+++ b/plugin.video.vgtv/addon.py
@@ -21,7 +21,6 @@ from resources.lib.api import VgtvApi
from xbmcswift2 import ListItem
from xbmcswift2 import Plugin
from xbmcswift2 import xbmcgui
-from xbmcswift2 import actions
STRINGS = {
'plugin_name': 30000,
@@ -96,7 +95,7 @@ def show_search_history():
# If we have no items in the search history, open input
if (searches is None or len(searches) == 0):
return input_search()
-
+
# Always start with the "new search"-option
items = [{
'label': _('search') + '...',
@@ -182,7 +181,7 @@ def remove_from_history(query):
searches = history.get('items', [])
searches.remove(query)
history['items'] = searches
-
+
return show_search_history()
diff --git a/plugin.video.vgtv/addon.xml b/plugin.video.vgtv/addon.xml
old mode 100644
new mode 100755
index 4d80b62..a58f876
--- a/plugin.video.vgtv/addon.xml
+++ b/plugin.video.vgtv/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.vgtv" name="VGTV" version="1.0.7" provider-name="Espen
Hovlandsdal">
+<addon id="plugin.video.vgtv" name="VGTV" version="1.0.8" provider-name="Espen
Hovlandsdal">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.xbmcswift2" version="1.1.1"/>
diff --git a/plugin.video.vgtv/changelog.txt b/plugin.video.vgtv/changelog.txt
old mode 100644
new mode 100755
index 0fcdaea..d654f52
--- a/plugin.video.vgtv/changelog.txt
+++ b/plugin.video.vgtv/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.0.8[/B]
+- Fixed crashing caused by protected, unplayable videos
+
[B]1.0.7[/B]
- Introduced search history functionality
- Added durations for videos
diff --git a/plugin.video.vgtv/resources/lib/api.py
b/plugin.video.vgtv/resources/lib/api.py
old mode 100644
new mode 100755
index 230340f..935bb38
--- a/plugin.video.vgtv/resources/lib/api.py
+++ b/plugin.video.vgtv/resources/lib/api.py
@@ -108,7 +108,7 @@ class VgtvApi():
'originaltitle': unescape(meta.get('title') or '???'),
'tagline': unescape(meta.get('preamble') or ''),
'aired': self.get_date(meta.get('timePublished')),
- 'duration': self.get_duration(meta.get('duration'))
+ 'duration': self.get_duration(meta.get('duration', 0))
},
'stream_info': {
'video': {
@@ -146,6 +146,9 @@ class VgtvApi():
elif 'formats' not in video:
self.plugin.log.warning('Formats not in video-response')
return None, None, None, None
+ elif 'http' not in video['formats']:
+ # Can't find any http URL, probably protected
+ return None, None, None, None
# MP4 or m3u8?
if (allow_resolve):
@@ -166,15 +169,15 @@ class VgtvApi():
format = 'mp4'
# Loop through the formats to find the best one
- for format in video['formats']['http'][format]:
+ for currentformat in video['formats']['http'][format]:
# Find the highest bitrate available
- if format['bitrate'] > highest_bitrate:
- highest_bitrate = format['bitrate']
- best_format = format
+ if currentformat['bitrate'] > highest_bitrate:
+ highest_bitrate = currentformat['bitrate']
+ best_format = currentformat
# Thumbs seem to be around ~300px in general
- if format['width'] > 310 and format['width'] < best_thumb['width']:
- best_thumb = format
+ if currentformat['width'] > 310 and currentformat['width'] <
best_thumb['width']:
+ best_thumb = currentformat
# Fall back if something failed
if best_format is None:
-----------------------------------------------------------------------
Summary of changes:
plugin.video.vgtv/addon.py | 5 ++---
plugin.video.vgtv/addon.xml | 2 +-
plugin.video.vgtv/changelog.txt | 3 +++
plugin.video.vgtv/resources/lib/api.py | 17 ++++++++++-------
4 files changed, 16 insertions(+), 11 deletions(-)
mode change 100644 => 100755 plugin.video.vgtv/addon.py
mode change 100644 => 100755 plugin.video.vgtv/addon.xml
mode change 100644 => 100755 plugin.video.vgtv/changelog.txt
mode change 100644 => 100755 plugin.video.vgtv/resources/lib/api.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
