The branch, frodo has been updated
via 2d8be81e8845569a2cfc8435ad2394b14c06987a (commit)
via 3f77c3f0cef20f227e41588241e539d2b5457422 (commit)
via 05d30c50322fa8e3a25156673b79c909da62c5e3 (commit)
from bb2ca769eb58a7666e16f469c0338946a54ede45 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2d8be81e8845569a2cfc8435ad2394b14c06987a
commit 2d8be81e8845569a2cfc8435ad2394b14c06987a
Author: beenje <[email protected]>
Date: Sun Nov 3 21:54:13 2013 +0100
[plugin.audio.groove] updated to version 2.0.5
diff --git a/plugin.audio.groove/addon.xml b/plugin.audio.groove/addon.xml
index a45509e..20e7987 100644
--- a/plugin.audio.groove/addon.xml
+++ b/plugin.audio.groove/addon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.audio.groove" name="Grooveshark XBMC"
- version="2.0.4" provider-name="Stephen Denham">
+ version="2.0.5" provider-name="Stephen Denham">
<requires>
<import addon="xbmc.python" version="2.1.0" />
<import addon="script.module.simplejson"/>
diff --git a/plugin.audio.groove/changelog.txt
b/plugin.audio.groove/changelog.txt
index d072a27..194bb0c 100644
--- a/plugin.audio.groove/changelog.txt
+++ b/plugin.audio.groove/changelog.txt
@@ -1,6 +1,10 @@
+2.0.5
+
+Fix add to playlist.
+
2.0.4
-Fix character encodings.
+Fix character encodings and album name.
2.0.3
diff --git a/plugin.audio.groove/default.py b/plugin.audio.groove/default.py
index c2cd794..4e83777 100644
--- a/plugin.audio.groove/default.py
+++ b/plugin.audio.groove/default.py
@@ -144,7 +144,8 @@ class GroovesharkPlaylistSelect(xbmcgui.WindowDialog):
self.imgBg = xbmcgui.ControlImage(x+gap, 5*gap+y, w-2*gap, h-5*gap,
listBackground)
self.addControl(self.imgBg)
- self.playlistControl = xbmcgui.ControlList(2*gap+x, y+3*gap+30,
w-4*gap, h-10*gap, textColor='0xFFFFFFFF', selectedColor='0xFFFF4242',
itemTextYOffset=0, itemHeight=50, alignmentY = 0)
+ self.playlistControl = xbmcgui.ControlList(2*gap+x, y+3*gap+30,
w-4*gap, h-10*gap, textColor='0xFFFFFFFF', selectedColor='0xFFFF4242')
+ self.playlistControl.setItemHeight(50)
self.addControl(self.playlistControl)
self.lastPos = 0
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3f77c3f0cef20f227e41588241e539d2b5457422
commit 3f77c3f0cef20f227e41588241e539d2b5457422
Author: beenje <[email protected]>
Date: Sun Nov 3 21:53:31 2013 +0100
[plugin.video.mediathek] updated to version 0.5.9
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index f39190f..7d55a18 100644
--- a/plugin.video.mediathek/addon.xml
+++ b/plugin.video.mediathek/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.mediathek"
- version="0.5.8"
+ version="0.5.9"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 797fe7f..5c302f7 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.5.9 - FIX: adopt NDR infrastructure change (by dethfee)
0.5.8 - FIX: adopt NDR link change (by Toerless Eckert)
0.5.7 - CHG: Temporaily disable BR, BR Alpha
FIX: 3Sat offers webem, will used as fallback
diff --git a/plugin.video.mediathek/mediathek/ndr.py
b/plugin.video.mediathek/mediathek/ndr.py
index a9ad371..04c3bb8 100644
--- a/plugin.video.mediathek/mediathek/ndr.py
+++ b/plugin.video.mediathek/mediathek/ndr.py
@@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import re, datetime, time, calendar
-import pprint
from mediathek import *
from xml.dom import minidom;
@@ -55,23 +54,22 @@ class NDRMediathek(Mediathek):
#self.rtmpBaseLink =
"rtmpt://ndr.fcod.llnwd.net/a3715/d1/flashmedia/streams/ndr/";
- self.rtmpBaseLink =
"rtmp://cp160844.edgefcs.net/ondemand/flashmedia/streams/ndr/";
+ self.rtmpBaseLink = "rtmp://cp160844.edgefcs.net/ondemand/ndr/";
#self.mmsBaseLink = "mms://ndr.wmod.llnwd.net/a3715/d1/msmedia/";
- self.mmsBaseLink =
"mms://a874.v1608102.c160810.g.vm.akamaistream.net/7/874/160810/v0001/wm.origin.ndr.gl-systemhaus.de/msmedia/";
+ #self.mmsBaseLink =
"mms://a874.v1608102.c160810.g.vm.akamaistream.net/7/874/160810/v0001/wm.origin.ndr.gl-systemhaus.de/msmedia/";
self.httpBaseLink = "http://media.ndr.de/progressive/";;
#Hauptmenue
tmp_menu = []
- broadcastsLink = self.menuLink+"broadcasts.xml"
- broadcastsLinkPage = self.loadConfigXml(broadcastsLink);
+ extractBroadcasts = re.compile("<a
href=\"/mediathek/mediatheksuche103_broadcast-(.*?).html\">(.*?)</a>");
+ htmlPage =
self.loadPage("http://www.ndr.de/mediathek/dropdown101-extapponly.html";)
- menuNodes = broadcastsLinkPage.getElementsByTagName("broadcast");
displayObjects = [];
x = 0
- for menuNode in menuNodes:
- menuId = menuNode.getAttribute('id')
- menuItem = unicode(menuNode.firstChild.data)
+ for menuNode in extractBroadcasts.finditer(htmlPage):
+ menuId = menuNode.group(1)
+ menuItem = menuNode.group(2)
menuLink =
self.rootLink+"/mediatheksuche105_broadcast-"+menuId+"_format-video_page-1.html"
tmp_menu.append(TreeNode("0."+str(x),menuItem,menuLink,True));
x = x+1
@@ -259,10 +257,10 @@ class NDRMediathek(Mediathek):
link[0] = self.httpBaseLink+videoInfo+"lo.mp4";
link[1] = self.httpBaseLink+videoInfo+"hi.mp4";
link[2] = self.httpBaseLink+videoInfo+"hq.mp4";
- elif self.baseType == "mms":
- link[0] = self.mmsBaseLink+videoInfo+"wm.lo.wmv";
- link[1] = self.mmsBaseLink+videoInfo+"wm.hi.wmv";
- link[2] = self.mmsBaseLink+videoInfo+"wm.hq.wmv";
+ #elif self.baseType == "mms":
+ # link[0] = self.mmsBaseLink+videoInfo+"wm.lo.wmv";
+ # link[1] = self.mmsBaseLink+videoInfo+"wm.hi.wmv";
+ # link[2] = self.mmsBaseLink+videoInfo+"wm.hq.wmv";
else:
link[0] = self.rtmpBaseLink+videoInfo+"lo.mp4";
link[1] = self.rtmpBaseLink+videoInfo+"hi.mp4";
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=05d30c50322fa8e3a25156673b79c909da62c5e3
commit 05d30c50322fa8e3a25156673b79c909da62c5e3
Author: beenje <[email protected]>
Date: Sun Nov 3 21:53:30 2013 +0100
[plugin.video.nrk] updated to version 4.4.13
diff --git a/plugin.video.nrk/addon.xml b/plugin.video.nrk/addon.xml
index a94fac4..4d84f42 100644
--- a/plugin.video.nrk/addon.xml
+++ b/plugin.video.nrk/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nrk"
name="NRK Nett-TV"
- version="4.4.12"
+ version="4.4.13"
provider-name="takoi">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.nrk/changelog.txt b/plugin.video.nrk/changelog.txt
index bad367d..340ef34 100644
--- a/plugin.video.nrk/changelog.txt
+++ b/plugin.video.nrk/changelog.txt
@@ -1,3 +1,6 @@
+[B]4.4.13[/B]
+- Sideendringer
+
[B]4.4.12[/B]
- Fikset &-tegn i undertekster
- Barnekategorien er nå tilgjengelig igjen
diff --git a/plugin.video.nrk/data.py b/plugin.video.nrk/data.py
index ccf2a13..b127a0b 100644
--- a/plugin.video.nrk/data.py
+++ b/plugin.video.nrk/data.py
@@ -124,7 +124,7 @@ def get_episodes(series_id, season_id):
""" returns: </serie/aktuelt-tv/nnfa50051612/16-05-2012..> """
url = "http://tv.nrk.no/program/Episodes/%s/%s"; % (series_id, season_id)
html = xhrsession.get(url).text
- trs = parseDOM(html, 'tr', {'class':'has-programtooltip episode-row js-click
*'})
+ trs = parseDOM(html, 'tr', {'class':'[^"\']*episode-row js-click *'})
titles = [ parseDOM(tr, 'a', {'class':'p-link'})[0] for tr in trs ]
titles = map(html_decode, titles)
ids = [ parseDOM(tr, 'a', {'class':'p-link'}, ret='href')[0] for tr in trs ]
@@ -137,8 +137,8 @@ def get_episodes(series_id, season_id):
def get_media_url(video_id, bitrate):
bitrate = 4 if bitrate > 4 else bitrate
- url = "http://nrk.no/serum/api/video/%s"; % video_id
- url = _get_cached_json(url, 'mediaURL')
+ url = "http://v7.psapi.nrk.no/mediaelement/%s"; % video_id
+ url = _get_cached_json(url, 'mediaUrl')
url = url.replace('/z/', '/i/', 1)
url = url.rsplit('/', 1)[0]
url = url + '/index_%s_av.m3u8' % bitrate
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.groove/addon.xml | 2 +-
plugin.audio.groove/changelog.txt | 6 +++++-
plugin.audio.groove/default.py | 3 ++-
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/mediathek/ndr.py | 24 +++++++++++-------------
plugin.video.nrk/addon.xml | 2 +-
plugin.video.nrk/changelog.txt | 3 +++
plugin.video.nrk/data.py | 6 +++---
9 files changed, 28 insertions(+), 21 deletions(-)
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
