The branch, eden has been updated
via c49f1bd9398c83feb5ff246d01e7c659b7602ed2 (commit)
via 61a8a622c7d71250c36c7185bf23737347b59eb6 (commit)
from e1f33f28087913b092c14769d8c96887c270dced (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c49f1bd9398c83feb5ff246d01e7c659b7602ed2
commit c49f1bd9398c83feb5ff246d01e7c659b7602ed2
Author: beenje <[email protected]>
Date: Tue Aug 6 21:01:18 2013 +0200
[plugin.video.gametest.dk] updated to version 2.0.1
diff --git a/plugin.video.gametest.dk/addon.py
b/plugin.video.gametest.dk/addon.py
index 704c7f4..7b3eddb 100644
--- a/plugin.video.gametest.dk/addon.py
+++ b/plugin.video.gametest.dk/addon.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2011 Tommy Winther
+# Copyright (C) 2013 Tommy Winther
# http://tommy.winther.nu
#
# This Program is free software; you can redistribute it and/or modify
@@ -21,7 +21,6 @@ import re
import os
import sys
import urllib2
-import urlparse
import buggalo
import xbmcgui
@@ -29,129 +28,40 @@ import xbmcaddon
import xbmcplugin
BASE_URL = 'http://www.gametest.dk/'
-FLV_URL = BASE_URL + 'gametesttest/reviews/%s/%s.flv'
-REVIEWS_URL = BASE_URL + 'index.php?anmeldelser=alle'
-PAGE_URL = BASE_URL + 'index.php?page=%s'
+PLAY_VIDEO_PATH = 'plugin://plugin.video.youtube/?action=play_video&videoid=%s'
+PLAYLIST_PATH =
'plugin://plugin.video.youtube/?channel=gametestforever&path=%2froot%2fsubscriptions&user_feed=uploads'
-CATEGORIES = [
- {'title' : 30010, 'params' : 'reviews=1'},
- {'title' : 30011, 'params' : 'retro=1'},
- {'title' : 30012, 'params' : 'stunts=1'},
-]
-class Gametest(object):
+class GameTest(object):
def showOverview(self):
- html = self.downloadUrl(BASE_URL)
- infoLabels = dict()
+ u = urllib2.urlopen(BASE_URL)
+ html = u.read()
+ u.close()
- # Latest show
- m = re.search('Sendt den ([^<]+)?.*?<ul>(.*?)</ul>', html, re.DOTALL)
+ m = re.search('http://www.youtube.com/embed/([^"]+)"', html, re.DOTALL)
if m:
- date = m.group(1)
- if date:
- date = m.group(1).replace('-', '.')
- infoLabels['title'] = ADDON.getLocalizedString(30000) + ': ' +
date
- infoLabels['date'] = date
- else:
- infoLabels['title'] = ADDON.getLocalizedString(30000)
- infoLabels['plot'] = m.group(2).replace('<li>',
'').replace('</li>', '\n')
- else:
- infoLabels['title'] = ADDON.getLocalizedString(30000)
-
- item = xbmcgui.ListItem(infoLabels['title'], iconImage = ICON)
- item.setProperty('Fanart_Image', FANART)
- item.setInfo('video', infoLabels)
- url = FLV_URL % ('file', 'Programmet')
- xbmcplugin.addDirectoryItem(HANDLE, url, item)
-
- # Categories
- for idx, c in enumerate(CATEGORIES):
- item = xbmcgui.ListItem(ADDON.getLocalizedString(c['title']),
iconImage = ICON)
+ videoId = m.group(1)
+ item = xbmcgui.ListItem(ADDON.getLocalizedString(30000),
iconImage=ICON)
item.setProperty('Fanart_Image', FANART)
- url = PATH + '?' + c['params']
- xbmcplugin.addDirectoryItem(HANDLE, url, item, True)
-
- xbmcplugin.setContent(HANDLE, 'episodes')
- xbmcplugin.endOfDirectory(HANDLE)
+ item.setProperty("IsPlayable", "true")
+ xbmcplugin.addDirectoryItem(HANDLE, PLAY_VIDEO_PATH % videoId,
item)
- def showReviews(self):
- html = self.downloadUrl(REVIEWS_URL)
-
- for m in re.finditer("index.php\?play=(.*?)&type=anmeldelse'><img
src=' (.*?)'.*?anmeldelse'>(.*?)</a>.*?af: (.*?)</a>(.*?)time'>(.*?)</p>",
html, re.DOTALL):
- slug = m.group(1)
- icon = m.group(2)
- title = m.group(3)
- author = m.group(4)
- rating = m.group(5).count('good.png')
- date = m.group(6)
-
- item = xbmcgui.ListItem(title, iconImage = BASE_URL + icon)
+ item = xbmcgui.ListItem(ADDON.getLocalizedString(30001),
iconImage=ICON)
item.setProperty('Fanart_Image', FANART)
- item.setInfo('video', {
- 'title' : title,
- 'date' : date.replace('-', '.'),
- 'year' : int(date[6:]),
- 'credits' : author,
- 'plot' : title,
- 'rating' : rating
- })
- url = FLV_URL % ('file', slug)
- xbmcplugin.addDirectoryItem(HANDLE, url, item)
+ xbmcplugin.addDirectoryItem(HANDLE, PLAYLIST_PATH, item, True)
- xbmcplugin.setContent(HANDLE, 'episodes')
- xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_DATE)
xbmcplugin.endOfDirectory(HANDLE)
- def showPage(self, page):
- html = self.downloadUrl(PAGE_URL % page)
-
- for m in re.finditer("index.php\?play=(.*?)&type=.*?src=[ \"](.*?)[
\"](.*?<b>(.*?)</b>.*?af:.*?>(.*?)</a>)?", html, re.DOTALL):
- slug = m.group(1)
- icon = m.group(2)
- title = m.group(4)
- author = m.group(5)
-
- item = xbmcgui.ListItem(title, iconImage = BASE_URL + icon)
- item.setProperty('Fanart_Image', FANART)
- item.setInfo('video', {
- 'title' : title,
- 'credits' : author,
- 'plot' : title
- })
-
- url = FLV_URL % ('stunts', slug)
- xbmcplugin.addDirectoryItem(HANDLE, url, item)
-
- xbmcplugin.setContent(HANDLE, 'episodes')
- xbmcplugin.addSortMethod(HANDLE, xbmcplugin.SORT_METHOD_LABEL)
- xbmcplugin.endOfDirectory(HANDLE)
-
- def downloadUrl(self, url):
- u = urllib2.urlopen(url)
- data = u.read()
- u.close()
- return data
-
-
if __name__ == '__main__':
ADDON = xbmcaddon.Addon()
- PATH = sys.argv[0]
HANDLE = int(sys.argv[1])
- PARAMS = urlparse.parse_qs(sys.argv[2][1:])
ICON = os.path.join(ADDON.getAddonInfo('path'), 'icon.png')
FANART = os.path.join(ADDON.getAddonInfo('path'), 'fanart.jpg')
- gt = Gametest()
+ gt = GameTest()
try:
- if PARAMS.has_key('reviews'):
- gt.showReviews()
- elif PARAMS.has_key('retro'):
- gt.showPage('retro')
- elif PARAMS.has_key('stunts'):
- gt.showPage('stunts')
- else:
- gt.showOverview()
- except Exception:
+ gt.showOverview()
+ except:
buggalo.onExceptionRaised()
diff --git a/plugin.video.gametest.dk/addon.xml
b/plugin.video.gametest.dk/addon.xml
index 329a8dc..92530c4 100644
--- a/plugin.video.gametest.dk/addon.xml
+++ b/plugin.video.gametest.dk/addon.xml
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon
- id="plugin.video.gametest.dk"
- version="2.0.0"
- name="Gametest"
- provider-name="twinther [[email protected]]">
+<addon id="plugin.video.gametest.dk" version="2.0.1" name="Gametest"
provider-name="twinther">
<requires>
<import addon="xbmc.python" version="2.0"/>
+ <import addon="script.module.buggalo" version="1.1.2"/>
+ <import addon="plugin.video.youtube" version="3.0.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="addon.py">
<provides>video</provides>
@@ -16,6 +14,10 @@
<description lang="en">Gametest is an independent, non-profit
game magazine, run by enthusiasts.[CR][CR]If you have comments or suggestions
for this addon, please feel free to participate in the debate on my blog at
http://tommy.winther.nu</description>
<description lang="da">Gametest er et uafhængigt, profitløst
spilmagasin, drevet af ildsjæle. Vi brænder for spil, og for at guide dig
igennem den store, indviklede spiljungle.[CR][CR]Har du kommentarer, ris eller
ros til denne addon er du velkommen til at deltage i debatten på min blog på
http://tommy.winther.nu</description>
<license>GPL 2.0</license>
- <platform>all</platform>
+ <platform>all</platform>
+ <email>[email protected]</email>
+ <website>http://tommy.winther.nu</website>
+
<source>https://github.com/xbmc-danish-addons/plugin.video.gametest.dk</source>
+ <language>da</language>
</extension>
</addon>
diff --git a/plugin.video.gametest.dk/changelog.txt
b/plugin.video.gametest.dk/changelog.txt
index e8fec2f..d514e92 100644
--- a/plugin.video.gametest.dk/changelog.txt
+++ b/plugin.video.gametest.dk/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 2.0.1 - 2013-08-03[/B]
+- Merged changes from Frodo branch
+
[B]Version 2.0.0 - 2011-12-28[/B]
- Fixed problem with parsing date of latest show resulting in a script error
- Improved error handling with option for the user to submit exceptions/bugs
diff --git a/plugin.video.gametest.dk/resources/language/Danish/strings.xml
b/plugin.video.gametest.dk/resources/language/Danish/strings.xml
index 695c427..2e91d91 100644
--- a/plugin.video.gametest.dk/resources/language/Danish/strings.xml
+++ b/plugin.video.gametest.dk/resources/language/Danish/strings.xml
@@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Seneste udsendelse</string>
- <string id="30001">Spil testet:</string>
-
- <string id="30010">Anmeldelser</string>
- <string id="30011">Retro</string>
- <string id="30012">Stunts</string>
-
- <string id="99980">Game over, man! [I]Game over![/I]</string>
- <string id="99981">You can't handle the truth!</string>
- <string id="99982">Danger Will Robinson</string>
- <string id="99983">Why does it cry, Sméagol?</string>
- <string id="99984">Houston, we have a problem...</string>
- <string id="99985">E.T. phone home</string>
-
- <string id="99990">Der er desværre opstået en fejl i addon'en.</string>
- <string id="99991">Du kan hjælpe med at løse fejlen ved at indsende
en</string>
- <string id="99992">fejlrapport. Der sendes ikke personlige
oplysninger.</string>
- <string id="99993">Indsend fejlrapport</string>
- <string id="99994">Indsend ikke</string>
- <string id="99995">Tak!</string>
+ <string id="30001">Spillelister</string>
</strings>
diff --git a/plugin.video.gametest.dk/resources/language/English/strings.xml
b/plugin.video.gametest.dk/resources/language/English/strings.xml
index 569eee3..6c129ed 100644
--- a/plugin.video.gametest.dk/resources/language/English/strings.xml
+++ b/plugin.video.gametest.dk/resources/language/English/strings.xml
@@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Latest show</string>
- <string id="30001">Games tested:</string>
-
- <string id="30010">Reviews</string>
- <string id="30011">Retro</string>
- <string id="30012">Stunts</string>
-
- <string id="99980">Game over, man! [I]Game over![/I]</string>
- <string id="99981">You can't handle the truth!</string>
- <string id="99982">Danger Will Robinson</string>
- <string id="99983">Why does it cry, Sméagol?</string>
- <string id="99984">Houston, we have a problem...</string>
- <string id="99985">E.T. phone home</string>
-
- <string id="99990">Unfortunately an error occurred in the addon.</string>
- <string id="99991">You can help with fixing the problem by
submitting</string>
- <string id="99992">an error report. No personal information is
sent.</string>
- <string id="99993">Submit error report</string>
- <string id="99994">Don't submit</string>
- <string id="99995">Thank you!</string>
+ <string id="30001">Playlists</string>
</strings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=61a8a622c7d71250c36c7185bf23737347b59eb6
commit 61a8a622c7d71250c36c7185bf23737347b59eb6
Author: beenje <[email protected]>
Date: Tue Aug 6 21:01:09 2013 +0200
[plugin.video.drnu] updated to version 2.1.11
diff --git a/plugin.video.drnu/addon.py b/plugin.video.drnu/addon.py
index 28e1c7d..c8dcaa1 100644
--- a/plugin.video.drnu/addon.py
+++ b/plugin.video.drnu/addon.py
@@ -375,9 +375,9 @@ class NuAddon(object):
if ADDON.getSetting('show.stream.selector') == 'true':
json = self.api._call_api(video['videoResourceUrl'])
options = []
- links = sorted(json['links'], key=lambda link:
link['bitrateKbps'], reverse=True)
+ links = sorted(json['links'], key=lambda link: link['bitrateKbps']
if 'bitrateKbps' in link else 0, reverse=True)
for link in links:
- options.append('%s (%s kbps)' % (link['linkType'],
link['bitrateKbps']))
+ options.append('%s (%s kbps)' % (link['linkType'],
link['bitrateKbps'] if 'bitrateKbps' in link else '?'))
d = xbmcgui.Dialog()
idx = d.select(video['title'], options)
@@ -389,11 +389,11 @@ class NuAddon(object):
else:
rtmpUrl = self.api._http_request(video['videoManifestUrl'])
- if rtmpUrl[0:7] == '<script':
+ m = re.search('(rtmp://vod.dr.dk/cms)/([^\?]+)(\?.*)', rtmpUrl)
+ if rtmpUrl[0:7] == '<script' or m is None:
d = xbmcgui.Dialog()
d.ok(ADDON.getLocalizedString(30100),
ADDON.getLocalizedString(30101), ADDON.getLocalizedString(30102))
else:
- m = re.search('(rtmp://vod.dr.dk/cms)/([^\?]+)(\?.*)', rtmpUrl)
rtmpUrl = m.group(1) + m.group(3)
rtmpUrl += ' playpath=' + m.group(2) + m.group(3)
rtmpUrl += ' app=cms' + m.group(3)
diff --git a/plugin.video.drnu/addon.xml b/plugin.video.drnu/addon.xml
index 6ec0a6c..ea96141 100644
--- a/plugin.video.drnu/addon.xml
+++ b/plugin.video.drnu/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.drnu" version="2.1.10" name="DR NU Player"
provider-name="twinther [[email protected]]">
+<addon id="plugin.video.drnu" version="2.1.11" name="DR NU Player"
provider-name="twinther [[email protected]]">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/plugin.video.drnu/changelog.txt b/plugin.video.drnu/changelog.txt
index c46d10a..a4f8801 100644
--- a/plugin.video.drnu/changelog.txt
+++ b/plugin.video.drnu/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 2.1.11 - 2013-08-03[/B]
+- Improved handling of invalid URL's
+- Fixed problem with display of chapters in some cases
+
[B]Version 2.1.10 - 2013-03-22[/B]
- Reconstruct rtmp:// url to fix playback problems
-----------------------------------------------------------------------
Summary of changes:
plugin.video.drnu/addon.py | 8 +-
plugin.video.drnu/addon.xml | 2 +-
plugin.video.drnu/changelog.txt | 4 +
plugin.video.gametest.dk/addon.py | 124 +++-----------------
plugin.video.gametest.dk/addon.xml | 14 ++-
plugin.video.gametest.dk/buggalo.py | 102 ----------------
plugin.video.gametest.dk/changelog.txt | 3 +
.../resources/language/Danish/strings.xml | 20 +---
.../resources/language/English/strings.xml | 20 +---
9 files changed, 39 insertions(+), 258 deletions(-)
delete mode 100644 plugin.video.gametest.dk/buggalo.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
