The branch, eden-pre has been updated
via b4427ea2cce78d3cf7e17ac0a079f8755ddde65b (commit)
via f8843f289f97cb346561240cd0b379f0d515fee1 (commit)
via 72fe373c8d024e176ecb9ed3cabcd52c185451fc (commit)
via 4f73329c3b8b8bf3af8a9768f69248e19df26af2 (commit)
via 2342d2bca67b504f6f9c18a0ada24815a8b62ba8 (commit)
from d75f88ac76e6c3748761ed4fd30ec8fa4587e45e (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b4427ea2cce78d3cf7e17ac0a079f8755ddde65b
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f8843f289f97cb346561240cd0b379f0d515fee1
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=72fe373c8d024e176ecb9ed3cabcd52c185451fc
commit 72fe373c8d024e176ecb9ed3cabcd52c185451fc
Author: spiff <[email protected]>
Date: Mon Feb 20 10:41:18 2012 +0100
[plugin.video.mediathek] updated to version 0.3.9
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index ee31c90..49b924b 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.3.8"
+ version="0.3.9"
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, NDR (experimentel)
+ 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, NDR (experimental)
+ 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 fefa8d1..18a8866 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.3.9 - ADD: KIKA (Without Kikaninchen)
0.3.8 - FIX: 3SAT Broken Link
ADD: NDR
0.3.7 - FIX: ORF
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/factory.py
b/plugin.video.mediathek/mediathek/factory.py
index 866ae0d..d22343a 100644
--- a/plugin.video.mediathek/mediathek/factory.py
+++ b/plugin.video.mediathek/mediathek/factory.py
@@ -24,6 +24,7 @@ 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):
@@ -37,6 +38,7 @@ class MediathekFactory(object):
WDRMediathek.name():WDRMediathek,
BRAlphaMediathek.name():BRAlphaMediathek,
NDRMediathek.name():NDRMediathek,
+ KIKAPlus.name():KIKAPlus
}
def getAvaibleMediathekTypes(self):
return sorted(self.avaibleMediathekes.keys())
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=4f73329c3b8b8bf3af8a9768f69248e19df26af2
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2342d2bca67b504f6f9c18a0ada24815a8b62ba8
commit 2342d2bca67b504f6f9c18a0ada24815a8b62ba8
Author: spiff <[email protected]>
Date: Mon Feb 20 10:18:21 2012 +0100
[plugin.audio.radio_de] updated to version 1.0.4
diff --git a/plugin.audio.radio_de/addon.xml b/plugin.audio.radio_de/addon.xml
index d79f00a..20e13e0 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="1.0.3"
provider-name="Tristan Fischer ([email protected])">
+<addon id="plugin.audio.radio_de" name="Radio" version="1.0.4"
provider-name="Tristan Fischer ([email protected])">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.xbmcswift" version="0.2.0"/>
@@ -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 37c8ef6..ad621e9 100644
--- a/plugin.audio.radio_de/changelog.txt
+++ b/plugin.audio.radio_de/changelog.txt
@@ -1,3 +1,7 @@
+1.0.4 (18.02.2012)
+ - Fixed python <2.5 error
+ - Added french translation (thx to stombi)
+
1.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 | 1 +
plugin.video.mediathek/default.py | 2 +-
plugin.video.mediathek/mediathek/__init__.py | 9 +-
plugin.video.mediathek/mediathek/factory.py | 2 +
plugin.video.mediathek/mediathek/kika.py | 120 +++++
.../LICENSE.txt | 564 ++++++++++----------
plugin.video.mmafighting/addon.xml | 24 +
plugin.video.mmafighting/changelog.txt | 7 +
plugin.video.mmafighting/default.py | 82 +++
plugin.video.mmafighting/fanart.jpg | Bin 0 -> 1151895 bytes
plugin.video.mmafighting/icon.png | Bin 0 -> 25009 bytes
plugin.video.mmafighting/readme.txt | 1 +
.../resources/__init__.py | 0
.../resources/lib}/__init__.py | 0
.../resources/lib/mmafighting.py | 142 +++++
plugin.video.mmafighting/resources/lib/utils.py | 145 +++++
.../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 ++
.../LICENSE.txt | 0
plugin.video.s04tv/addon.xml | 18 +
plugin.video.s04tv/changelog.txt | 11 +
plugin.video.s04tv/default.py | 326 +++++++++++
plugin.video.s04tv/icon.png | Bin 0 -> 40879 bytes
.../resources/language/English/strings.xml | 13 +
.../resources/language/German/strings.xml | 13 +
plugin.video.s04tv/resources/settings.xml | 7 +
40 files changed, 1756 insertions(+), 300 deletions(-)
create mode 100644 plugin.video.mediathek/mediathek/kika.py
copy {plugin.video.the.trailers => plugin.video.mmafighting}/LICENSE.txt (98%)
create mode 100644 plugin.video.mmafighting/addon.xml
create mode 100644 plugin.video.mmafighting/changelog.txt
create mode 100644 plugin.video.mmafighting/default.py
create mode 100644 plugin.video.mmafighting/fanart.jpg
create mode 100644 plugin.video.mmafighting/icon.png
create mode 100644 plugin.video.mmafighting/readme.txt
copy {plugin.audio.radio_de => plugin.video.mmafighting}/resources/__init__.py
(100%)
copy {plugin.audio.radio_de/resources =>
plugin.video.mmafighting/resources/lib}/__init__.py (100%)
create mode 100644 plugin.video.mmafighting/resources/lib/mmafighting.py
create mode 100644 plugin.video.mmafighting/resources/lib/utils.py
copy {plugin.program.advanced.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
copy {plugin.program.advanced.launcher => plugin.video.s04tv}/LICENSE.txt
(100%)
create mode 100644 plugin.video.s04tv/addon.xml
create mode 100644 plugin.video.s04tv/changelog.txt
create mode 100644 plugin.video.s04tv/default.py
create mode 100644 plugin.video.s04tv/icon.png
create mode 100644 plugin.video.s04tv/resources/language/English/strings.xml
create mode 100644 plugin.video.s04tv/resources/language/German/strings.xml
create mode 100644 plugin.video.s04tv/resources/settings.xml
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
