The branch, frodo has been updated
via 90677e9c6c1cc26a0c15ac3d7acaa2ae23534fc7 (commit)
via ebb6549c16c6f3ef3d9218611728a8f5078744ea (commit)
from ef9040adb87a1d6438d5b715d365425d655b15e1 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=90677e9c6c1cc26a0c15ac3d7acaa2ae23534fc7
commit 90677e9c6c1cc26a0c15ac3d7acaa2ae23534fc7
Author: Martijn Kaijser <[email protected]>
Date: Sat Jun 14 12:38:14 2014 +0200
[plugin.video.nederland24] 4.1.4
diff --git a/plugin.video.nederland24/addon.xml
b/plugin.video.nederland24/addon.xml
index e5ad850..b41da19 100644
--- a/plugin.video.nederland24/addon.xml
+++ b/plugin.video.nederland24/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.nederland24" name="Nederland 24" version="4.1.0"
provider-name="bosel">
+<addon id="plugin.video.nederland24" name="Nederland 24" version="4.1.4"
provider-name="bosel">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
diff --git a/plugin.video.nederland24/changelog.txt
b/plugin.video.nederland24/changelog.txt
index c46b619..93eea96 100644
--- a/plugin.video.nederland24/changelog.txt
+++ b/plugin.video.nederland24/changelog.txt
@@ -1,7 +1,9 @@
+[B]4.1.4 - Gotham[/B]
+-fix livestream referrer
+
[B]4.1.0 - Gotham[/B]
-Reworked additional channels
-
[B]4.0.0 - Frodo[/B]
-substantial changes due to website alterations
-additional channels
diff --git a/plugin.video.nederland24/nederland24.py
b/plugin.video.nederland24/nederland24.py
index 5fdca7f..f3011e8 100644
--- a/plugin.video.nederland24/nederland24.py
+++ b/plugin.video.nederland24/nederland24.py
@@ -39,6 +39,7 @@ IMG_DIR =
os.path.join(settings.getAddonInfo("path"),"resources", "media")
API_URL = 'http://ida.omroep.nl/aapi/?stream='
BASE_URL = 'http://livestreams.omroep.nl/live/npo/'
USER_AGENT = 'Mozilla/5.0 (iPad; CPU OS 7_0 like Mac OS X)
AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465
Safari/9537.53'
+REF_URL = 'http://www.npo.nl'
CHANNELS = [
@@ -144,6 +145,7 @@ def playVideo(url):
URL=API_URL+BASE_URL+media
req = urllib2.Request(URL)
req.add_header('User-Agent', USER_AGENT)
+ req.add_header('Referer', REF_URL)
response = urllib2.urlopen(req)
page = response.read()
response.close()
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=ebb6549c16c6f3ef3d9218611728a8f5078744ea
commit ebb6549c16c6f3ef3d9218611728a8f5078744ea
Author: Martijn Kaijser <[email protected]>
Date: Sat Jun 14 12:35:59 2014 +0200
[plugin.video.spiegelonline] 1.2.2
diff --git a/plugin.video.spiegelonline/addon.xml
b/plugin.video.spiegelonline/addon.xml
index 118e500..216db2c 100644
--- a/plugin.video.spiegelonline/addon.xml
+++ b/plugin.video.spiegelonline/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.spiegelonline" name="Spiegel Online" version="1.2.1"
provider-name="cdwertmann (credits to peterpanzki and mad-max for previous
versions">
+<addon id="plugin.video.spiegelonline" name="Spiegel Online" version="1.2.2"
provider-name="cdwertmann (credits to peterpanzki and mad-max for previous
versions">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
diff --git a/plugin.video.spiegelonline/changelog.txt
b/plugin.video.spiegelonline/changelog.txt
index fc2583e..daeaff7 100644
--- a/plugin.video.spiegelonline/changelog.txt
+++ b/plugin.video.spiegelonline/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.2.2[/B]
+
+- Detects when a video has been deleted
+
[B]Version 1.2.1[/B]
- Detects when a HD stream is unavailable
diff --git a/plugin.video.spiegelonline/default.py
b/plugin.video.spiegelonline/default.py
index b79da96..789e782 100644
--- a/plugin.video.spiegelonline/default.py
+++ b/plugin.video.spiegelonline/default.py
@@ -9,7 +9,9 @@ SITE =
"http://www1.spiegel.de/active/playlist/fcgi/playlist.fcgi/asset=flashvid
VIDS = 20
VIDS_PER_SITE = "/count=" + str(VIDS) + "/"
BASEURL="http://video.spiegel.de/flash/";
+PLUGIN_NAME="plugin.video.spiegelonline"
handle = int(sys.argv[1])
+
__addon__ = xbmcaddon.Addon()
__language__ = __addon__.getLocalizedString
items = []
@@ -27,6 +29,7 @@ def show_root_menu():
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
def show_cat_menu(cat, vnr):
+ xbmcplugin.setContent(handle, "episodes")
content = getUrl(SITE + (urllib.unquote_plus(cat)) + VIDS_PER_SITE +
"start=" + vnr)
match = re.compile('<listitem>(.+?)</listitem>',re.DOTALL).findall(content)
for m in match:
@@ -35,8 +38,8 @@ def show_cat_menu(cat, vnr):
name=convert_to_UTF8(name)
headline=convert_to_UTF8(headline)
teaser=convert_to_UTF8(teaser)
- liStyle=xbmcgui.ListItem((name + " - " + headline),
iconImage="default.png", thumbnailImage=pic)
- liStyle.setInfo( type="Video", infoLabels={ "Title": name,
"plotoutline": headline, "plot": teaser, "date": date})
+ liStyle=xbmcgui.ListItem(label=(name + " - " + headline),
iconImage="default.png", thumbnailImage=pic)
+ liStyle.setInfo( type="Video", infoLabels={ "Title": name,
"plotoutline": headline, "plot": teaser, "aired": date})
liStyle.addStreamInfo('video', {'duration': getSeconds(playtime)})
items.append({'vid': vid, "li" :liStyle})
threads = []
@@ -48,16 +51,25 @@ def show_cat_menu(cat, vnr):
for t in threads:
t.join()
for i in items:
- addLinkItem(i['url'],i['li'])
+ if i['url'] != BASEURL:
+ addLinkItem(i['url'],i['li'])
+ #xbmc.log(str(SITE + cat + VIDS_PER_SITE + "start=" + str(int(vnr) +
VIDS)), level=xbmc.LOGERROR)
content = getUrl(SITE + cat + VIDS_PER_SITE + "start=" + str(int(vnr) +
VIDS))
match = re.compile('<listitem>(.+?)</listitem>',re.DOTALL).findall(content)
if len(match) > 0:
addDirectoryItem(__addon__.getLocalizedString(30001), {"cat": cat,
"site": str(int(vnr) + VIDS)})
addDirectoryItem(__addon__.getLocalizedString(30002),{"cat": "main"})
xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
+ xbmc.executebuiltin('Container.SetViewMode(504)')
def getVideo(id):
- content = getUrl(BASEURL + id + ".xml")
+ content = None
+ url = BASEURL + id + ".xml"
+ try:
+ content = getUrl(url)
+ except Exception:
+ xbmc.log(PLUGIN_NAME + ": Video not found: "+ str(url),
level=xbmc.LOGNOTICE)
+ return ""
match = re.compile('<type(.+?)</type',re.DOTALL).findall(content)
filename = ""
streams = []
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nederland24/addon.xml | 2 +-
plugin.video.nederland24/changelog.txt | 4 +++-
plugin.video.nederland24/nederland24.py | 2 ++
plugin.video.spiegelonline/addon.xml | 2 +-
plugin.video.spiegelonline/changelog.txt | 4 ++++
plugin.video.spiegelonline/default.py | 20 ++++++++++++++++----
6 files changed, 27 insertions(+), 7 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
