[Xbmc-addons] Scripts branch, frodo, updated. 0a6e393f6ebbac4214473bea5720d0e1abc0fc08

Sun, 16 Mar 2014 04:50:37 -0700 

The branch, frodo has been updated
       via  0a6e393f6ebbac4214473bea5720d0e1abc0fc08 (commit)
       via  1aa9c88949bbc7c555ead2fcca46c1f3dea4a5c5 (commit)
      from  feb911ea1a5a4416f84da8855724033ee1a0e40a (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=0a6e393f6ebbac4214473bea5720d0e1abc0fc08

commit 0a6e393f6ebbac4214473bea5720d0e1abc0fc08
Author: sphere <sph...@dersphere.de>
Date:   Sun Mar 16 12:49:18 2014 +0100

    [script.artistslideshow-helper] updated to version 0.3.2

diff --git a/script.artistslideshow-helper/addon.xml 
b/script.artistslideshow-helper/addon.xml
old mode 100644
new mode 100755
index 0651305..a503d30
--- a/script.artistslideshow-helper/addon.xml
+++ b/script.artistslideshow-helper/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.artistslideshow-helper" name="Artist Slideshow Helper" 
version="0.3.1" provider-name="pkscuot">
+<addon id="script.artistslideshow-helper" name="Artist Slideshow Helper" 
version="0.3.2" provider-name="pkscuot">
        <requires>
                <import addon="xbmc.python" version="2.1.0"/>
                <import addon="xbmc.addon" version="12.0.0"/>
@@ -9,15 +9,32 @@
                <provides>executable</provides>
        </extension>
        <extension point="xbmc.addon.metadata">
-               
<website>http://wiki.xbmc.org/index.php?title=Add-on:Artist_Slideshow-Helper</website>
-               <forum>http://forum.xbmc.org/showthread.php?tid=181454</forum>
-               
<source>https://github.com/pkscout/script.artistslideshow-helper</source>
-               <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 
1991</license>
-               <email>artistslideshow.x...@gmail.com</email>
-               <disclaimer></disclaimer>
-               <language></language>
+               <summary lang="de">Hilft bei der Verwaltung von Interpreten-, 
Hintergrund- und Cache-Bilder</summary>
+               <summary lang="el">Βοηθός Διαχείρισης 
Αποθηκευμένων Εικόνων Καλλιτέχνη</summary>
                <summary lang="en">Help manage Artist Slideshow Cache 
Images</summary>
+               <summary lang="es">Ayudar a controlar cache de imágenes de 
presentación de artistas</summary>
+               <summary lang="fr_CA">Aide à gérer la cache des images du 
diaporama des artistes</summary>
+               <summary lang="ko">Artist Slideshow 캐시 이미지 관리 
도우미</summary>
+               <summary lang="nl">Helpt bij het beheren van artiesten diashow 
Cache afbeeldingen</summary>
+               <summary lang="pl">Pomaga zarządzać pokazem slajdów artysty 
pamięci podręcznej</summary>
+               <summary lang="pt">Ajuda a gerir as imagens de cache de Artist 
Slideshow</summary>
+               <summary lang="pt_BR">Ajuda a gerenciar Imagens do cache de 
artistas do script Artist Slideshow</summary>
+               <summary lang="sv">Hantera cachade bilder för 
artistbildspel</summary>
+               <description lang="el">Το Πρόσθετο Artist Slideshow 
Helper παρέχει μια λίστα ονομάτων καλλιτεχνών 
συνδεδεμένων με τον αντίστοιχο φάκελο hash 
στο φάκελο εικόνων του Artist Slideshow, 
προκειμένου να διευκολύνει λίγο τη 
διαχείρισή τους. Σας επιτρέπει, επίσης, να 
μεταφέρετε εικόνες εκτός του φακέλου 
προσωρινής αποθήκευσης, σε κάποιον άλλο 
τοπικό φάκελο.</description>
                <description lang="en">Artist Slideshow Helper provides a list 
artist names matched to their hash directory in your Artist Slideshow image 
directory to make things a little easier to manage.  It also allows you to 
migrate images out of the cache directory into a local directory 
structure.</description>
+               <description lang="es">Artist Slideshow Helper proporciona una 
lista de nombres de los artistas que coinciden con su carpeta de imágenes de 
presentación del artista para hacer las cosas un poco más fáciles de 
manejar. También le permite migrar las imágenes fuera del directorio de 
caché en una estructura de directorio local.</description>
+               <description lang="fr_CA">Artist Slideshow Helper fournit une 
liste des noms d'artistes jumelé à leur répertoire de hachage dans votre 
répertoire d'images du diaporama des artistes pour rendre les choses un peu 
plus facile à gérer. Il vous permet également de migrer des images sur le 
répertoire de cache dans une structure de répertoire local.</description>
+               <description lang="nl">Artiesten divavoorstellingshelper  Biet 
een lijst van artiestennamen aan wat overeenkomt naar hun hashmap, dit in jouw 
artiesten diavoorstelling afbeeldingen map zodat het iets gemakkelijker is te 
beheren. het geeft je ook de mogelijkheid afbeeldingen te verplaatsen uit de 
cache map in een lokale map structuur.</description>
+               <description lang="pl">Artist Slideshow Helper zawiera listę 
hash nazw wykonawców dopasowaną do katalogów pokazu slajdów artysty, co 
pozwala łatwiej zarządzać obrazami. Pozwala również, przenosić zdjęcia z 
katalogu pamięci podręcznej do lokalnej struktury katalogów.</description>
+               <description lang="pt">O Artist Slideshow Helper exibe uma 
lista de nomes de artistas correspondentes aos seus valores hash na pasta de 
imagens Artist Slideshow, tornando tudo mais fácil de gerir. Também permite a 
exportação de imagens da pasta de cache para uma estrutura de pastas 
local.</description>
+               <description lang="pt_BR">Artist Slideshow Helper fornece uma 
lista com nomes de artistas combinados com o seu diretório de hash do 
diretório de imagens do Artist Slideshow para tornar as coisas um pouco mais 
fácil de gerir. Ele também permite que você migre imagens para fora do 
diretório do cache em uma estrutura de diretório local.</description>
+               <description lang="sv">Artistbildspelsassistenten 
tillhandahåller en lista med artistnamn som är hashmatchade till mappar i din 
bildmapp för artistbildspel för att underlätta hanteringen av dem. Den 
hjälper dig också att migrera bilder ut från mappen till en lokal 
mappstruktur.</description>
+               <language></language>
                <platform>all</platform>
+               <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 
1991</license>
+               <forum>http://forum.xbmc.org/showthread.php?tid=181454</forum>
+               
<website>http://wiki.xbmc.org/index.php?title=Add-on:Artist_Slideshow-Helper</website>
+               <email>artistslideshow.x...@gmail.com</email>
+               
<source>https://github.com/pkscout/script.artistslideshow-helper</source>
        </extension>
 </addon>
diff --git a/script.artistslideshow-helper/changelog.txt 
b/script.artistslideshow-helper/changelog.txt
index e4df6ea..3d3f26a 100644
--- a/script.artistslideshow-helper/changelog.txt
+++ b/script.artistslideshow-helper/changelog.txt
@@ -1,3 +1,7 @@
+v.0.3.2
+- fix for incorrect import of json module when python version >= 2.7
+- updated language files
+
 v.0.3.1
 - fixed crash when logging non-text objects
 - changed import process for json and OrderedDict
diff --git a/script.artistslideshow-helper/default.py 
b/script.artistslideshow-helper/default.py
old mode 100644
new mode 100755
index 2b6d283..9525995
--- a/script.artistslideshow-helper/default.py
+++ b/script.artistslideshow-helper/default.py
@@ -6,7 +6,7 @@
 import xbmc, xbmcaddon, xbmcvfs
 import os, sys
 if sys.version_info >= (2, 7):
-    import _json
+    import json as _json
     from collections import OrderedDict as _ordereddict
 else:
     import simplejson as _json
diff --git a/script.artistslideshow-helper/resources/common/transforms.py 
b/script.artistslideshow-helper/resources/common/transforms.py
old mode 100644
new mode 100755
diff --git a/script.artistslideshow-helper/resources/common/url.py 
b/script.artistslideshow-helper/resources/common/url.py
old mode 100644
new mode 100755
index 676fe0d..8e3758a
--- a/script.artistslideshow-helper/resources/common/url.py
+++ b/script.artistslideshow-helper/resources/common/url.py
@@ -1,6 +1,7 @@
-#v.0.1.1
+#v.0.1.6
 
-import requests
+import requests2 as _requests
+import socket
     
 
 class URL():
@@ -31,26 +32,29 @@ class URL():
         urldata = ''
         try:
             if urltype == "get":
-                urldata = requests.get( url, params=params, 
timeout=self.timeout )
+                urldata = _requests.get( url, params=params, 
timeout=self.timeout )
             elif urltype == "post":
-                urldata = requests.post( url, params=params, data=data, 
headers=self.headers, timeout=self.timeout )
+                urldata = _requests.post( url, params=params, data=data, 
headers=self.headers, timeout=self.timeout )
             elif urltype == "delete":
-                urldata = requests.delete( url, params=params, data=data, 
headers=self.headers, timeout=self.timeout )
+                urldata = _requests.delete( url, params=params, data=data, 
headers=self.headers, timeout=self.timeout )
             loglines.append( "the url is: " + urldata.url )
             loglines.append( 'the params are: ')
             loglines.append( params )
             loglines.append( 'the data are: ')
             loglines.append( data )
-        except requests.exceptions.ConnectionError, e:
+        except _requests.exceptions.ConnectionError, e:
             loglines.append( 'site unreachable at ' + url )
             loglines.append( e )
-        except requests.exceptions.Timeout, e:
+        except _requests.exceptions.Timeout, e:
             loglines.append( 'timeout error while downloading from ' + url )
             loglines.append( e )
-        except requests.exceptions.HTTPError, e:
+        except socket.timeout, e:
+            loglines.append( 'timeout error while downloading from ' + url )
+            loglines.append( e )
+        except _requests.exceptions.HTTPError, e:
             loglines.append( 'HTTP Error while downloading from ' + url )
             loglines.append( e )
-        except requests.exceptions.RequestException, e:
+        except _requests.exceptions.RequestException, e:
             loglines.append( 'unknown error while downloading from ' + url )
             loglines.append( e )
         if urldata:
@@ -64,7 +68,10 @@ class URL():
                 elif self.returntype == 'json':
                     data = urldata.json()
             except:
-                data = urldata
+                success = False
+                data = ''
+                loglines.append( 'unable to convert returned object to 
acceptable type' )
+                loglines.append( urldata )
         else:
             success = False
             data = ''
diff --git a/script.artistslideshow-helper/resources/common/xlogger.py 
b/script.artistslideshow-helper/resources/common/xlogger.py
old mode 100644
new mode 100755
diff --git 
a/script.artistslideshow-helper/resources/language/English/strings.po 
b/script.artistslideshow-helper/resources/language/English/strings.po
old mode 100644
new mode 100755
index e5dafb7..01849a9
--- a/script.artistslideshow-helper/resources/language/English/strings.po
+++ b/script.artistslideshow-helper/resources/language/English/strings.po
@@ -16,7 +16,6 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-
 #Dialogs
 
 msgctxt "#30300"
@@ -27,6 +26,8 @@ msgctxt "#30301"
 msgid "beginning work"
 msgstr ""
 
+#empty strings from id 30302 to 30309
+
 msgctxt "#30310"
 msgid "Result"
 msgstr ""
@@ -39,6 +40,8 @@ msgctxt "#30312"
 msgid "unable to create hash list file"
 msgstr ""
 
+#empty strings from id 30313 to 30319
+
 msgctxt "#30320"
 msgid "Error"
 msgstr ""
@@ -47,6 +50,8 @@ msgctxt "#30321"
 msgid "no migration folder defined"
 msgstr ""
 
+#empty strings from id 30322 to 30329
+
 msgctxt "#30330"
 msgid "Result"
 msgstr ""
@@ -55,6 +60,8 @@ msgctxt "#30331"
 msgid "migration of files complete"
 msgstr ""
 
+#empty strings from id 30332 to 30339
+
 msgctxt "#30340"
 msgid "Error"
 msgstr ""
@@ -63,6 +70,8 @@ msgctxt "#30341"
 msgid "no hash list folder defined"
 msgstr ""
 
+#empty strings from id 30342 to 30349
+
 msgctxt "#30350"
 msgid "Error"
 msgstr ""
@@ -71,7 +80,7 @@ msgctxt "#30351"
 msgid "no action specified in settings"
 msgstr ""
 
-
+#empty strings from id 30352 to 32000
 #Settings
 
 msgctxt "#32001"
@@ -105,4 +114,3 @@ msgstr ""
 msgctxt "#32008"
 msgid "copy"
 msgstr ""
-

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=1aa9c88949bbc7c555ead2fcca46c1f3dea4a5c5

commit 1aa9c88949bbc7c555ead2fcca46c1f3dea4a5c5
Author: sphere <sph...@dersphere.de>
Date:   Sun Mar 16 12:45:57 2014 +0100

    [script.artistslideshow] updated to version 1.6.3

diff --git a/script.artistslideshow/addon.xml b/script.artistslideshow/addon.xml
old mode 100644
new mode 100755
index 849f07d..4c1fd5e
--- a/script.artistslideshow/addon.xml
+++ b/script.artistslideshow/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.artistslideshow" name="Artist Slideshow" version="1.6.2" 
provider-name="ronie|pkscuot">
+<addon id="script.artistslideshow" name="Artist Slideshow" version="1.6.3" 
provider-name="ronie|pkscuot">
        <requires>
                <import addon="xbmc.python" version="2.1.0"/>
                <import addon="xbmc.addon" version="12.0.0"/>
@@ -10,13 +10,6 @@
                <provides>executable</provides>
        </extension>
        <extension point="xbmc.addon.metadata">
-               
<website>http://wiki.xbmc.org/index.php?title=Add-on:Artist_Slideshow</website>
-               <forum>http://forum.xbmc.org/showthread.php?t=124880</forum>
-               
<source>https://github.com/pkscout/script.artistslideshow</source>
-               <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 
1991</license>
-               <email>artistslideshow.x...@gmail.com</email>
-               <disclaimer></disclaimer>
-               <language></language>
                <summary lang="ar">حمل المزيد من الصور والم
علومات عن الفنان الذى يُغنِى حالياً</summary>
                <summary lang="be">Download images and additional info of the 
currently playing artist</summary>
                <summary lang="bg">Сваля изображения и 
допълнителна инф. за изпълнителя на 
текущата песен</summary>
@@ -29,7 +22,7 @@
                <summary lang="es_AR">Bajá imágenes e información adicional 
sobre el artista </summary>
                <summary lang="fr">Télécharger les images et les informations 
additionnelles de l'artiste en cours de lecture</summary>
                <summary lang="gl">Descarga imaxes e info. adicional do artista 
que está a soar</summary>
-               <summary lang="he">הורד תמונות ומידע נוסף 
של האמן המנגן עכשיו</summary>
+               <summary lang="he">הורד תמונות ומידע נוסף 
על האמן המושמע כעת</summary>
                <summary lang="hr">Preuzimite slike i dodatne informacije o 
trenutno reproduciranom izvođaču</summary>
                <summary lang="hu">Képeket és kiegészítő információkat 
tölt le a jelenleg játszott előadóról</summary>
                <summary lang="it">Scarica immagini ed informazioni addizionali 
dell'artista attualmente in esecuzione</summary>
@@ -42,12 +35,18 @@
                <summary lang="pt_BR">Transferência de imagens e informações 
adicionais de artistas que estejam sendo reproduzidos</summary>
                <summary lang="ru">Загрузить фото и 
дополнительную информацию об 
воспроизводимом исполнителе</summary>
                <summary lang="sk">Stiahnuť obrázky a dodatočné informácie 
o práve hrajúcich interpretoch</summary>
+               <summary lang="sl">Naložite slike in dodatne informacije, za 
trenutno predvajanega izvajalca</summary>
                <summary lang="sv">Ladda ner bilder samt ytterligare 
information om den spelade artisten</summary>
                <summary lang="zh">下载当前播放艺人的图片和附加
信息</summary>
                <description lang="ar">ملحق يساعدك على 
تَنِزِيل صور ومعلومات إضافيه عن الفنان 
الذى تستمع اليه حالياً من موقع fanart.tv و 
theaudiodb.com و htbackdrops.org. كما يمكنك جعل جلد واجهتك 
الحالى يستخدم كل ما سبق ﻹنشاء عروض شرائح 
للفنان الذى تستمع إليه</description>
+               <description lang="bg">Добавката сваля 
картинки и допълнителна информация от 
www.fanart.tv, www.theaudiodb.com и www.htbackdrops.org за 
изпълнителя който звучи в момента. 
Картинките, заедно с фанарт изображенията 
на изпълнителя, може да се ползват от 
облика, за създаването на слайдшоу за 
изпълнителя, който звучи в момента.</description>
                <description lang="ca">Complement per descarregar imatges i 
informació addicional de fanart.tv, theaudiodb.com i htbackdrops.org de 
l'artista que s'està reproduint. Les imatges, juntament amb les imatges locals 
d'artistes, i la informació, pot ser utilitzada per la pell per crear una 
presentació de diapositives per a l'artista que s'està 
escoltant.</description>
+               <description lang="de">Addon um Bilder und zusätzliche 
Informationen von fanart.tv, theaudiodb.com und htbackdrops.org zum aktuell 
gespielten Künstler herunterzuladen. Diese Bilder können zusammen mit den 
lokalen Künstlerbildern und Infos vom Skin genutzt werden, um eine Slideshow 
für den aktuell angehörten Künstler zu erstellen.</description>
                <description lang="el">Πρόσθετο για τη λήψη 
εικόνων και επιπλέον πληροφοριών από το 
fanart.tv, το theaudiodb.com, και το htbackdrops.com για τον 
τρέχοντα καλλιτέχνη. Οι εικόνες, μαζί με 
τοπικές εικόνες του καλλιτέχνη καθώς και 
πληροφορίες, μπορούν να χρησιμοποιηθούν 
από το κέλυφος για τη δημιουργία παρου
σιάσεων διαφανειών του καλλιτέχνη η μου
σική του οποίου ακούγεται.</description>
                <description lang="en">Addon to download images and additional 
information from fanart.tv, theaudiodb.com, and htbackdrops.org of the 
currently playing artist. The images, along with local artists' images, and 
info can be used by the skin to create a slideshow for the artist being 
listened to.</description>
+               <description lang="es">Addon para descargar imágenes e 
información adicional de fanart.tv, theaudiodb.com y htbackdrops.org del 
artista que se está reproduciendo. Las imágenes, junto con imágenes de 
artistas locales, y la información puede ser utilizada por la piel para crear 
una presentación de diapositivas para el artista que se está 
escuchando.</description>
+               <description lang="gl">Complemento para descargar imaxes e 
información adicional de fanart.tv e theaudiodb.com do artista que está a 
soar. Estas imaxes, xunto cas do artista gardadas en local e a información 
pódeas usar o tema para crear unha presentación. </description>
+               <description lang="he">הרחבה להורדת תמונות 
ומידע נוסף על האמן המושמע כעת מ-fanart.tv, 
theaudiodb.com ו-htbackdrops.org. התמונות, בנוסף לתמונות 
אמנים מקומיות והמידע על אמן יכולים לשמש את 
המעטפת ליצירת מצגת עבור האמן המושמע 
כעת.</description>
                <description lang="hu">A Kiegészítő letölt képeket és 
infromációkat a fanart.tv, theaudiodb.com, és htbackdrops.org oldalakról az 
éppen hallgatott előadóhoz. A képek a helyben tárolt képekkel együtt 
felhasználhatóak a Felszín által diavetítéshez.</description>
                <description lang="it">Addon per scaricare immagini ed 
informazioni aggiuntive da Last.FM, theaudiodb.com e htbackdrops sull'artista 
attualmente in esecuzione. Le immagini possono essere usate dallo skin, insieme 
a quelle locali, per creare una presentazione  per l'artista che si sta 
ascoltando.</description>
                <description lang="ko">현재 재생중인 아티스트의 
이미지와 추가정보를 fanart.tv 와 theaudiodb.com 에서 
다운로드합니다. 다운로드한 이미지와 정보는 로컬 
이미지와 함께 현재 재생중인 음악의 아티스트 
슬라이드쇼에 사용할 수 있습니다.</description>
@@ -55,12 +54,15 @@
                <description lang="pl">Wtyczka pobiera obrazy i dodatkowe 
informacje z fanart.tv, theaudiodb.com oraz htbackdrops.org o aktualnie 
odtwarzanym wykonawcy. Ilustracje, wraz z obrazami i informacjami o artystach, 
mogą być wykorzystywane przez skórę do tworzenia pokazu slajdów dla 
artysty, którego aktualnie słuchasz.</description>
                <description lang="pt">Um add-on para transferir imagens e 
informação adicional do artista em reprodução no momento, a partir de 
fanart.tv, theaudiodb.com, e htbackdrops.org. As imagens e a informação, 
assim como as imagens locais dos artistas, podem ser usadas pelo tema para 
criar uma apresentação de slides do artista em escuta no 
momento.</description>
                <description lang="pt_BR">Addon para download de imagens e 
informações adicionais do artista que está sendo reproduzido provido por 
fanart.tv, theaudiodb e htbackdrops.org.  Tais dados e imagens serão usados 
pelas skins para criarem um slideshow dos artistas quando estivermos 
escutando-os.</description>
-               
<website>http://wiki.xbmc.org/index.php?title=Add-on:Artist_Slideshow</website>
-               <forum>http://forum.xbmc.org/showthread.php?t=124880</forum>
-               
<source>https://github.com/pkscout/script.artistslideshow</source>
-               <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 
1991</license>
-               <email>artistslideshow.x...@gmail.com</email>
+               <description lang="sl">Dodatek za prenos slik in dodatnih 
informacij  iz fanart.tv, theaudiodb.com, in htbackdrops.org za trenutno 
predvajanega izvajalca. Slike, skupaj z lokalnimi slikami izvajalcev ter 
informacije, se lahko uporabljajo s preobleko za ustvarjanje diaprojekcije slik 
izvajalca, ki ga trenutno poslušate.</description>
+               <description lang="sv">Tillägg för att ladda ner bilder och 
tilläggsinformation från fanart.tv, theaudiodb.com och htbackdrops.org om 
artisten som spelas för tillfället. Bilderna, tillsammans med lokala 
artistbilder och information, kan användas av skinnet för att skapa ett 
bildspel av artisten man lyssnar på.</description>
+               <description 
lang="zh">从fanart.tv、theaudiodb.com和htbackdrops.org下载当前播放艺人的图片和附åŠ
 
信息的插件。这此图片可以和本地艺人图片及信息一起，被皮肤用来创建正收听的艺人的幻灯片。</description>
                <language></language>
                <platform>all</platform>
+               <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 
1991</license>
+               <forum>http://forum.xbmc.org/showthread.php?t=124880</forum>
+               
<website>http://wiki.xbmc.org/index.php?title=Add-on:Artist_Slideshow</website>
+               <email>artistslideshow.x...@gmail.com</email>
+               
<source>https://github.com/pkscout/script.artistslideshow</source>
        </extension>
 </addon>
diff --git a/script.artistslideshow/changelog.txt 
b/script.artistslideshow/changelog.txt
old mode 100644
new mode 100755
index beba484..20be240
--- a/script.artistslideshow/changelog.txt
+++ b/script.artistslideshow/changelog.txt
@@ -1,3 +1,12 @@
+v.1.6.3
+- fixed AS not showing images when merging multiple artists' images
+- fixed AS not requesting correct language for bio from Last.FM
+- changes to get more consistent results from external sites
+- fixed crash when viewing artists with extended characters in their name
+- fixed bad searches with artists with extended characters in their name
+- fixed crash when unexpected http response code returned from web site
+- updated language files
+
 v.1.6.2
 - fixed crash from undefined global error in url.py
 - fix for bug that causes crash on socket.timeout in url.py
diff --git a/script.artistslideshow/default.py 
b/script.artistslideshow/default.py
index eb8e881..f2c5346 100755
--- a/script.artistslideshow/default.py
+++ b/script.artistslideshow/default.py
@@ -18,7 +18,7 @@
 # *  htbackdrops:  http://www.htbackdrops.org
 
 import xbmc, xbmcaddon, xbmcgui, xbmcvfs
-import itertools, os, random, re, sys, time, urllib
+import itertools, os, random, re, sys, time
 import xml.etree.ElementTree as _xmltree
 if sys.version_info >= (2, 7):
     import json as _json
@@ -39,7 +39,8 @@ __addonicon__    = xbmc.translatePath('%s/icon.png' % 
__addonpath__ )
 __language__     = __addon__.getLocalizedString
 
 lw      = Logger( '[Artist Slideshow]' )
-mbURL   = URL( 'json',{"User-Agent": __addonname__  + '/' + __addonversion__  
+ '( https://github.com/pkscout/artistslideshow )'} )
+mbURL   = URL( 'json',{"User-Agent": __addonname__  + '/' + __addonversion__  
+ '( https://github.com/pkscout/artistslideshow )', "content-type":
+"text/html; charset=UTF-8"} )
 JSONURL = URL( 'json' )
 txtURL  = URL( 'text' )
 imgURL  = URL( 'binary' )
@@ -235,7 +236,7 @@ class Main:
                 bio = self._get_data( 'theaudiodb', 'bio' )
         if bio == []:
             self.url = self.LastfmURL
-            additionalparams = {'lang=':self.LANGUAGE, 
'method':'artist.getInfo', 'artist': urllib.quote_plus( smartUTF8(self.NAME) )}
+            additionalparams = {'lang':self.LANGUAGE, 
'method':'artist.getInfo', 'artist':self.NAME}  
             self.params = dict( self.LastfmPARAMS.items() + 
additionalparams.items() )
             lw.log( ['trying to get artist bio from ' + self.url] )
             bio = self._get_data('lastfm', 'bio')
@@ -254,14 +255,14 @@ class Main:
                 self.albums = self._get_data('theaudiodb', 'albums')
         if self.albums == []:
             self.url = self.LastfmURL
-            additionalparams = {'method':'artist.getTopAlbums', 
'artist':urllib.quote_plus( smartUTF8( self.NAME ) )} 
+            additionalparams = {'method':'artist.getTopAlbums', 
'artist':self.NAME} 
             self.params = dict( self.LastfmPARAMS.items() + 
additionalparams.items() )
             lw.log( ['trying to get artist albums from ' + self.url] )
             self.albums = self._get_data('lastfm', 'albums')
         self.similar = self._get_local_data( 'similar' )
         if self.similar == []:
             self.url = self.LastfmURL
-            additionalparams = {'method':'artist.getSimilar', 
'artist':urllib.quote_plus( smartUTF8(self.NAME) )} 
+            additionalparams = {'method':'artist.getSimilar', 
'artist':self.NAME} 
             self.params = dict( self.LastfmPARAMS.items() + 
additionalparams.items() )
             self.similar = self._get_data('lastfm', 'similar')
         self._set_properties()
@@ -528,7 +529,7 @@ class Main:
                 return []
         elif site == "htbackdrops":
             self.url = self.HtbackdropsQueryURL
-            additionalparams = 
{'keywords':self.NAME.replace('&','%26').replace(' ', '+')}
+            additionalparams = {'keywords':self.NAME.replace('&','%26')}
             self.params = dict( self.HtbackdropsPARAMS.items() + 
additionalparams.items() )
             lw.log( ['asking for images from: %s' %self.url] )
         images = self._get_data(site, 'images')
@@ -538,7 +539,7 @@ class Main:
     def _get_local_data( self, item ):
         data = []
         filenames = []
-        local_path = os.path.join( self.LOCALARTISTPATH, self.NAME, 'override' 
)
+        local_path = os.path.join( self.LOCALARTISTPATH, 
smartUTF8(self.NAME).decode('utf-8'), 'override' )
         if item == "similar":
             filenames.append( os.path.join( local_path, 'artistsimilar.nfo' ) )
         elif item == "albums":
@@ -586,7 +587,7 @@ class Main:
         if not self.NAME:
             lw.log( ['no artist name provided'] )
             return
-        self.CacheDir = os.path.join( self.LOCALARTISTPATH, self.NAME, 
self.FANARTFOLDER )
+        self.CacheDir = os.path.join( self.LOCALARTISTPATH, 
smartUTF8(self.NAME).decode('utf-8'), self.FANARTFOLDER )
         lw.log( ['cachedir = %s' % self.CacheDir] )
         try:
             files = os.listdir(self.CacheDir)
@@ -643,7 +644,6 @@ class Main:
         for badSubstring in badSubstrings:
             if theartist.startswith(badSubstring):
                 searchartist = theartist.replace(badSubstring, "")
-#        mboptions = 'artist/?fmt=json&query='
         mboptions = {"fmt":"json"} 
         mbsearch = 'artist:"%s"' % searchartist
         query_times = {'last':0, 'current':time.time()}
@@ -713,7 +713,8 @@ class Main:
         while do_loop:
             if mbsearch:
                 mbquery = mbbase + type
-                mboptions['query'] = urllib.quote_plus( smartUTF8(mbsearch), 
':!"' )
+#                mboptions['query'] = urllib.quote_plus( smartUTF8(mbsearch), 
':!"' )
+                mboptions['query'] = mbsearch
             else:
                 mbquery = mbbase + type[:-1]
                 mboptions['offset'] = str(offset)
@@ -876,7 +877,7 @@ class Main:
 
     def _make_dirs( self ):
         checkDir( self.DATAROOT )
-        thedirs = ['temp', 'ArtistSlideShow', 'ArtistInformation', 
'transition']
+        thedirs = ['temp', 'ArtistSlideShow', 'ArtistInformation', 
'transition', 'merge']
         for onedir in thedirs:
             checkDir( os.path.join( self.DATAROOT, onedir ) )
 
@@ -932,7 +933,7 @@ class Main:
                 old_folder = os.path.join( old_loc, folder )
                 new_folder = os.path.join( new_loc, folder )
             elif type == 'local':
-                old_folder = os.path.join( old_loc, folder, self.FANARTFOLDER )
+                old_folder = os.path.join( old_loc, 
smartUTF8(folder).decode('utf-8'), self.FANARTFOLDER )
                 new_folder = os.path.join( new_loc, itemHash(folder) )
             try:
                 old_files = os.listdir( old_folder )
@@ -1306,6 +1307,7 @@ class Main:
         lw.log( loglines )
         if not data:
             self._migrate_info_files()
+        loglines, data = readFile( self.CHECKFILE )
         if data == '1.5.4':
             self._migrate_tbn_files()
 
diff --git a/script.artistslideshow/resources/common/url.py 
b/script.artistslideshow/resources/common/url.py
index 186b621..8e3758a 100755
--- a/script.artistslideshow/resources/common/url.py
+++ b/script.artistslideshow/resources/common/url.py
@@ -1,4 +1,4 @@
-#v.0.1.5
+#v.0.1.6
 
 import requests2 as _requests
 import socket
@@ -68,7 +68,10 @@ class URL():
                 elif self.returntype == 'json':
                     data = urldata.json()
             except:
-                data = urldata
+                success = False
+                data = ''
+                loglines.append( 'unable to convert returned object to 
acceptable type' )
+                loglines.append( urldata )
         else:
             success = False
             data = ''
diff --git a/script.artistslideshow/resources/language/English/strings.po 
b/script.artistslideshow/resources/language/English/strings.po
old mode 100644
new mode 100755
index 10fc84d..27bfd11
--- a/script.artistslideshow/resources/language/English/strings.po
+++ b/script.artistslideshow/resources/language/English/strings.po
@@ -16,6 +16,158 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#Dialog Text
+
+msgctxt "#30300"
+msgid "Downloading"
+msgstr ""
+
+msgctxt "#30301"
+msgid "Downloading artist images"
+msgstr ""
+
+msgctxt "#30302"
+msgid "Nothing Downloaded"
+msgstr ""
+
+msgctxt "#30303"
+msgid "No images found for artist"
+msgstr ""
+
+msgctxt "#30304"
+msgid "Download Complete"
+msgstr ""
+
+msgctxt "#30305"
+msgid "All artist images downloaded"
+msgstr ""
+
+#empty strings from id 30306 to 31999
+#Settings
+
+msgctxt "#32000"
+msgid "Download"
+msgstr ""
+
+msgctxt "#32001"
+msgid "Download images from last.fm"
+msgstr ""
+
+msgctxt "#32002"
+msgid "Download images from htbackdrops.com"
+msgstr ""
+
+msgctxt "#32003"
+msgid "  Minimal image width"
+msgstr ""
+
+msgctxt "#32004"
+msgid "  Minimal image height"
+msgstr ""
+
+msgctxt "#32005"
+msgid "Download additional artist information"
+msgstr ""
+
+msgctxt "#32006"
+msgid "  Preferred language for artist information"
+msgstr ""
+
+msgctxt "#32007"
+msgid "  Download only 16:9 images"
+msgstr ""
+
+msgctxt "#32008"
+msgid "Download images from fanart.tv"
+msgstr ""
+
+msgctxt "#32009"
+msgid "Download images from theaudiodb.com"
+msgstr ""
+
+#empty strings from id 32010 to 32099
+
+msgctxt "#32100"
+msgid "Slideshow"
+msgstr ""
+
+msgctxt "#32101"
+msgid "Local artist folder"
+msgstr ""
+
+msgctxt "#32102"
+msgid "  Image Priority"
+msgstr ""
+
+msgctxt "#32103"
+msgid "Fallback folder"
+msgstr ""
+
+msgctxt "#32104"
+msgid "Override folder"
+msgstr ""
+
+msgctxt "#32105"
+msgid "Use fallback slideshow"
+msgstr ""
+
+msgctxt "#32106"
+msgid "Use override slideshow"
+msgstr ""
+
+#empty strings from id 32107 to 32109
+
+msgctxt "#32110"
+msgid "Use remote images first"
+msgstr ""
+
+msgctxt "#32111"
+msgid "Use local images first"
+msgstr ""
+
+msgctxt "#32112"
+msgid "Use both local and remote images"
+msgstr ""
+
+#empty strings from id 32113 to 32199
+
+msgctxt "#32200"
+msgid "Advanced"
+msgstr ""
+
+msgctxt "#32201"
+msgid "Limit size of download cache"
+msgstr ""
+
+msgctxt "#32202"
+msgid "  Maximum cache size (in megabytes)"
+msgstr ""
+
+msgctxt "#32203"
+msgid "Download notification type"
+msgstr ""
+
+msgctxt "#32204"
+msgid "  Custom notification images folder"
+msgstr ""
+
+msgctxt "#32205"
+msgid "Alternate name for local fanart folder"
+msgstr ""
+
+msgctxt "#32206"
+msgid "None"
+msgstr ""
+
+msgctxt "#32207"
+msgid "Text notifications"
+msgstr ""
+
+msgctxt "#32208"
+msgid "Custom images"
+msgstr ""
+
+#empty strings from id 32209 to 32900
 #Languages
 
 msgctxt "#32901"
@@ -199,151 +351,3 @@ msgstr ""
 msgctxt "#32947"
 msgid "Farsi"
 msgstr ""
-
-#empty strings from id 32948 to 32999
-#Dialog Text
-
-msgctxt "#30300"
-msgid "Downloading"
-msgstr ""
-
-msgctxt "#30301"
-msgid "Downloading artist images"
-msgstr ""
-
-msgctxt "#30329"
-msgid "Nothing Downloaded"
-msgstr ""
-
-msgctxt "#30303"
-msgid "No images found for artist"
-msgstr ""
-
-msgctxt "#30304"
-msgid "Download Complete"
-msgstr ""
-
-msgctxt "#30305"
-msgid "All artist images downloaded"
-msgstr ""
-
-#empty strings from id 30306 to 31999
-#Settings
-
-msgctxt "#32000"
-msgid "Download"
-msgstr ""
-
-msgctxt "#32001"
-msgid "Download images from last.fm"
-msgstr ""
-
-msgctxt "#32002"
-msgid "Download images from htbackdrops.com"
-msgstr ""
-
-msgctxt "#32003"
-msgid "  Minimal image width"
-msgstr ""
-
-msgctxt "#32004"
-msgid "  Minimal image height"
-msgstr ""
-
-msgctxt "#32005"
-msgid "Download additional artist information"
-msgstr ""
-
-msgctxt "#32006"
-msgid "  Preferred language for artist information"
-msgstr ""
-
-msgctxt "#32007"
-msgid "  Download only 16:9 images"
-msgstr ""
-
-msgctxt "#32008"
-msgid "Download images from fanart.tv"
-msgstr ""
-
-msgctxt "#32009"
-msgid "Download images from theaudiodb.com"
-msgstr ""
-
-#empty strings from id 32010 to 32099
-
-msgctxt "#32100"
-msgid "Slideshow"
-msgstr ""
-
-msgctxt "#32101"
-msgid "Local artist folder"
-msgstr ""
-
-msgctxt "#32102"
-msgid "  Image Priority"
-msgstr ""
-
-msgctxt "#32103"
-msgid "Fallback folder"
-msgstr ""
-
-msgctxt "#32104"
-msgid "Override folder"
-msgstr ""
-
-msgctxt "#32105"
-msgid "Use fallback slideshow"
-msgstr ""
-
-msgctxt "#32106"
-msgid "Use override slideshow"
-msgstr ""
-
-msgctxt "#32110"
-msgid "Use remote images first"
-msgstr ""
-
-msgctxt "#32111"
-msgid "Use local images first"
-msgstr ""
-
-msgctxt "#32112"
-msgid "Use both local and remote images"
-msgstr ""
-
-msgctxt "#32200"
-msgid "Advanced"
-msgstr ""
-
-msgctxt "#32201"
-msgid "Limit size of download cache"
-msgstr ""
-
-msgctxt "#32202"
-msgid "  Maximum cache size (in megabytes)"
-msgstr ""
-
-msgctxt "#32203"
-msgid "Download notification type"
-msgstr ""
-
-msgctxt "#32204"
-msgid "  Custom notification images folder"
-msgstr ""
-
-msgctxt "#32205"
-msgid "Alternate name for local fanart folder"
-msgstr ""
-
-msgctxt "#32206"
-msgid "None"
-msgstr ""
-
-msgctxt "#32207"
-msgid "Text notifications"
-msgstr ""
-
-msgctxt "#32208"
-msgid "Custom images"
-msgstr ""
\ No newline at end of file
diff --git a/script.artistslideshow/resources/settings.xml 
b/script.artistslideshow/resources/settings.xml
old mode 100644
new mode 100755

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

Summary of changes:
 script.artistslideshow-helper/addon.xml            |   33 ++-
 script.artistslideshow-helper/changelog.txt        |    4 +
 script.artistslideshow-helper/default.py           |    2 +-
 .../resources/common/url.py                        |   27 +-
 .../resources/language/Dutch/strings.po            |  101 ++++++
 .../resources/language/English/strings.po          |   14 +-
 .../resources/language/Greek/strings.po            |  101 ++++++
 .../resources/language/Polish/strings.po           |  101 ++++++
 .../language/Portuguese (Brazil)/strings.po        |  101 ++++++
 .../resources/language/Portuguese/strings.po       |  101 ++++++
 .../resources/language/Spanish/strings.po          |  101 ++++++
 .../resources/language/Swedish/strings.po          |  101 ++++++
 script.artistslideshow/addon.xml                   |   30 +-
 script.artistslideshow/changelog.txt               |    9 +
 script.artistslideshow/default.py                  |   26 +-
 script.artistslideshow/resources/common/url.py     |    7 +-
 .../resources/language/Catalan/strings.po          |  333 ++++++++++++++++++++
 .../resources/language/Chinese (Simple)/strings.po |  333 ++++++++++++++++++++
 .../language/Chinese (Traditional)/strings.po      |  213 +++++++++++++
 .../resources/language/Dutch/strings.po            |  333 ++++++++++++++++++++
 .../resources/language/English/strings.po          |  300 +++++++++---------
 .../resources/language/French/strings.po           |  321 +++++++++++++++++++
 .../resources/language/Galician/strings.po         |  333 ++++++++++++++++++++
 .../resources/language/German/strings.po           |  333 ++++++++++++++++++++
 .../resources/language/Greek/strings.po            |  333 ++++++++++++++++++++
 .../resources/language/Hebrew/strings.po           |  333 ++++++++++++++++++++
 .../resources/language/Hungarian/strings.po        |  333 ++++++++++++++++++++
 .../resources/language/Italian/strings.po          |  333 ++++++++++++++++++++
 .../resources/language/Korean/strings.po           |  333 ++++++++++++++++++++
 .../resources/language/Polish/strings.po           |  333 ++++++++++++++++++++
 .../language/Portuguese (Brazil)/strings.po        |  333 ++++++++++++++++++++
 .../resources/language/Portuguese/strings.po       |  333 ++++++++++++++++++++
 .../resources/language/Spanish/strings.po          |  333 ++++++++++++++++++++
 .../resources/language/Swedish/strings.po          |  333 ++++++++++++++++++++
 34 files changed, 6490 insertions(+), 198 deletions(-)
 mode change 100644 => 100755 script.artistslideshow-helper/addon.xml
 mode change 100644 => 100755 script.artistslideshow-helper/default.py
 mode change 100644 => 100755 
script.artistslideshow-helper/resources/common/transforms.py
 mode change 100644 => 100755 
script.artistslideshow-helper/resources/common/url.py
 mode change 100644 => 100755 
script.artistslideshow-helper/resources/common/xlogger.py
 create mode 100755 
script.artistslideshow-helper/resources/language/Dutch/strings.po
 mode change 100644 => 100755 
script.artistslideshow-helper/resources/language/English/strings.po
 create mode 100755 
script.artistslideshow-helper/resources/language/Greek/strings.po
 create mode 100755 
script.artistslideshow-helper/resources/language/Polish/strings.po
 create mode 100755 script.artistslideshow-helper/resources/language/Portuguese 
(Brazil)/strings.po
 create mode 100755 
script.artistslideshow-helper/resources/language/Portuguese/strings.po
 create mode 100755 
script.artistslideshow-helper/resources/language/Spanish/strings.po
 create mode 100755 
script.artistslideshow-helper/resources/language/Swedish/strings.po
 mode change 100644 => 100755 script.artistslideshow/addon.xml
 mode change 100644 => 100755 script.artistslideshow/changelog.txt
 create mode 100755 script.artistslideshow/resources/language/Catalan/strings.po
 create mode 100755 script.artistslideshow/resources/language/Chinese 
(Simple)/strings.po
 create mode 100755 script.artistslideshow/resources/language/Chinese 
(Traditional)/strings.po
 create mode 100755 script.artistslideshow/resources/language/Dutch/strings.po
 mode change 100644 => 100755 
script.artistslideshow/resources/language/English/strings.po
 create mode 100755 script.artistslideshow/resources/language/French/strings.po
 create mode 100755 
script.artistslideshow/resources/language/Galician/strings.po
 create mode 100755 script.artistslideshow/resources/language/German/strings.po
 create mode 100755 script.artistslideshow/resources/language/Greek/strings.po
 create mode 100755 script.artistslideshow/resources/language/Hebrew/strings.po
 create mode 100755 
script.artistslideshow/resources/language/Hungarian/strings.po
 create mode 100755 script.artistslideshow/resources/language/Italian/strings.po
 create mode 100755 script.artistslideshow/resources/language/Korean/strings.po
 create mode 100755 script.artistslideshow/resources/language/Polish/strings.po
 create mode 100755 script.artistslideshow/resources/language/Portuguese 
(Brazil)/strings.po
 create mode 100755 
script.artistslideshow/resources/language/Portuguese/strings.po
 create mode 100755 script.artistslideshow/resources/language/Spanish/strings.po
 create mode 100755 script.artistslideshow/resources/language/Swedish/strings.po
 mode change 100644 => 100755 script.artistslideshow/resources/settings.xml


hooks/post-receive
-- 
Scripts


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to