The branch, frodo has been updated
via 27a0449ee92bb1c55d6df235bf7c566809707644 (commit)
from 180d89602c3f19b1d00c325e67578bcf717936c7 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=27a0449ee92bb1c55d6df235bf7c566809707644
commit 27a0449ee92bb1c55d6df235bf7c566809707644
Author: beenje <[email protected]>
Date: Mon Mar 11 22:11:46 2013 +0100
[plugin.audio.radio_de] updated to version 2.2.0
diff --git a/plugin.audio.radio_de/addon.py b/plugin.audio.radio_de/addon.py
index 5c909b5..6888cde 100644
--- a/plugin.audio.radio_de/addon.py
+++ b/plugin.audio.radio_de/addon.py
@@ -212,8 +212,7 @@ def __add_stations(stations, add_custom=False):
))
items.append({
'label': station.get('name', ''),
- 'thumbnail': station.get('thumbnail_trans', ''),
- 'icon': station.get('thumbnail', ''),
+ 'thumbnail': station['thumbnail'],
'info': {
'title': station.get('name', ''),
'rating': str(station.get('rating', '0.0')),
@@ -241,47 +240,24 @@ def __add_stations(stations, add_custom=False):
'SONG_RATING',
],
}
- if plugin.get_setting('force_viewmode') == 'true':
+ if plugin.get_setting('force_viewmode', bool):
finish_kwargs['view_mode'] = 'thumbnail'
return plugin.finish(items, **finish_kwargs)
-def migrate_my_stations():
- if not plugin.get_setting('migrate') == 'done':
- __log('migrate_my_stations')
- import os
- import simplejson as json
- profile_path = xbmc.translatePath(
- plugin._addon.getAddonInfo('profile')
- )
- ms_file = os.path.join(profile_path, 'mystations.json')
- if os.path.isfile(ms_file):
- my_stations_old = json.load(open(ms_file, 'r'))
- for old_station in my_stations_old:
- station_id = old_station['station_id']
- __log('migrating: %s' % station_id)
- station = radio_api.get_station_by_station_id(station_id)
- my_stations[station_id] = station
- my_stations.sync()
- plugin.set_setting('migrate', 'done')
-
-
def __get_language():
- if not plugin.get_setting('not_first_run'):
+ languages = ('english', 'german', 'french')
+ if not plugin.get_setting('not_first_run', str):
xbmc_language = xbmc.getLanguage().lower()
__log('__get_language has first run with xbmc_language=%s'
% xbmc_language)
- if xbmc_language.startswith('english'):
- plugin.set_setting('language', '0')
- elif xbmc_language.startswith('german'):
- plugin.set_setting('language', '1')
- elif xbmc_language.startswith('french'):
- plugin.set_setting('language', '2')
- else:
- plugin.open_settings()
+ for i, lang in enumerate(languages):
+ if xbmc_language.lower().startswith(lang):
+ plugin.set_setting('language', str(i))
+ __log('__get_language detected: %s' % languages[i])
+ break
plugin.set_setting('not_first_run', '1')
- lang_id = plugin.get_setting('language') or 0
- return ('english', 'german', 'french')[int(lang_id)]
+ return plugin.get_setting('language', choices=languages)
def __log(text):
@@ -298,7 +274,6 @@ def _(string_id):
if __name__ == '__main__':
radio_api.set_language(__get_language())
radio_api.log = __log
- migrate_my_stations()
try:
plugin.run()
except RadioApiError:
diff --git a/plugin.audio.radio_de/addon.xml b/plugin.audio.radio_de/addon.xml
index a5fa07f..f7a85e5 100644
--- a/plugin.audio.radio_de/addon.xml
+++ b/plugin.audio.radio_de/addon.xml
@@ -1,36 +1,44 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.radio_de" name="Radio" version="2.1.3"
provider-name="Tristan Fischer ([email protected])">
- <requires>
- <import addon="xbmc.python" version="2.1.0"/>
- <import addon="script.module.xbmcswift2" version="1.3.0"/>
- <import addon="script.module.simplejson" version="2.0.10"/>
- </requires>
- <extension point="xbmc.python.pluginsource" library="addon.py">
- <provides>audio</provides>
- </extension>
- <extension point="xbmc.addon.metadata">
- <!-- translation commit: 84113ddafdde2c18eac5fd9b9b8144abff06ccf9 -->
- <language></language>
- <platform>all</platform>
- <summary lang="be">Access >4000 radio broadcasts</summary>
- <summary lang="de">Zugriff auf >4000 Radiosender</summary>
- <summary lang="el">Î ÏÏÏβαÏη Ïε ÏÎ¬Î½Ï Î±ÏÏ 4000
εκÏομÏÎÏ</summary>
- <summary lang="en">Access >4000 radio broadcasts</summary>
- <summary lang="es">Escuche más de 4.000 emisoras de radio</summary>
- <summary lang="fr">Ecoutez plus de 4000 stations de radio</summary>
- <summary lang="lt">Prieiga> 4000 radijo transliacijų</summary>
- <summary lang="pl">DostÄp do ponad 4000 stacji radiowych</summary>
- <summary lang="pt_BR">Acesse>4000 broadcasts rádios</summary>
- <summary lang="sv">Access >4000 radiosändningar</summary>
- <description lang="be">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="el">ÎοÏ
ÏÎ¹ÎºÏ plugin για ÏÏÏÏβαÏη Ïε
ÏεÏιÏÏÏÏεÏοÏ
Ï Î±ÏÏ 4000 διεθνείÏ
ÏαδιοÏÏνικÎÏ ÎµÎºÏομÏÎÏ Î±ÏÏ Ïα rad.io, radio.de και
radio.fr[CR]Î¥ÏοÏÏηÏίζονÏαι[CR]- ÎεÏαÏÏάÏÎµÎ¹Ï Ïε
Îγγλικά, ÎεÏμανικά και Îαλλικά[CR]- Î
εÏιήγηÏη ÏÏαθμÏν ανά ÏοÏοθεÏία, είδοÏ,
θÎμα, ÏÏÏα, ÏÏλη και γλÏÏÏα[CR]- ÎναζήÏηÏη
ÏÏαθμÏν[CR]- 115 είδη, 59 θÎμαÏα, 94 ÏÏÏεÏ, 1010
ÏÏλειÏ, 63 γλÏÏÏεÏ</description>
- <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="es">Plugin de música para escuchar más de 4.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 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>
- <description lang="lt">Muzikos įskiepio prieiga prie daugiau nei 4000
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="pl">Wtyczka muzyczna dajÄ
ca dostÄp do ponad 4000
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_BR">Plugin de música para acessar mais de 4000
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>
- <description lang="sv">Musiktillägg som ger åtkomst till över 4000
internationella radiosändningar från rad.io, radio.de och
radio.fr[CR]Nuvarande funktioner[CR]- Engelsk, tysk, svensk och fransk
översättning[]- Bläddra efter stationer baserat på genre, ämne, land, stad
och språk[CR]- Sök efter stationer[CR]-115 genres, 59 ämnen, 94 länder,
1010 städer, 63 språk</description>
- </extension>
+<addon id="plugin.audio.radio_de" name="Radio" version="2.2.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"/>
+ </requires>
+ <extension point="xbmc.python.pluginsource" library="addon.py">
+ <provides>audio</provides>
+ </extension>
+ <extension point="xbmc.addon.metadata">
+ <language></language>
+ <platform>all</platform>
+ <summary lang="be">Access >7000 radio broadcasts</summary>
+ <summary lang="da">FÃ¥ adgang til >7000 radioudsendelser</summary>
+ <summary lang="de">Zugriff auf >7000 Radiosender</summary>
+ <summary lang="el">Î ÏÏÏβαÏη Ïε ÏÎ¬Î½Ï Î±ÏÏ 7000
εκÏομÏÎÏ</summary>
+ <summary lang="en">Access >7000 radio broadcasts</summary>
+ <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="hu">Hozzáférés 7000-nél is több
rádióadáshoz</summary>
+ <summary lang="it">Accedi a più di 7000 trasmissioni radio</summary>
+ <summary lang="lt">Prieiga> 7000 radijo transliacijų</summary>
+ <summary lang="pl">DostÄp do ponad 7000 stacji radiowych</summary>
+ <summary lang="pt_BR">Acesse>7000 broadcasts rádios</summary>
+ <summary lang="sk">Pristupujte k vyše 7000 vysielaniam</summary>
+ <summary lang="sv">Access >7000 radiosändningar</summary>
+ <description lang="be">Music plugin to access over 7000 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="da">Musikplugin som giver adgang til over 7000
internationale radioudsendelser fra rad.io, radio.de og radio.fr[CR]Nuværende
funktioner[CR]- Oversat til engelsk, tysk og fransk[CR]- Gennemse stationer
efter lokalitet, genre, emne, land, by og sprog[CR]- Søg efter stationer[CR]-
115 genrer, 59 emner, 94 lande, 1010 byer og 63 sprog</description>
+ <description lang="de">Das Radio im Internet mit über 7000
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="el">ÎοÏ
ÏÎ¹ÎºÏ plugin για ÏÏÏÏβαÏη
Ïε ÏεÏιÏÏÏÏεÏοÏ
Ï Î±ÏÏ 7000 διεθνείÏ
ÏαδιοÏÏνικÎÏ ÎµÎºÏομÏÎÏ Î±ÏÏ Ïα rad.io, radio.de και
radio.fr[CR]Î¥ÏοÏÏηÏίζονÏαι[CR]- ÎεÏαÏÏάÏÎµÎ¹Ï Ïε
Îγγλικά, ÎεÏμανικά και Îαλλικά[CR]- Î
εÏιήγηÏη ÏÏαθμÏν ανά ÏοÏοθεÏία, είδοÏ,
θÎμα, ÏÏÏα, ÏÏλη και γλÏÏÏα[CR]- ÎναζήÏηÏη
ÏÏαθμÏν[CR]- 115 είδη, 59 θÎμαÏα, 94 ÏÏÏεÏ, 1010
ÏÏλειÏ, 63 γλÏÏÏεÏ</description>
+ <description lang="en">Music plugin to access over 7000 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="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="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="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="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_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>
+ <description lang="sk">Hudobný doplnok na prÃstup k vyÅ¡e 7000
medzinárodným rádio vysielaniam z rad.io, radio.de a
radio.fr Momentálne podporuje: - anglické, nemecké a francúzske
preklady - prehliadanie stanÃc podľa umiestnenia, žánru, témy,
krajiny, mesta a jazyka - vyhľadávanie stanÃc - 115 žánrov, 59
tém, 94 krajÃn, 1010 miest, 63 jazykov</description>
+ <description lang="sv">Musiktillägg som ger åtkomst till över 7000
internationella radiosändningar från rad.io, radio.de och
radio.fr[CR]Nuvarande funktioner[CR]- Engelsk, tysk, svensk och fransk
översättning[]- Bläddra efter stationer baserat på genre, ämne, land, stad
och språk[CR]- Sök efter stationer[CR]-115 genres, 59 ämnen, 94 länder,
1010 städer, 63 språk</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 a5b3717..871095d 100644
--- a/plugin.audio.radio_de/changelog.txt
+++ b/plugin.audio.radio_de/changelog.txt
@@ -1,3 +1,11 @@
+2.2.0 (11.03.2013)
+ - better station logos
+ - better add-on icon
+ - changed to xbmcswift2 v2.4.0
+ - small code improvements
+ - use random server on playlists (instead first one)
+ - update translations
+
2.1.3 (26.12.2012)
- better station logos
- fix unicode error
diff --git a/plugin.audio.radio_de/icon.png b/plugin.audio.radio_de/icon.png
index f3d9a56..885edfe 100644
Binary files a/plugin.audio.radio_de/icon.png and
b/plugin.audio.radio_de/icon.png differ
diff --git a/plugin.audio.radio_de/resources/language/Chinese
(Simple)/strings.xml b/plugin.audio.radio_de/resources/language/Chinese
(Simple)/strings.xml
index 30b51c5..880e937 100644
--- a/plugin.audio.radio_de/resources/language/Chinese (Simple)/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Chinese (Simple)/strings.xml
@@ -4,9 +4,19 @@
<!-- 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>
+
+ <!-- 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/Croatian/strings.xml
b/plugin.audio.radio_de/resources/language/Croatian/strings.xml
index ef6e0fb..17f6533 100644
--- a/plugin.audio.radio_de/resources/language/Croatian/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Croatian/strings.xml
@@ -4,6 +4,9 @@
<!-- Report language file syntax bugs at: [email protected] -->
<strings>
+ <string id="30102">Pregled po žanru</string>
+ <string id="30104">Pregled po državi</string>
+
<!-- Settings -->
<string id="30300">Jezik</string>
<string id="30301">Engleski</string>
diff --git a/plugin.audio.radio_de/resources/language/Danish/strings.xml
b/plugin.audio.radio_de/resources/language/Danish/strings.xml
index 9a297af..88f4d83 100644
--- a/plugin.audio.radio_de/resources/language/Danish/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Danish/strings.xml
@@ -4,9 +4,40 @@
<!-- Report language file syntax bugs at: [email protected] -->
<strings>
+ <!-- Root menu entries -->
+ <string id="30100">Redaktørerne Anbefaler</string>
+ <string id="30101">Top 100 Stationer</string>
+ <string id="30102">Gennemse efter genre</string>
+ <string id="30103">Gennemse efter tema</string>
+ <string id="30104">Gennemse efter land</string>
+ <string id="30105">Gennemse efter by</string>
+ <string id="30106">Gennemse efter sprog</string>
+ <string id="30107">Lokale Stationer</string>
+ <string id="30108">Mine Stationer</string>
+
+ <!-- Search -->
+ <string id="30200">Søg efter station</string>
+ <string id="30201">Indtast navn, land eller sprog</string>
+
<!-- Settings -->
<string id="30300">Sprog</string>
- <string id="30301">engelsk</string>
- <string id="30302">tysk</string>
- <string id="30303">fransk</string>
+ <string id="30301">Engelsk</string>
+ <string id="30302">Tysk</string>
+ <string id="30303">Fransk</string>
+ <string id="30310">Tving Miniaturebillede-visning</string>
+
+ <!-- Context Menu -->
+ <string id="30400">Føj til "Mine Stationer"</string>
+ <string id="30401">Fjern fra "Mine Stationer"</string>
+ <string id="30402">Rediger brugerdefineret Station</string>
+
+ <!-- Custom Station -->
+ <string id="30500">Indtast venligst %s</string> <!--%s will be filled by
30501, 30502 or 30503 -->
+ <string id="30501">titel</string>
+ <string id="30502">webadresse eller sti til miniaturebillede</string>
+ <string id="30503">webadresse til stream</string>
+ <string id="30504">Tilføj brugerdefineret Station</string>
+
+ <!-- Error Message -->
+ <string id="30600">Netværksfejl</string>
</strings>
diff --git a/plugin.audio.radio_de/resources/language/Dutch/strings.xml
b/plugin.audio.radio_de/resources/language/Dutch/strings.xml
index 5c7d72c..2ca098f 100644
--- a/plugin.audio.radio_de/resources/language/Dutch/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Dutch/strings.xml
@@ -4,6 +4,9 @@
<!-- Report language file syntax bugs at: [email protected] -->
<strings>
+ <string id="30102">Blader op genre</string>
+ <string id="30104">Blader op land</string>
+
<!-- Settings -->
<string id="30300">Taal</string>
<string id="30301">Engels</string>
diff --git a/plugin.audio.radio_de/resources/language/Finnish/strings.xml
b/plugin.audio.radio_de/resources/language/Finnish/strings.xml
index fde0182..82da211 100644
--- a/plugin.audio.radio_de/resources/language/Finnish/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Finnish/strings.xml
@@ -4,6 +4,9 @@
<!-- Report language file syntax bugs at: [email protected] -->
<strings>
+ <string id="30102">Selaa lajityypeittäin</string>
+ <string id="30104">Selaa maittain</string>
+
<!-- Settings -->
<string id="30300">Kieli</string>
<string id="30301">Englanti</string>
diff --git a/plugin.audio.radio_de/resources/language/Hungarian/strings.xml
b/plugin.audio.radio_de/resources/language/Hungarian/strings.xml
index c3aa473..afb4df9 100644
--- a/plugin.audio.radio_de/resources/language/Hungarian/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Hungarian/strings.xml
@@ -4,9 +4,40 @@
<!-- Report language file syntax bugs at: [email protected] -->
<strings>
+ <!-- Root menu entries -->
+ <string id="30100">SzerkesztÅk ajánlata</string>
+ <string id="30101">Legjobb 100 állomás</string>
+ <string id="30102">Műfaj szerint</string>
+ <string id="30103">Téma szerint</string>
+ <string id="30104">Ország szerint</string>
+ <string id="30105">Város szerint</string>
+ <string id="30106">Nyelv szerint</string>
+ <string id="30107">Helyi adók</string>
+ <string id="30108">Saját adók</string>
+
+ <!-- Search -->
+ <string id="30200">Adó keresése</string>
+ <string id="30201">Adja meg a nevet, országot vagy várost</string>
+
<!-- Settings -->
<string id="30300">Nyelv</string>
<string id="30301">Angol</string>
<string id="30302">Német</string>
<string id="30303">Francia</string>
+ <string id="30310">Kis képek nézet kényszerÃtése</string>
+
+ <!-- Context Menu -->
+ <string id="30400">Hozzáadás a "Saját adók"-hoz</string>
+ <string id="30401">EltávolÃtás a "Saját adók"-ból</string>
+ <string id="30402">Egyéni adó beállÃtása</string>
+
+ <!-- Custom Station -->
+ <string id="30500">Adja meg a %s-t</string> <!--%s will be filled by
30501, 30502 or 30503 -->
+ <string id="30501">cÃm</string>
+ <string id="30502">kis kép URL vagy útvonal</string>
+ <string id="30503">folyam URL</string>
+ <string id="30504">Egyéni állomás hozzáadása...</string>
+
+ <!-- Error Message -->
+ <string id="30600">Hálózati hiba</string>
</strings>
diff --git a/plugin.audio.radio_de/resources/language/Italian/strings.xml
b/plugin.audio.radio_de/resources/language/Italian/strings.xml
index dff6550..03e4359 100644
--- a/plugin.audio.radio_de/resources/language/Italian/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Italian/strings.xml
@@ -4,9 +4,40 @@
<!-- Report language file syntax bugs at: [email protected] -->
<strings>
+ <!-- Root menu entries -->
+ <string id="30100">Consigli dagli editori</string>
+ <string id="30101">Stazioni top 100</string>
+ <string id="30102">Sfoglia per genere</string>
+ <string id="30103">Sfoglia per argomento</string>
+ <string id="30104">Sfoglia per paese</string>
+ <string id="30105">Sfoglia per città </string>
+ <string id="30106">Sfoglia per lingua</string>
+ <string id="30107">Stazioni locali</string>
+ <string id="30108">Le mie stazioni</string>
+
+ <!-- Search -->
+ <string id="30200">Cerca una stazione</string>
+ <string id="30201">Inserisci il nome, il paese o la lingua</string>
+
<!-- Settings -->
<string id="30300">Lingua</string>
<string id="30301">Inglese</string>
<string id="30302">Tedesco</string>
<string id="30303">Francese</string>
+ <string id="30310">Forza visuale in visualizzazione Anteprime</string>
+
+ <!-- Context Menu -->
+ <string id="30400">Aggiungi alle mie stazioni</string>
+ <string id="30401">Rimuovi dalle mie stazioni</string>
+ <string id="30402">Modica la stazione personalizzata</string>
+
+ <!-- Custom Station -->
+ <string id="30500">Inserisci %s</string> <!--%s will be filled by 30501,
30502 or 30503 -->
+ <string id="30501">titolo</string>
+ <string id="30502">url o percorso dell'anteprima</string>
+ <string id="30503">url per lo streaming</string>
+ <string id="30504">Inserisci una stazione personalizzata...</string>
+
+ <!-- Error Message -->
+ <string id="30600">Errore di rete</string>
</strings>
diff --git a/plugin.audio.radio_de/resources/language/Korean/strings.xml
b/plugin.audio.radio_de/resources/language/Korean/strings.xml
index d9f81b6..cceb286 100644
--- a/plugin.audio.radio_de/resources/language/Korean/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Korean/strings.xml
@@ -4,6 +4,9 @@
<!-- Report language file syntax bugs at: [email protected] -->
<strings>
+ <string id="30102">ì¥ë¥´ë¡ íì</string>
+ <string id="30104">êµê°ë³ íì</string>
+
<!-- Settings -->
<string id="30300">ì¸ì´</string>
<string id="30301">ìì´</string>
diff --git a/plugin.audio.radio_de/resources/language/Portuguese/strings.xml
b/plugin.audio.radio_de/resources/language/Portuguese/strings.xml
index 78d7a8e..35c0f5b 100644
--- a/plugin.audio.radio_de/resources/language/Portuguese/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Portuguese/strings.xml
@@ -4,9 +4,16 @@
<!-- Report language file syntax bugs at: [email protected] -->
<strings>
+ <string id="30102">Procurar por género</string>
+ <string id="30104">Navegar por paÃs</string>
+
<!-- Settings -->
<string id="30300">Lingua</string>
<string id="30301">Inglês</string>
<string id="30302">Alemão</string>
<string id="30303">Francês</string>
+ <string id="30310">Forçar Vista para Miniatura</string>
+
+ <!-- Error Message -->
+ <string id="30600">Erro de Rede</string>
</strings>
diff --git a/plugin.audio.radio_de/resources/language/Slovak/strings.xml
b/plugin.audio.radio_de/resources/language/Slovak/strings.xml
index 159a790..1bc1a69 100644
--- a/plugin.audio.radio_de/resources/language/Slovak/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Slovak/strings.xml
@@ -4,9 +4,40 @@
<!-- Report language file syntax bugs at: [email protected] -->
<strings>
+ <!-- Root menu entries -->
+ <string id="30100">Redakcia odporúÄa</string>
+ <string id="30101">Top 100 stanÃc</string>
+ <string id="30102">Prehliadať podľa žánra</string>
+ <string id="30103">Prehliadať podľa témy</string>
+ <string id="30104">Prehliadať podľa krajiny</string>
+ <string id="30105">Prehliadať podľa mesta</string>
+ <string id="30106">Prehliadať podľa jazyka</string>
+ <string id="30107">Lokálne stanice</string>
+ <string id="30108">Moje stanice</string>
+
+ <!-- Search -->
+ <string id="30200">Hľadať stanice</string>
+ <string id="30201">Zadajte meno, krajinu alebo jazyk</string>
+
<!-- Settings -->
<string id="30300">Jazyk</string>
<string id="30301">AngliÄtina</string>
<string id="30302">NemÄina</string>
<string id="30303">Francúzština</string>
+ <string id="30310">Vynútiť zobrazenie náhľadov</string>
+
+ <!-- Context Menu -->
+ <string id="30400">Pridať do "Moje stanice"</string>
+ <string id="30401">Odstrániť z "Moje stanice"</string>
+ <string id="30402">Upraviť vlastné stanice</string>
+
+ <!-- Custom Station -->
+ <string id="30500">ProsÃm zadajte %s</string> <!--%s will be filled by
30501, 30502 or 30503 -->
+ <string id="30501">Titul</string>
+ <string id="30502">URL alebo cesta k náhľadu</string>
+ <string id="30503">URL streamu</string>
+ <string id="30504">Pridať vlastné stanice...</string>
+
+ <!-- Error Message -->
+ <string id="30600">Sieťová chyba</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 1715823..d9d7ea6 100644
--- a/plugin.audio.radio_de/resources/language/Spanish (Mexico)/strings.xml
+++ b/plugin.audio.radio_de/resources/language/Spanish (Mexico)/strings.xml
@@ -9,4 +9,8 @@
<string id="30301">Inglés</string>
<string id="30302">Alemán</string>
<string id="30303">Francés</string>
+ <string id="30310">Forzar Modo de Vista a Miniatura</string>
+
+ <!-- Error Message -->
+ <string id="30600">Error de red</string>
</strings>
diff --git a/plugin.audio.radio_de/resources/lib/api.py
b/plugin.audio.radio_de/resources/lib/api.py
index ed32853..33b7745 100644
--- a/plugin.audio.radio_de/resources/lib/api.py
+++ b/plugin.audio.radio_de/resources/lib/api.py
@@ -16,9 +16,10 @@
# 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 simplejson as json
+import json
from urllib import urlencode
from urllib2 import urlopen, Request, HTTPError, URLError
+import random
class RadioApiError(Exception):
@@ -143,20 +144,24 @@ class RadioApi():
def __resolve_playlist(self, stream_url):
self.log('__resolve_playlist started with stream_url=%s'
% stream_url)
+ servers = []
if stream_url.lower().endswith('m3u'):
response = self.__urlopen(stream_url)
self.log('__resolve_playlist found .m3u file')
- for line in response.splitlines():
- if line and not line.strip().startswith('#'):
- stream_url = line.strip()
- break
+ servers = [
+ l for l in response.splitlines()
+ if l.strip() and not l.strip().startswith('#')
+ ]
elif stream_url.lower().endswith('pls'):
response = self.__urlopen(stream_url)
self.log('__resolve_playlist found .pls file')
- for line in response.splitlines():
- if line.strip().startswith('File1'):
- stream_url = line.split('=')[1]
- break
+ servers = [
+ l.split('=')[1] for l in response.splitlines()
+ if l.lower().startswith('file')
+ ]
+ if servers:
+ self.log('__resolve_playlist found %d servers' % len(servers))
+ return random.choice(servers)
return stream_url
def __urlopen(self, url):
@@ -177,29 +182,25 @@ class RadioApi():
def __format_stations(stations):
formated_stations = []
for station in stations:
- if station.get('picture1TransName'):
- thumbnail_trans = (
- station['pictureBaseURL'] + station['picture1TransName']
- ).replace('_1_', '_4_')
- else:
- thumbnail_trans = ''
- if station.get('picture1Name'):
- thumbnail = station['pictureBaseURL'] + station['picture1Name']
- else:
- thumbnail = ''
+ thumbnail = (
+ station.get('picture4TransName') or
+ station.get('picture4Name') or
+ station.get('picture1TransName').replace('_1_', '_4_') or
+ station.get('picture1Name').replace('_1_', '_4_')
+ )
genre = station.get('genresAndTopics') or ','.join(
station.get('genres', []) + station.get('topics', []),
)
formated_stations.append({
'name': station['name'],
- 'thumbnail': thumbnail,
- 'thumbnail_trans': thumbnail,
+ 'thumbnail': station['pictureBaseURL'] + thumbnail,
'rating': station['rating'],
'genre': genre,
'bitrate': station['bitrate'],
'id': station['id'],
'current_track': station['currentTrack'],
- 'stream_url': station.get('streamURL', '')
+ 'stream_url': station.get('streamURL', ''),
+ 'description': station.get('description', '')
})
return formated_stations
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.radio_de/addon.py | 45 +++---------
plugin.audio.radio_de/addon.xml | 76 +++++++++++---------
plugin.audio.radio_de/changelog.txt | 8 ++
plugin.audio.radio_de/icon.png | Bin 7957 -> 12195 bytes
.../resources/language/Albanian/strings.xml | 12 +++
.../resources/language/Amharic/strings.xml | 12 +++
.../resources/language/Basque/strings.xml | 12 +++
.../language/Chinese (Simple)/strings.xml | 10 +++
.../resources/language/Croatian/strings.xml | 3 +
.../resources/language/Danish/strings.xml | 37 +++++++++-
.../resources/language/Dutch/strings.xml | 3 +
.../resources/language/Esperanto/strings.xml | 9 +++
.../resources/language/Estonian/strings.xml | 9 +++
.../resources/language/Finnish/strings.xml | 3 +
.../resources/language/Galician/strings.xml | 43 +++++++++++
.../resources/language/Hebrew/strings.xml | 9 +++
.../language/Hindi (Devanagiri)/strings.xml | 9 +++
.../resources/language/Hungarian/strings.xml | 31 ++++++++
.../resources/language/Indonesian/strings.xml | 9 +++
.../resources/language/Italian/strings.xml | 31 ++++++++
.../resources/language/Japanese/strings.xml | 12 +++
.../resources/language/Korean/strings.xml | 3 +
.../resources/language/Malayalam/strings.xml | 9 +++
.../resources/language/Portuguese/strings.xml | 7 ++
.../resources/language/Romanian/strings.xml | 12 +++
.../resources/language/Slovak/strings.xml | 31 ++++++++
.../language/Spanish (Argentina)/strings.xml | 9 +++
.../language/Spanish (Mexico)/strings.xml | 4 +
.../resources/language/Thai/strings.xml | 9 +++
.../resources/language/Ukrainian/strings.xml | 9 +++
.../resources/language/Vietnamese/strings.xml | 12 +++
plugin.audio.radio_de/resources/lib/api.py | 45 ++++++------
32 files changed, 439 insertions(+), 94 deletions(-)
create mode 100644
plugin.audio.radio_de/resources/language/Albanian/strings.xml
create mode 100644 plugin.audio.radio_de/resources/language/Amharic/strings.xml
create mode 100644 plugin.audio.radio_de/resources/language/Basque/strings.xml
create mode 100644
plugin.audio.radio_de/resources/language/Esperanto/strings.xml
create mode 100644
plugin.audio.radio_de/resources/language/Estonian/strings.xml
create mode 100644
plugin.audio.radio_de/resources/language/Galician/strings.xml
create mode 100644 plugin.audio.radio_de/resources/language/Hebrew/strings.xml
create mode 100644 plugin.audio.radio_de/resources/language/Hindi
(Devanagiri)/strings.xml
create mode 100644
plugin.audio.radio_de/resources/language/Indonesian/strings.xml
create mode 100644
plugin.audio.radio_de/resources/language/Japanese/strings.xml
create mode 100644
plugin.audio.radio_de/resources/language/Malayalam/strings.xml
create mode 100644
plugin.audio.radio_de/resources/language/Romanian/strings.xml
create mode 100644 plugin.audio.radio_de/resources/language/Spanish
(Argentina)/strings.xml
create mode 100644 plugin.audio.radio_de/resources/language/Thai/strings.xml
create mode 100644
plugin.audio.radio_de/resources/language/Ukrainian/strings.xml
create mode 100644
plugin.audio.radio_de/resources/language/Vietnamese/strings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
