[Xbmc-addons] Plugins branch, frodo, updated. 467dc93b0cf540cc6bcd10db99be783d48ef8229

Sat, 30 Nov 2013 00:57:20 -0800 

The branch, frodo has been updated
       via  467dc93b0cf540cc6bcd10db99be783d48ef8229 (commit)
       via  850fd2cced578ad8c1f7068e5eebd803790ec4b2 (commit)
      from  0ebebb510d3b85106bc4ba4ec5563fbb271137a7 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=467dc93b0cf540cc6bcd10db99be783d48ef8229

commit 467dc93b0cf540cc6bcd10db99be783d48ef8229
Author: Martijn Kaijser <[email protected]>
Date:   Sat Nov 30 09:54:57 2013 +0100

    [plugin.video.spiegelonline] 1.2.1

diff --git a/plugin.video.spiegelonline/addon.xml 
b/plugin.video.spiegelonline/addon.xml
index 3c47693..118e500 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.0" 
provider-name="cdwertmann (credits to peterpanzki and mad-max for previous 
versions">
+<addon id="plugin.video.spiegelonline" name="Spiegel Online" version="1.2.1" 
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 223cff3..fc2583e 100644
--- a/plugin.video.spiegelonline/changelog.txt
+++ b/plugin.video.spiegelonline/changelog.txt
@@ -1,3 +1,13 @@
+[B]Version 1.2.1[/B]
+
+- Detects when a HD stream is unavailable
+
+[B]Version 1.2[/B]
+
+- UTF-8 support
+- Faster navigation through parallel downloads
+- Clip duration now contains seconds
+
 [B]Version 1.1[/B]
 
 - updated python dependencies to make it Eden compatible
diff --git a/plugin.video.spiegelonline/default.py 
b/plugin.video.spiegelonline/default.py
index 45c0355..b79da96 100644
--- a/plugin.video.spiegelonline/default.py
+++ b/plugin.video.spiegelonline/default.py
@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010 by peterpanzki
+# Copyright 2013 cdwertmann
+
 import urllib,urllib2,re,time,xbmcplugin,xbmcgui,xbmcaddon,threading
 
 # plugin handle
 SITE = 
"http://www1.spiegel.de/active/playlist/fcgi/playlist.fcgi/asset=flashvideo/mode=list/displaycategory=";
 VIDS = 20
 VIDS_PER_SITE = "/count=" + str(VIDS) + "/" 
+BASEURL="http://video.spiegel.de/flash/";
 handle = int(sys.argv[1])
 __addon__        = xbmcaddon.Addon()
 __language__     = __addon__.getLocalizedString
@@ -54,16 +57,24 @@ def show_cat_menu(cat, vnr):
     xbmcplugin.endOfDirectory(handle=handle, succeeded=True)
     
 def getVideo(id):
-    content = getUrl("http://video.spiegel.de/flash/"; + id + ".xml")
+    content = getUrl(BASEURL + id + ".xml")
     match = re.compile('<type(.+?)</type',re.DOTALL).findall(content)
-    hbitrate = 0
     filename = ""
+    streams = []
     for m in match:
         cat = 
re.compile('<filename>(.+?)</filename>.+?<totalbitrate>(.+?)</totalbitrate>',re.DOTALL).findall(m)
         for file,bitrate in cat:
-            if (".mp4" in file or ".flv" in file) and int(bitrate) > hbitrate:
-                hbitrate = int(bitrate)
-                filename = file
+            if (".mp4" in file or ".flv" in file):
+                streams.append((file,int(bitrate)))
+    #xbmc.log(str(streams), level=xbmc.LOGERROR)
+    # sort streams by highest bitrate first
+    streams.sort(key=lambda x: x[1], reverse=True)
+    #xbmc.log(str(streams), level=xbmc.LOGERROR)
+    for file,bitrate in streams:
+        # find the best quality stream available
+        if urllib.urlopen(BASEURL + file).getcode()==200:
+            filename = file
+            break
     return filename
 
 def parameters_string_to_dict(parameters):
@@ -86,7 +97,7 @@ def addLinkItem(url, li):
     return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]), url=url, 
listitem=li, isFolder=False, totalItems=len(items))
 
 def setVideoURL(vid, index):
-    items[index]['url']="http://video.spiegel.de/flash/"; + getVideo(vid)
+    items[index]['url']=BASEURL + getVideo(vid)
 
 def getUrl(url):
     req = urllib2.Request(url)

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=850fd2cced578ad8c1f7068e5eebd803790ec4b2

commit 850fd2cced578ad8c1f7068e5eebd803790ec4b2
Author: Martijn Kaijser <[email protected]>
Date:   Sat Nov 30 09:51:35 2013 +0100

    [plugin.audio.radio_de] 2.3.0

diff --git a/plugin.audio.radio_de/addon.xml b/plugin.audio.radio_de/addon.xml
index 846edbc..d841496 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="2.2.1" 
provider-name="Tristan Fischer ([email protected])">
+<addon id="plugin.audio.radio_de" name="Radio" version="2.3.0" 
provider-name="Tristan Fischer ([email protected])">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
         <import addon="script.module.xbmcswift2" version="2.4.0"/>
@@ -24,10 +24,13 @@
         <summary lang="es">Escuche más de 7.000 emisoras de radio</summary>
         <summary lang="fr">Ecoutez plus de 7000 stations de radio</summary>
         <summary lang="gl">Escoite máis de 7000 emisoras de radio</summary>
+        <summary lang="he">גישה ליותר מ-7000 שידורי 
רדיו</summary>
         <summary lang="hr">Pristup &gt;7000 radio emitiranja</summary>
         <summary lang="hu">Hozzáférés 7000-nél is több 
rádióadáshoz</summary>
+        <summary lang="id">Akses &gt;7000 siaran radio</summary>
         <summary lang="it">Accedi a più di 7000 trasmissioni radio</summary>
         <summary lang="lt">Prieiga&gt; 7000 radijo transliacijų</summary>
+        <summary lang="nl">Toegang tot &gt;7000 radio uitzendingen</summary>
         <summary lang="pl">Dostęp do ponad 7000 stacji radiowych</summary>
         <summary lang="pt">Aceder a mais de 7000 transmissões de 
rádio</summary>
         <summary lang="pt_BR">Acesse&gt;7000 broadcasts rádios</summary>
@@ -44,10 +47,13 @@
         <description lang="es">Plugin de música para escuchar más de 7.000 
emisoras de radio internacionales desde rad.io, radio.de y 
radio.fr.[CR]Características:[CR]- Traducciones al inglés, alemán, francés 
y español.[CR]- Buscador de emisoras por ubicación, género, tema, país, 
ciudad o idioma.[CR]- Buscador de emisoras.[CR]- 115 géneros, 59 temas, 94 
países, 1.010 ciudades, 63 idiomas.</description>
         <description lang="fr">Plugin musical pour écouter plus de 7000 
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>
         <description lang="gl">Engadido de música para escoitar máis de 7000 
emisoras de radio internacionais de rad.io, radio.de e 
radio.fr.[CR]Características:[CR]- Traducións ao inglés, alemán, francés e 
castelán.[CR]- Busca de emisoras por localización, xénero, tema, país, 
cidade ou idioma.[CR]- Busca de emisoras.[CR]- 115 xéneros, 59 temas, 94 
países, 1010 cidades, 63 idiomas.</description>
+        <description lang="he">הרחבת מוזיקה המאפשרת גישה 
ליותר מ-7000 שידורי רדיו בינלאומים מ-rad.io, radio.de 
ו-radio.fr[CR]מאפיינים נוכחיים[CR]- שפות אנגלית, 
גרמנית וצרפתית[CR]- עיון לפי מיקום, סגנון, נ
ושא, מדינה, עיר ושפה[CR]- חיפוש תחנות[CR]- 115 סגנ
ונות, 59 נושאים, 94 מדינות 1010 ערים, 63 
שפות</description>
         <description lang="hr">Glazbeni dodatak za pristup 7000 međunarodnih 
radio stanica na rad.io, radio.de i radio.fr[CR]Trenutne značajke[CR]- 
engleski, njemački i francuski prijevodi[CR]- Pregledavajte stanice prema 
lokaciji, žanru, temi, zemlji, gradu i jeziku[CR]- Pretraživanje stanica[CR]- 
115 žanrova, 59 tema, 94 zemalja, 1010 gradova, 63 jezika</description>
         <description lang="hu">Beépülő modul több, mint 7000 nemzetközi 
rádióadás eléréséhez a rad.io, radio.de és radio.fr 
oldalakról[CR]Jelenlegi tulajdonságok[CR]- Angol, német, francia és magyar 
nyelv[CR]- Állomások böngészése hely, műfaj, téma, ország, város és 
nyelv szerint[CR]- Állomások keresése[CR]- 115 műfaj, 59 téma, 94 ország, 
1010 város, 63 nyelv</description>
+        <description lang="id">Plugin musik untuk mengakses lebih dari 7000 
siaran radio internasional dari rad.io, radio.de dan radio.fr[CR]Fitur saat 
ini[CR]- Terjemahan Inggris, Jerman dan Perancis[CR]- Jelajah stasiun 
berdasarkan lokasi, tema, topik, negara, kota dan bahasa[CR]- Cari stasiun[CR]- 
115 tema, 59 topik, 94 negara, 1010 kota, 63 bahasa</description>
         <description lang="it">Plugin per accedere a oltre 7000 trasmissioni 
internazionali radiofoniche da rad.io, radio.de e 
radio.fr[CR]Caratteristiche[CR]- Supporta inglese, tedesco e francese[CR]- 
Sfoglia le stazioni per località, genere, argomento, paese, citta e 
lingua[CR]- Ricerca delle stazioni[CR]- 115 generi, 59 argomenti, 94 paesi, 
1010 città e 63 lingue</description>
         <description lang="lt">Muzikos įskiepio prieiga prie daugiau nei 7000 
tarptautinių radijo transliacijų iš rad.io, radio.de ir radio.fr [CR] Šiuo 
metu programoja išversta į [Cr] - anglų, vokiečių ir prancūzų kalbas 
[CR] - Naršyti stotis pagal: vietovę, žanrą, temą, šalį, miestą ir/ar 
kalbą [CR] - Ieškoti radio stočių pagal:[Cr] - 115 žanrai, 59 temos, 94 
šalys, 1010 miestų, 63 kalbos</description>
+        <description lang="nl">muziek plug-in om toegang te krijgen tot over 
7000 internationale radiouitzendingen van rad.io, radio.de en 
radio.fr[CR]Huidige functies[CR]- engels, duits en frans vertaalt[CR]- Zoek 
naar stations vanuit locatie, genre, onderwerp, land, plaats en taal[CR]- zoek 
voor stations[CR]- 115 genres. 59 onderwerpen, 94 landen. 1010 plaatsen, 63 
talen</description>
         <description lang="pl">Wtyczka muzyczna dająca dostęp do ponad 7000 
międzynarodowych stacji radiowych z[CR]rad.io, radio.de, daio.fr[CR]Obecnie w 
językach[CR]- Angielski, Niemiecki i Francuski[CR]- Szukaj stacji według 
lokacji, gatunku, tematu, kraju, miasta czy języka[CR]- 115 gatunków, 59 
tematów, 94 kraje, 1010 miasta, 63 języki</description>
         <description lang="pt">Plugin de música para aceder a mais de 7000 
transmissões de rádio internacionais de rad.io, radio.de e 
radio.fr[CR]Actualmente, disponibiliza:[CR]- Traduções em vários 
idiomas[CR]- Navegar estações por localização, género, tópico, país, 
cidade e idioma[CR]- Procurar por estações[CR]- 115 géneros, 59 tópicos, 94 
países, 1010 cidades, 63 idiomas</description>
         <description lang="pt_BR">Plugin de música para acessar mais de 7000 
emissoras de rádio internacionais de rad.io, radio.de e radio.fr [CR] 
Principais características [CR] - Inglês, Alemão e Francês traduzido [CR] - 
Procure estações por localização, gênero, tópico, país , cidade e  
linguagem [CR] - Procure estações [CR] - 115 gêneros, 59 temas, 94 países, 
1010 cidades, 63 idiomas</description>
diff --git a/plugin.audio.radio_de/changelog.txt 
b/plugin.audio.radio_de/changelog.txt
index fdd4d27..34693d1 100644
--- a/plugin.audio.radio_de/changelog.txt
+++ b/plugin.audio.radio_de/changelog.txt
@@ -1,3 +1,8 @@
+2.3.0 (29.11.2013)
+    - added playback for asx playlists (e.g. BBC)
+    - added blayback for xml playlists
+    - improved station search
+
 2.2.1 (11.08.2013)
     - updated translations
     - added new addon.xml tags
diff --git a/plugin.audio.radio_de/resources/language/Dutch/strings.xml 
b/plugin.audio.radio_de/resources/language/Dutch/strings.xml
index d2a2003..140f8d0 100644
--- a/plugin.audio.radio_de/resources/language/Dutch/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Dutch/strings.xml
@@ -4,8 +4,20 @@
 <!-- Report language file syntax bugs at: [email protected] -->
 
 <strings>
+    <!-- Root menu entries -->
+    <string id="30100">Redactionele aanbevelingen</string>
+    <string id="30101">Top 100 zenders</string>
     <string id="30102">Blader op genre</string>
+    <string id="30103">Blader bij onderwerp</string>
     <string id="30104">Blader op land</string>
+    <string id="30105">Blader bij stad</string>
+    <string id="30106">Blader bij taal</string>
+    <string id="30107">Lokale zenders</string>
+    <string id="30108">Mijn zenders</string>
+
+    <!-- Search -->
+    <string id="30200">Zoek naar zender</string>
+    <string id="30201">Voer naam, land of taal in</string>
 
     <!-- Settings -->
     <string id="30300">Taal</string>
@@ -14,6 +26,18 @@
     <string id="30303">Frans</string>
     <string id="30310">Video OSD: Toon thumbnail</string>
 
+    <!-- Context Menu -->
+    <string id="30400">voeg toe aan ''mijn zenders''</string>
+    <string id="30401">Verwijder uit ''Mijn zenders''</string>
+    <string id="30402">Wijzig aangepaste zender</string>
+
+    <!-- Custom Station -->
+    <string id="30500">voer %s in a.u.b.</string> <!--%s will be filled by 
30501, 30502 or 30503 -->
+    <string id="30501">Titel</string>
+    <string id="30502">Miniatuur url of locatie</string>
+    <string id="30503">Stream url</string>
+    <string id="30504">voeg aangepaste zender toe...</string>
+
     <!-- Error Message -->
     <string id="30600">Netwerk Fout</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Estonian/strings.xml 
b/plugin.audio.radio_de/resources/language/Estonian/strings.xml
index 73bf1f7..d86f7e2 100644
--- a/plugin.audio.radio_de/resources/language/Estonian/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Estonian/strings.xml
@@ -6,4 +6,5 @@
 <strings>
     <!-- Settings -->
     <string id="30300">Keel</string>
+    <string id="30301">Inglise</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Hebrew/strings.xml 
b/plugin.audio.radio_de/resources/language/Hebrew/strings.xml
index acb517c..ec6812e 100644
--- a/plugin.audio.radio_de/resources/language/Hebrew/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Hebrew/strings.xml
@@ -4,9 +4,39 @@
 <!-- Report language file syntax bugs at: [email protected] -->
 
 <strings>
+    <!-- Root menu entries -->
+    <string id="30100">המלצות העורכים</string>
+    <string id="30101">100 התחנות הגדולות</string>
+    <string id="30102">עיין לפי סגנון</string>
+    <string id="30103">עיין לפי נושא</string>
+    <string id="30104">עיין לפי מדינה</string>
+    <string id="30105">עיין לפי עיר</string>
+    <string id="30106">עיין לפי שפה</string>
+    <string id="30107">תחנות מקומיות</string>
+    <string id="30108">התחנות שלי</string>
+
+    <!-- Search -->
+    <string id="30200">חיפוש תחנה</string>
+    <string id="30201">הזן שם, מדינה או שפה</string>
+
     <!-- Settings -->
     <string id="30300">שפה</string>
-    <string id="30310">הכרח מצב תצוגה של תמונה 
ממוזערת</string>
+    <string id="30301">אנגלית</string>
+    <string id="30302">גרמנית</string>
+    <string id="30303">צרפתית</string>
+    <string id="30310">אלץ מצב תצוגה של תמונה 
ממוזערת</string>
+
+    <!-- Context Menu -->
+    <string id="30400">הוסף אל "התחנות שלי"</string>
+    <string id="30401">הסר מ"התחנות שלי"</string>
+    <string id="30402">ערוך תחנה מותאמת אישית</string>
+
+    <!-- Custom Station -->
+    <string id="30500">אנא הזן %s</string> <!--%s will be filled by 
30501, 30502 or 30503 -->
+    <string id="30501">כותרת</string>
+    <string id="30502">כתובת או נתיב של תמונה 
ממוזערת</string>
+    <string id="30503">כתובת זרימה</string>
+    <string id="30504">הוסף תחנה מותאמת אישית...</string>
 
     <!-- Error Message -->
     <string id="30600">שגיאת רשת</string>
diff --git a/plugin.audio.radio_de/resources/language/Indonesian/strings.xml 
b/plugin.audio.radio_de/resources/language/Indonesian/strings.xml
index 4225c87..0bb21b6 100644
--- a/plugin.audio.radio_de/resources/language/Indonesian/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Indonesian/strings.xml
@@ -4,6 +4,40 @@
 <!-- Report language file syntax bugs at: [email protected] -->
 
 <strings>
+    <!-- Root menu entries -->
+    <string id="30100">Rekomendasi Editor</string>
+    <string id="30101">100 Stasiun Teratas</string>
+    <string id="30102">Jelajahi menurut tema</string>
+    <string id="30103">Jelajahi menurut topik</string>
+    <string id="30104">Jelajahi menurut negara</string>
+    <string id="30105">Jelajahi menurut kota</string>
+    <string id="30106">Jelajahi menurut bahasa</string>
+    <string id="30107">Stasiun Lokal</string>
+    <string id="30108">Stasiun Saya</string>
+
+    <!-- Search -->
+    <string id="30200">Cari stasiun</string>
+    <string id="30201">Masukkan nama, negara atau bahasa</string>
+
     <!-- Settings -->
     <string id="30300">Bahasa</string>
+    <string id="30301">Inggris</string>
+    <string id="30302">Jerman</string>
+    <string id="30303">Perancis</string>
+    <string id="30310">Paksakan ViewMode ke Gambar Kecil</string>
+
+    <!-- Context Menu -->
+    <string id="30400">Tambahkan ke "Stasiun Saya"</string>
+    <string id="30401">Hapus dari "Stasiun Saya"</string>
+    <string id="30402">Edit Stasiun Lain</string>
+
+    <!-- Custom Station -->
+    <string id="30500">Silakan masukkan %s</string> <!--%s will be filled by 
30501, 30502 or 30503 -->
+    <string id="30501">judul</string>
+    <string id="30502">lokasi atau url gambar kecil</string>
+    <string id="30503">url stream</string>
+    <string id="30504">Tambah Stasiun Lain...</string>
+
+    <!-- Error Message -->
+    <string id="30600">Kesalahan Jaringan</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Macedonian/strings.xml 
b/plugin.audio.radio_de/resources/language/Macedonian/strings.xml
index 0e5d34c..b2cb53f 100644
--- a/plugin.audio.radio_de/resources/language/Macedonian/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Macedonian/strings.xml
@@ -6,4 +6,5 @@
 <strings>
     <!-- Settings -->
     <string id="30300">Јазик</string>
+    <string id="30301">Англиски</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Malay/strings.xml 
b/plugin.audio.radio_de/resources/language/Malay/strings.xml
index c47cf42..b34dc6e 100644
--- a/plugin.audio.radio_de/resources/language/Malay/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Malay/strings.xml
@@ -6,4 +6,7 @@
 <strings>
     <!-- Settings -->
     <string id="30300">Bahasa</string>
+    <string id="30301">Inggeris</string>
+    <string id="30302">Jerman</string>
+    <string id="30303">Perancis</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Norwegian/strings.xml 
b/plugin.audio.radio_de/resources/language/Norwegian/strings.xml
index fc4b0a3..e50fc0e 100644
--- a/plugin.audio.radio_de/resources/language/Norwegian/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Norwegian/strings.xml
@@ -9,4 +9,7 @@
     <string id="30301">Engelsk</string>
     <string id="30302">Tysk</string>
     <string id="30303">Fransk</string>
+
+    <!-- Error Message -->
+    <string id="30600">Nettverksfeil</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Persian/strings.xml 
b/plugin.audio.radio_de/resources/language/Persian/strings.xml
index 4748017..76c0f47 100644
--- a/plugin.audio.radio_de/resources/language/Persian/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Persian/strings.xml
@@ -6,4 +6,5 @@
 <strings>
     <!-- Settings -->
     <string id="30300">زبان</string>
+    <string id="30301">انگلیسی</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Russian/strings.xml 
b/plugin.audio.radio_de/resources/language/Russian/strings.xml
index fc08296..81bcf9c 100644
--- a/plugin.audio.radio_de/resources/language/Russian/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Russian/strings.xml
@@ -4,10 +4,20 @@
 <!-- Report language file syntax bugs at: [email protected] -->
 
 <strings>
+    <string id="30102">Просмотр по стилю</string>
+    <string id="30108">Мои станции</string>
+
     <!-- Settings -->
     <string id="30300">Язык</string>
     <string id="30301">Английский</string>
     <string id="30302">Немецкий</string>
     <string id="30303">Французский</string>
     <string id="30310">Перевести режим просмотра к 
иконкам</string>
+
+    <!-- Context Menu -->
+    <string id="30400">Добавить в "Мои станции"</string>
+    <string id="30401">Убрать из "Моих станций"</string>
+
+    <!-- Error Message -->
+    <string id="30600">Ошибка сети</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Spanish 
(Argentina)/strings.xml b/plugin.audio.radio_de/resources/language/Spanish 
(Argentina)/strings.xml
index 7853901..8a6dc2c 100644
--- a/plugin.audio.radio_de/resources/language/Spanish (Argentina)/strings.xml  
+++ b/plugin.audio.radio_de/resources/language/Spanish (Argentina)/strings.xml  
@@ -6,4 +6,5 @@
 <strings>
     <!-- Settings -->
     <string id="30300">Idioma</string>
+    <string id="30301">Inglés</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Spanish 
(Mexico)/strings.xml b/plugin.audio.radio_de/resources/language/Spanish 
(Mexico)/strings.xml
index d9d7ea6..9a06ab1 100644
--- a/plugin.audio.radio_de/resources/language/Spanish (Mexico)/strings.xml     
+++ b/plugin.audio.radio_de/resources/language/Spanish (Mexico)/strings.xml     
@@ -4,6 +4,9 @@
 <!-- Report language file syntax bugs at: [email protected] -->
 
 <strings>
+    <string id="30102">Navegar por genero</string>
+    <string id="30108">Mis Estaciones</string>
+
     <!-- Settings -->
     <string id="30300">Idioma</string>
     <string id="30301">Inglés</string>
@@ -11,6 +14,10 @@
     <string id="30303">Francés</string>
     <string id="30310">Forzar Modo de Vista a Miniatura</string>
 
+    <!-- Context Menu -->
+    <string id="30400">Agregar a "Mis Estaciones"</string>
+    <string id="30401">Remover de "Mis Estaciones"</string>
+
     <!-- Error Message -->
     <string id="30600">Error de red</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Thai/strings.xml 
b/plugin.audio.radio_de/resources/language/Thai/strings.xml
index 5e0300d..092cd25 100644
--- a/plugin.audio.radio_de/resources/language/Thai/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Thai/strings.xml
@@ -6,4 +6,5 @@
 <strings>
     <!-- Settings -->
     <string id="30300">ภาษา</string>
+    <string id="30301">อังกฤษ</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/language/Turkish/strings.xml 
b/plugin.audio.radio_de/resources/language/Turkish/strings.xml
index acdd82d..3921c69 100644
--- a/plugin.audio.radio_de/resources/language/Turkish/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Turkish/strings.xml
@@ -9,4 +9,8 @@
     <string id="30301">Ä°ngilizce</string>
     <string id="30302">Almanca</string>
     <string id="30303">Fransızca</string>
+    <string id="30310">Küçük Resim Görünüm Moduna Zorla</string>
+
+    <!-- Error Message -->
+    <string id="30600">Ağ Hatası</string>
 </strings>
diff --git a/plugin.audio.radio_de/resources/lib/api.py 
b/plugin.audio.radio_de/resources/lib/api.py
index 33b7745..1acc1dd 100644
--- a/plugin.audio.radio_de/resources/lib/api.py
+++ b/plugin.audio.radio_de/resources/lib/api.py
@@ -40,7 +40,7 @@ class RadioApi():
 
     USER_AGENT = 'XBMC Addon Radio'
 
-    PLAYLIST_PREFIXES = ('m3u', 'pls')
+    PLAYLIST_PREFIXES = ('m3u', 'pls', 'asx', 'xml')
 
     def __init__(self, language='english', user_agent=USER_AGENT):
         self.set_language(language)
@@ -105,6 +105,7 @@ class RadioApi():
             'q': search_string,
             'start': '0',
             'rows': '10000',
+            'streamcontentformats': 'aac,mp3',
         }
         stations = self.__api_call(path, param)
         return self.__format_stations(stations)
@@ -117,7 +118,7 @@ class RadioApi():
         station = self.__api_call(path, param)
         if resolve_playlists and self.__check_paylist(station['streamURL']):
             playlist_url = station['streamURL']
-            station['streamURL'] = self.__resolve_playlist(playlist_url)
+            station['streamURL'] = self.__resolve_playlist(station)
         stations = (station, )
         return self.__format_stations(stations)[0]
 
@@ -141,10 +142,11 @@ class RadioApi():
         json_data = json.loads(response)
         return json_data
 
-    def __resolve_playlist(self, stream_url):
-        self.log('__resolve_playlist started with stream_url=%s'
-                 % stream_url)
+    def __resolve_playlist(self, station):
+        self.log('__resolve_playlist started with station=%s'
+                 % station['id'])
         servers = []
+        stream_url = station['streamURL']
         if stream_url.lower().endswith('m3u'):
             response = self.__urlopen(stream_url)
             self.log('__resolve_playlist found .m3u file')
@@ -159,6 +161,20 @@ class RadioApi():
                 l.split('=')[1] for l in response.splitlines()
                 if l.lower().startswith('file')
             ]
+        elif stream_url.lower().endswith('asx'):
+            response = self.__urlopen(stream_url)
+            self.log('__resolve_playlist found .asx file')
+            servers = [
+                l.split('href="')[1].split('"')[0]
+                for l in response.splitlines() if 'href' in l
+            ]
+        elif stream_url.lower().endswith('xml'):
+            self.log('__resolve_playlist found .xml file')
+            servers = [
+                stream_url['streamUrl']
+                for stream_url in station.get('streamUrls', [])
+                if 'streamUrl' in stream_url
+            ]
         if servers:
             self.log('__resolve_playlist found %d servers' % len(servers))
             return random.choice(servers)

-----------------------------------------------------------------------

Summary of changes:
 plugin.audio.radio_de/addon.xml                    |    8 ++++-
 plugin.audio.radio_de/changelog.txt                |    5 +++
 .../resources/language/Dutch/strings.xml           |   24 ++++++++++++++
 .../resources/language/Estonian/strings.xml        |    1 +
 .../resources/language/Hebrew/strings.xml          |   32 ++++++++++++++++++-
 .../resources/language/Indonesian/strings.xml      |   34 ++++++++++++++++++++
 .../resources/language/Macedonian/strings.xml      |    1 +
 .../resources/language/Malay/strings.xml           |    3 ++
 .../resources/language/Norwegian/strings.xml       |    3 ++
 .../resources/language/Persian/strings.xml         |    1 +
 .../resources/language/Russian/strings.xml         |   10 ++++++
 .../language/Spanish (Argentina)/strings.xml       |    1 +
 .../language/Spanish (Mexico)/strings.xml          |    7 ++++
 .../resources/language/Thai/strings.xml            |    1 +
 .../resources/language/Turkish/strings.xml         |    4 ++
 .../language/Vietnamese (Viet Nam)}/strings.xml    |    4 +-
 plugin.audio.radio_de/resources/lib/api.py         |   26 ++++++++++++---
 plugin.video.spiegelonline/addon.xml               |    2 +-
 plugin.video.spiegelonline/changelog.txt           |   10 ++++++
 plugin.video.spiegelonline/default.py              |   23 ++++++++++---
 20 files changed, 184 insertions(+), 16 deletions(-)
 copy {plugin.audio.shoutcast/resources/language/Finnish => 
plugin.audio.radio_de/resources/language/Vietnamese (Viet Nam)}/strings.xml 
(64%)


hooks/post-receive
-- 
Plugins


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to