The branch, dharma has been updated
via 5c1e2cd948755113628e1cd6d04e8e4886354704 (commit)
via b0b6123e3a7e28681f8dd2c4a8fd3eefc8236244 (commit)
via 3f7876b764b7536eed01b28ba8b0665ccdbec4d6 (commit)
from 84ddeed7e05d2da1289c142f837913870ac78481 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=5c1e2cd948755113628e1cd6d04e8e4886354704
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b0b6123e3a7e28681f8dd2c4a8fd3eefc8236244
commit b0b6123e3a7e28681f8dd2c4a8fd3eefc8236244
Author: spiff <[email protected]>
Date: Mon Feb 20 10:42:08 2012 +0100
[plugin.video.mediathek] updated to version 0.2.8
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index a2fe488..4e1111b 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.2.7"
+ version="0.2.8"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
@@ -17,11 +17,11 @@
<summary lang="en">Gives acces to the most video-platforms from german
public service broadcaster</summary>
<description lang="de">Ermöglicht den zugriff auf alle deutschen
Mediatheken der öffentlich Rechtlichen.
Aktuell implementiert sind:
- 3Sat, ARD, ZDF, ARTE, Bayrisches Fernsehen, ORF, WDR
+ 3Sat, ARD, ZDF, ARTE, Bayrisches Fernsehen, ORF, WDR, NDR (experimentel),
KiKa (ohne Kikaninchen)
</description>
<description lang="en">Gives acces to the most video-platforms from german
public service broadcaster.
Currently implemented:
- 3Sat, ARD, ZDF, ARTE, Bayrisches Fernsehen, ORF, WDR
+ 3Sat, ARD, ZDF, ARTE, Bayrisches Fernsehen, ORF, WDR, NDR (experimental),
KiKa (without Kikaninchen)
</description>
<platform>all</platform>
</extension>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 2566e15..5d3a723 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,6 @@
+0.2.8 - ADD: KIKA (Without Kikaninchen)
+ FIX: 3SAT Broken Link
+ ADD: NDR
0.2.7 - FIX: ORF
0.2.6 - FIX: WDR
0.2.5 - FIX: BayernFS
@@ -21,4 +24,4 @@
0.1.3 - Adjust ARD Parsing - ard now works fine
0.1.2 - Now RTMP playback is avaible under Windows !!!
0.1.1 - added script to extract Media-Information, Added timeout while
downloading something.
-0.1.0 - initial release
\ No newline at end of file
+0.1.0 - initial release
diff --git a/plugin.video.mediathek/default.py
b/plugin.video.mediathek/default.py
index dd5b9c4..c406d23 100644
--- a/plugin.video.mediathek/default.py
+++ b/plugin.video.mediathek/default.py
@@ -44,7 +44,7 @@ action=params.get("action", "")
gui.log("Quality: %s"%gui.quality);
gui.log("argv[0]: %s"%sys.argv[0]);
-gui.log("argv[1]: %s"%sys.argv[0]);
+gui.log("argv[1]: %s"%sys.argv[1]);
gui.openMenuContext();
factory = MediathekFactory();
diff --git a/plugin.video.mediathek/mediathek/__init__.py
b/plugin.video.mediathek/mediathek/__init__.py
index bd11f02..d3c9710 100644
--- a/plugin.video.mediathek/mediathek/__init__.py
+++ b/plugin.video.mediathek/mediathek/__init__.py
@@ -50,7 +50,7 @@ class DisplayObject(object):
class Mediathek(object):
- def loadPage(self,url, values = None):
+ def loadPage(self,url, values = None, maxTimeout = None):
try:
safe_url = url.replace( " ", "%20" ).replace("&","&")
@@ -64,9 +64,12 @@ class Mediathek(object):
req.add_header('Accept-Language', 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3')
req.add_header('Accept-Charset', 'utf-8')
+ if maxTimeout == None:
+ maxTimeout = 60;
+
waittime = 0;
doc = False;
- while not doc and waittime < 60:
+ while not doc and waittime < maxTimeout:
try:
if waittime > 0:
time.sleep(waittime);
@@ -113,7 +116,7 @@ class Mediathek(object):
self.buildPageMenu(treeNode.link,len(treeNode.childNodes));
def displayCategories(self):
- if(len(self.menuTree)>1):
+ if(len(self.menuTree)>1 or not self.menuTree[0].displayElements):
for treeNode in self.menuTree:
self.gui.buildMenuLink(treeNode,self,len(self.menuTree))
else:
diff --git a/plugin.video.mediathek/mediathek/dreisat.py
b/plugin.video.mediathek/mediathek/dreisat.py
index e3f5026..0e477be 100644
--- a/plugin.video.mediathek/mediathek/dreisat.py
+++ b/plugin.video.mediathek/mediathek/dreisat.py
@@ -74,7 +74,7 @@ class DreiSatMediathek(Mediathek):
TreeNode("15","neues","http://www.3sat.de/mediathek/rss/mediathek_neues.xml",True),
TreeNode("16",u"Peter VoÃ
fragt","http://www.3sat.de/mediathek/rss/mediathek_begegnungen.xml",True),
TreeNode("17","Recht
brisant","http://www.3sat.de/mediathek/rss/mediathek_Recht%20brisant.xml",True),
-
TreeNode("18","scobel","http://www.3sat.de/mediathek/rss/mediathek_kulturzeit.xml",True),
+
TreeNode("18","scobel","http://www.3sat.de/mediathek/rss/mediathek_scobel.xml",True),
TreeNode("19","SCHWEIZWEIT","http://www.3sat.de/mediathek/rss/mediathek_schweizweit.xml",True),
TreeNode("20","Theater","http://www.3sat.de/mediathek/rss/mediathek_theater.xml",True),
TreeNode("21","vivo","http://www.3sat.de/mediathek/rss/mediathek_vivo.xml",True),
@@ -181,4 +181,4 @@ class DreiSatMediathek(Mediathek):
else:
links[2] = SimpleLink(url, size);
self.gui.buildVideoLink(DisplayObject(title,"",picture,description,links,True,
pubDate),self,nodeCount);
-
\ No newline at end of file
+
diff --git a/plugin.video.mediathek/mediathek/factory.py
b/plugin.video.mediathek/mediathek/factory.py
index 6d3f488..d22343a 100644
--- a/plugin.video.mediathek/mediathek/factory.py
+++ b/plugin.video.mediathek/mediathek/factory.py
@@ -23,6 +23,8 @@ from mediathek.dreisat import *
from mediathek.bayerisches import *
from mediathek.orf import *
from mediathek.bralpha import *
+from mediathek.ndr import *
+from mediathek.kika import *
class MediathekFactory(object):
def __init__(self):
@@ -35,10 +37,12 @@ class MediathekFactory(object):
ORFMediathek.name():ORFMediathek,
WDRMediathek.name():WDRMediathek,
BRAlphaMediathek.name():BRAlphaMediathek,
+ NDRMediathek.name():NDRMediathek,
+ KIKAPlus.name():KIKAPlus
}
def getAvaibleMediathekTypes(self):
return sorted(self.avaibleMediathekes.keys())
def getMediathek(self,mediathekName, gui):
return self.avaibleMediathekes[mediathekName](gui);
-
\ No newline at end of file
+
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3f7876b764b7536eed01b28ba8b0665ccdbec4d6
commit 3f7876b764b7536eed01b28ba8b0665ccdbec4d6
Author: spiff <[email protected]>
Date: Mon Feb 20 10:18:14 2012 +0100
[plugin.audio.radio_de] updated to version 0.0.4
diff --git a/plugin.audio.radio_de/addon.xml b/plugin.audio.radio_de/addon.xml
index 2d4e7b3..e74dc7a 100644
--- a/plugin.audio.radio_de/addon.xml
+++ b/plugin.audio.radio_de/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.radio_de" name="Radio" version="0.0.3"
provider-name="Tristan Fischer ([email protected])">
+<addon id="plugin.audio.radio_de" name="Radio" version="0.0.4"
provider-name="Tristan Fischer ([email protected])">
<requires>
<import addon="xbmc.python" version="1.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
@@ -12,7 +12,9 @@
<platform>all</platform>
<summary lang="en">Access >4000 radio broadcasts</summary>
<summary lang="de">Zugriff auf >4000 Radiosender</summary>
+ <summary lang="fr">Ecoutez plus de 4000 stations de radio</summary>
<description lang="en">Music plugin to access over 4000 international
radio broadcasts from rad.io, radio.de and radio.fr[CR]Currently features[CR]-
English, german and french translated[CR]- Browse stations by location, genre,
topic, country, city and language[CR]- Search for stations[CR]- 115 genres, 59
topics, 94 countrys, 1010 citys, 63 languages</description>
<description lang="de">Das Radio im Internet mit über 4000 Radiosendern,
Internetradio Stationen, gratis Streams und Podcasts live von rad.io, radio.de
und radio.fr.[CR]Features[CR]- Auf deutsch, englisch und französisch
übersetzt[CR]- Sortiert nach: in der nähe, Genre, Thema, Land und
Sprache[CR]- nach Sendern suchen[CR]- 115 Genre, 59 Themen, 94 Länder, 1010
Städte, 63 Sprachen</description>
+ <description lang="fr">Plugin musical pour écouter plus de 4000 stations
de radio internationales de rad.io, radio.de et
radio.fr[CR]Fonctionnalités[CR]- Traduit en Anglais, Allemand et
Français[CR]- Parcourir les stations par genre, thème, pays, ville et
langue[CR]- Recherche de stations[CR]- 115 genres, 59 thèmes, 94 pays, 1010
villes, 63 langues</description>
</extension>
</addon>
\ No newline at end of file
diff --git a/plugin.audio.radio_de/changelog.txt
b/plugin.audio.radio_de/changelog.txt
index 4fc50cd..a0c57c6 100644
--- a/plugin.audio.radio_de/changelog.txt
+++ b/plugin.audio.radio_de/changelog.txt
@@ -1,3 +1,7 @@
+0.0.4 (18.02.2012)
+ - Fixed python <2.5 error
+ - Added french translation (thx to stombi)
+
0.0.3 (07.02.2012)
- added workaround for streams with .m3u and .pls files
- changed: show full context menu
diff --git a/plugin.audio.radio_de/resources/language/French/strings.xml
b/plugin.audio.radio_de/resources/language/French/strings.xml
index fe0a8b1..400c6c1 100644
--- a/plugin.audio.radio_de/resources/language/French/strings.xml
+++ b/plugin.audio.radio_de/resources/language/French/strings.xml
@@ -3,17 +3,17 @@
<!-- Root menu entries -->
<string id="30100">Recommandations éditoriales</string>
<string id="30101">Top 100 stations</string>
- <string id="30102">Naviguer par Genre</string>
- <string id="30103">Naviguer par Thèmes</string>
- <string id="30104">Naviguer par Pays</string>
- <string id="30105">Naviguer par Ville</string>
- <string id="30106">Naviguer par Langues</string>
+ <string id="30102">Parcourir par Genre</string>
+ <string id="30103">Parcourir par Thème</string>
+ <string id="30104">Parcourir par Pays</string>
+ <string id="30105">Parcourir par Ville</string>
+ <string id="30106">Parcourir par Langue</string>
<string id="30107">Radios dans votre région</string>
- <string id="30108">Mon stations</string>
+ <string id="30108">Mes stations</string>
<!-- Search -->
<string id="30200">Rechercher</string>
- <string id="30201">genre, thème, pay, ville, langue</string>
+ <string id="30201">genre, thème, pays, ville, langue</string>
<!-- Settings -->
<string id="30300">Langue</string>
@@ -22,6 +22,6 @@
<string id="30303">Français</string>
<!-- Context Menu -->
- <string id="30400">Add to "Mon stations"</string>
- <string id="30401">Remove from "Mon stations"</string>
+ <string id="30400">Ajouter à "Mes stations"</string>
+ <string id="30401">Supprimer de "Mes stations"</string>
</strings>
\ No newline at end of file
diff --git a/plugin.audio.radio_de/resources/lib/scraper.py
b/plugin.audio.radio_de/resources/lib/scraper.py
index 4fe3d8b..45db250 100644
--- a/plugin.audio.radio_de/resources/lib/scraper.py
+++ b/plugin.audio.radio_de/resources/lib/scraper.py
@@ -109,7 +109,7 @@ def get_station_by_station_id(language, station_id):
raise
gets = {'broadcast': station_id}
station = __get_json(path, gets, language)
- if station['streamURL'].endswith(('m3u', 'pls')):
+ if station['streamURL'][-3:] in ('m3u', 'pls'):
station['streamURL'] = __resolve_playlist(station['streamURL'])
__log('get_station_by_station_id end')
return station
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.radio_de/addon.xml | 4 +-
plugin.audio.radio_de/changelog.txt | 4 +
.../resources/language/French/strings.xml | 18 +-
plugin.audio.radio_de/resources/lib/scraper.py | 2 +-
plugin.video.mediathek/addon.xml | 6 +-
plugin.video.mediathek/changelog.txt | 5 +-
plugin.video.mediathek/default.py | 2 +-
plugin.video.mediathek/mediathek/__init__.py | 9 +-
plugin.video.mediathek/mediathek/dreisat.py | 4 +-
plugin.video.mediathek/mediathek/factory.py | 6 +-
plugin.video.mediathek/mediathek/kika.py | 120 ++++++++++++
.../mediathek/{dreisat.py => ndr.py} | 107 ++++-------
.../LICENSE.txt | 0
plugin.video.nasa/addon.py | 189 ++++++++++++++++++
plugin.video.nasa/addon.xml | 17 ++
plugin.video.nasa/changelog.txt | 1 +
plugin.video.nasa/icon.png | Bin 0 -> 48848 bytes
.../resources/__init__.py | 0
.../resources/language/English/strings.xml | 14 ++
.../resources/lib}/__init__.py | 0
plugin.video.nasa/resources/lib/streams_scraper.py | 62 ++++++
plugin.video.nasa/resources/lib/videos_scraper.py | 200 ++++++++++++++++++++
.../resources/lib/vodcasts_scraper.py | 52 +++++
23 files changed, 730 insertions(+), 92 deletions(-)
create mode 100644 plugin.video.mediathek/mediathek/kika.py
copy plugin.video.mediathek/mediathek/{dreisat.py => ndr.py} (54%)
copy {plugin.program.launcher => plugin.video.nasa}/LICENSE.txt (100%)
create mode 100644 plugin.video.nasa/addon.py
create mode 100644 plugin.video.nasa/addon.xml
create mode 100644 plugin.video.nasa/changelog.txt
create mode 100644 plugin.video.nasa/icon.png
copy {plugin.audio.radio_de => plugin.video.nasa}/resources/__init__.py (100%)
create mode 100644 plugin.video.nasa/resources/language/English/strings.xml
copy {plugin.audio.radio_de/resources =>
plugin.video.nasa/resources/lib}/__init__.py (100%)
create mode 100644 plugin.video.nasa/resources/lib/streams_scraper.py
create mode 100644 plugin.video.nasa/resources/lib/videos_scraper.py
create mode 100644 plugin.video.nasa/resources/lib/vodcasts_scraper.py
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
