The branch, eden-pre has been updated
via a60cc857f313d09e1b9ca457755f55b2924dffc5 (commit)
from 41ab86b9692f91cb185181de8f4a40d7720dd37f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=a60cc857f313d09e1b9ca457755f55b2924dffc5
commit a60cc857f313d09e1b9ca457755f55b2924dffc5
Author: ronie <[email protected]>
Date: Sun Dec 4 01:21:15 2011 +0100
[script.artistslideshow] -v1.1.4
don't block xbmc on exit
diff --git a/script.artistslideshow/addon.xml b/script.artistslideshow/addon.xml
index 6044755..3e81498 100644
--- 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.1.2"
provider-name="ronie">
+<addon id="script.artistslideshow" name="Artist Slideshow" version="1.1.4"
provider-name="ronie">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.elementtree" version="1.2.7"/>
diff --git a/script.artistslideshow/changelog.txt
b/script.artistslideshow/changelog.txt
index b1937a3..dd77bc4 100644
--- a/script.artistslideshow/changelog.txt
+++ b/script.artistslideshow/changelog.txt
@@ -1,3 +1,9 @@
+v1.1.4
+- make sure we don't block xbmc on exit
+
+v1.1.3
+- add language selection for artists
+
v1.1.2
- added option to download additional artist info
- use elementtree script module
diff --git a/script.artistslideshow/default.py
b/script.artistslideshow/default.py
index ca13007..3fd10ae 100644
--- a/script.artistslideshow/default.py
+++ b/script.artistslideshow/default.py
@@ -9,7 +9,7 @@
# * Last.fm: http://www.last.fm/
# * htbackdrops: http://www.htbackdrops.com/
-import urllib, re, os, sys, time, unicodedata
+import urllib, re, os, sys, time, unicodedata, socket
import xbmc, xbmcgui, xbmcaddon, xbmcvfs
from elementtree import ElementTree as xmltree
@@ -17,6 +17,59 @@ __addon__ = xbmcaddon.Addon()
__addonname__ = __addon__.getAddonInfo('id')
__addonversion__ = __addon__.getAddonInfo('version')
+socket.setdefaulttimeout(10)
+
+LANGUAGES = (
+ # Full Language name[0] podnapisi[1] ISO 639-1[2] ISO 639-1 Code[3]
Script Setting Language[4]
+ ("Albanian" , "29", "sq", "alb",
"0" ),
+ ("Arabic" , "12", "ar", "ara",
"1" ),
+ ("Belarusian" , "0" , "hy", "arm",
"2" ),
+ ("Bosnian" , "10", "bs", "bos",
"3" ),
+ ("Bulgarian" , "33", "bg", "bul",
"4" ),
+ ("Catalan" , "53", "ca", "cat",
"5" ),
+ ("Chinese" , "17", "zh", "chi",
"6" ),
+ ("Croatian" , "38", "hr", "hrv",
"7" ),
+ ("Czech" , "7", "cs", "cze",
"8" ),
+ ("Danish" , "24", "da", "dan",
"9" ),
+ ("Dutch" , "23", "nl", "dut",
"10" ),
+ ("English" , "2", "en", "eng",
"11" ),
+ ("Estonian" , "20", "et", "est",
"12" ),
+ ("Persian" , "52", "fa", "per",
"13" ),
+ ("Finnish" , "31", "fi", "fin",
"14" ),
+ ("French" , "8", "fr", "fre",
"15" ),
+ ("German" , "5", "de", "ger",
"16" ),
+ ("Greek" , "16", "el", "ell",
"17" ),
+ ("Hebrew" , "22", "he", "heb",
"18" ),
+ ("Hindi" , "42", "hi", "hin",
"19" ),
+ ("Hungarian" , "15", "hu", "hun",
"20" ),
+ ("Icelandic" , "6", "is", "ice",
"21" ),
+ ("Indonesian" , "0", "id", "ind",
"22" ),
+ ("Italian" , "9", "it", "ita",
"23" ),
+ ("Japanese" , "11", "ja", "jpn",
"24" ),
+ ("Korean" , "4", "ko", "kor",
"25" ),
+ ("Latvian" , "21", "lv", "lav",
"26" ),
+ ("Lithuanian" , "0", "lt", "lit",
"27" ),
+ ("Macedonian" , "35", "mk", "mac",
"28" ),
+ ("Norwegian" , "3", "no", "nor",
"29" ),
+ ("Polish" , "26", "pl", "pol",
"30" ),
+ ("Portuguese" , "32", "pt", "por",
"31" ),
+ ("PortugueseBrazil" , "48", "pb", "pob",
"32" ),
+ ("Romanian" , "13", "ro", "rum",
"33" ),
+ ("Russian" , "27", "ru", "rus",
"34" ),
+ ("Serbian" , "36", "sr", "scc",
"35" ),
+ ("Slovak" , "37", "sk", "slo",
"36" ),
+ ("Slovenian" , "1", "sl", "slv",
"37" ),
+ ("Spanish" , "28", "es", "spa",
"38" ),
+ ("Swedish" , "25", "sv", "swe",
"39" ),
+ ("Thai" , "0", "th", "tha",
"40" ),
+ ("Turkish" , "30", "tr", "tur",
"41" ),
+ ("Ukrainian" , "46", "uk", "ukr",
"42" ),
+ ("Vietnamese" , "51", "vi", "vie",
"43" ),
+ ("Farsi" , "52", "fa", "per",
"13" ),
+ ("Portuguese (Brazil)" , "48", "pb", "pob",
"32" ),
+ ("Portuguese-BR" , "48", "pb", "pob",
"32" ),
+ ("Brazilian" , "48", "pb", "pob",
"32" ) )
+
def log(txt):
message = 'script.artistslideshow: %s' % txt
xbmc.log(msg=message, level=xbmc.LOGDEBUG)
@@ -40,14 +93,15 @@ def cleanText(text):
return text.strip()
def download(src, dst):
- tmpname = xbmc.translatePath('special://profile/addon_data/%s/temp/%s' % (
__addonname__ , xbmc.getCacheThumbName(src) ))
- if xbmcvfs.exists(tmpname):
- xbmcvfs.delete(tmpname)
- urllib.urlretrieve(src, tmpname)
- if os.path.getsize(tmpname) > 999:
- xbmcvfs.rename(tmpname, dst)
- else:
- xbmcvfs.delete(tmpname)
+ if (not xbmc.abortRequested):
+ tmpname = xbmc.translatePath('special://profile/addon_data/%s/temp/%s'
% ( __addonname__ , xbmc.getCacheThumbName(src) ))
+ if xbmcvfs.exists(tmpname):
+ xbmcvfs.delete(tmpname)
+ urllib.urlretrieve(src, tmpname)
+ if os.path.getsize(tmpname) > 999:
+ xbmcvfs.rename(tmpname, dst)
+ else:
+ xbmcvfs.delete(tmpname)
class Main:
def __init__( self ):
@@ -111,7 +165,12 @@ class Main:
self.LASTFM = __addon__.getSetting( "lastfm" )
self.HTBACKDROPS = __addon__.getSetting( "htbackdrops" )
self.ARTISTINFO = __addon__.getSetting( "artistinfo" )
-
+ self.LANGUAGE = __addon__.getSetting( "language" )
+ for language in LANGUAGES:
+ if self.LANGUAGE == language[4]:
+ self.LANGUAGE = language[2]
+ log('language = %s' % self.LANGUAGE)
+ break
def _init_vars( self ):
self.WINDOW = xbmcgui.Window( 12006 )
@@ -191,9 +250,9 @@ class Main:
log('finished downloading images')
self.DownloadedAllImages = True
self.WINDOW.setProperty("ArtistSlideshowRefresh", "True")
- time.sleep(0.5)
+ time.sleep(0.3)
self.WINDOW.clearProperty("ArtistSlideshow")
- time.sleep(0.1)
+ time.sleep(0.3)
self.WINDOW.setProperty("ArtistSlideshow", self.CacheDir)
self.WINDOW.clearProperty("ArtistSlideshowRefresh")
@@ -218,7 +277,7 @@ class Main:
def _get_artistinfo( self ):
site = "lastfm"
- self.url = self.LastfmURL + '&method=artist.getInfo&artist=' +
self.NAME.replace('&','%26').replace(' ','+')
+ self.url = self.LastfmURL + '&method=artist.getInfo&artist=' +
self.NAME.replace('&','%26').replace(' ','+') + '&lang=' + self.LANGUAGE
bio = self._get_data(site, 'bio')
if bio == []:
self.biography = ''
diff --git a/script.artistslideshow/resources/language/English/strings.xml
b/script.artistslideshow/resources/language/English/strings.xml
index 1ec3a6c..e4a8ffa 100644
--- a/script.artistslideshow/resources/language/English/strings.xml
+++ b/script.artistslideshow/resources/language/English/strings.xml
@@ -1,9 +1,56 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="32000">General</string>
- <string id="32001">Download images from last.fm</string>
- <string id="32002">Download images from htbackdrops.com</string>
- <string id="32003">Minimal image width</string>
- <string id="32004">Minimal image height</string>
- <string id="32005">Download additional artist information</string>
+ <!-- Languages -->
+ <string id="30201">Albanian</string>
+ <string id="30202">Arabic</string>
+ <string id="30203">Belarusian</string>
+ <string id="30204">Bosnian (Latin)</string>
+ <string id="30205">Bulgarian</string>
+ <string id="30206">Catalan</string>
+ <string id="30207">Chinese</string>
+ <string id="30208">Croatian</string>
+ <string id="30209">Czech</string>
+ <string id="30210">Danish</string>
+ <string id="30211">Dutch</string>
+ <string id="30212">English</string>
+ <string id="30213">Estonian</string>
+ <string id="30214">Finnish</string>
+ <string id="30215">French</string>
+ <string id="30216">German</string>
+ <string id="30217">Greek</string>
+ <string id="30218">Hebrew</string>
+ <string id="30219">Hindi</string>
+ <string id="30220">Hungarian</string>
+ <string id="30221">Icelandic</string>
+ <string id="30222">Indonesian</string>
+ <string id="30224">Italian</string>
+ <string id="30225">Japanese</string>
+ <string id="30226">Korean</string>
+ <string id="30227">Latvian</string>
+ <string id="30228">Lithuanian</string>
+ <string id="30229">Macedonian</string>
+ <string id="30230">Norwegian</string>
+ <string id="30232">Polish</string>
+ <string id="30233">Portuguese</string>
+ <string id="30234">Portuguese (Brazil)</string>
+ <string id="30235">Romanian</string>
+ <string id="30236">Russian</string>
+ <string id="30237">SerbianLatin</string>
+ <string id="30238">Slovak</string>
+ <string id="30239">Slovenian</string>
+ <string id="30240">Spanish</string>
+ <string id="30242">Swedish</string>
+ <string id="30243">Thai</string>
+ <string id="30244">Turkish</string>
+ <string id="30245">Ukrainian</string>
+ <string id="30246">Vietnamese</string>
+ <string id="30247">Farsi</string>
+ <!-- Settings -->
+ <string id="32000">General</string>
+ <string id="32001">Download images from last.fm</string>
+ <string id="32002">Download images from htbackdrops.com</string>
+ <string id="32003">Minimal image width</string>
+ <string id="32004">Minimal image height</string>
+ <string id="32005">Download additional artist information</string>
+ <string id="32006">Preferred language for artist information</string>
</strings>
diff --git a/script.artistslideshow/resources/settings.xml
b/script.artistslideshow/resources/settings.xml
index e66ff9d..476f0c5 100644
--- a/script.artistslideshow/resources/settings.xml
+++ b/script.artistslideshow/resources/settings.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<category label="30100">
- <setting id="lastfm" type="bool" label="32001" default="true"/>
- <setting id="htbackdrops" type="bool" label="32002" default="fasle"/>
- <setting id="minwidth" type="text" label="32003" default="0"/>
- <setting id="minheight" type="text" label="32004" default="0"/>
- <setting id="artistinfo" type="bool" label="32005" default="fasle"/>
+ <setting id="lastfm" type="bool" label="32001" default="true"/>
+ <setting id="htbackdrops" type="bool" label="32002" default="false"/>
+ <setting id="minwidth" type="text" label="32003" default="0"/>
+ <setting id="minheight" type="text" label="32004" default="0"/>
+ <setting id="artistinfo" type="bool" label="32005" default="false"/>
+ <setting id="language" type="enum" label="32006" enable="eq(-1,true)"
default="11"
lvalues="30201|30202|30203|30204|30205|30206|30207|30208|30209|30210|30211|30212|30213|30247|30214|30215|30216|30217|30218|30219|30220|30221|30222|30224|30225|30226|30227|30228|30229|30230|30232|30233|30234|30235|30236|30237|30238|30239|30240|30242|30243|30244|30245|30246"/>
</category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
script.artistslideshow/addon.xml | 2 +-
script.artistslideshow/changelog.txt | 6 ++
script.artistslideshow/default.py | 85 +++++++++++++++++---
.../resources/language/English/strings.xml | 59 ++++++++++++--
script.artistslideshow/resources/settings.xml | 11 ++-
5 files changed, 138 insertions(+), 25 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
