The branch, eden has been updated
via a2f0ac88298a5c90d3d257290d1397c8b778c39d (commit)
from 66d7c6e3d22e287ebb2476fe8cc02307b44f1833 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=a2f0ac88298a5c90d3d257290d1397c8b778c39d
commit a2f0ac88298a5c90d3d257290d1397c8b778c39d
Author: ronie <[email protected]>
Date: Tue Oct 2 21:20:14 2012 +0200
[script.tvtunes] -v2.0.5
fix unicodedecode errors
diff --git a/script.tvtunes/addon.xml b/script.tvtunes/addon.xml
index b4ac8a0..69c043b 100644
--- a/script.tvtunes/addon.xml
+++ b/script.tvtunes/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.tvtunes"
name="TvTunes"
- version="2.0.0"
+ version="2.0.5"
provider-name="Ppic, Frost, ronie">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -15,13 +15,16 @@
<language/>
<platform>all</platform>
<summary lang="en">Get and play your Tv shows sound Theme</summary>
- <summary lang="fr">Récupérez et écoutez les génériques des séries de
votre bibliothèque</summary>
<summary lang="es">Descarga y reproduce las bandas sonoras de las series
de tu biblioteca</summary>
+ <summary lang="fr">Récupérez et écoutez les génériques des séries de
votre bibliothèque</summary>
+ <summary lang="pt">TVTunes obtém e reproduz seus temas de
Seriados</summary>
<description lang="en">This script will help you to get theme of your
tvshow library from www.televisiontunes.com it will save them in theme.mp3 file
in each of your tvshow folder then they will be play while browsing your tvshow
library when you enter the tvshow folder (need your skin to be compatible for
this feature)</description>
- <description lang="fr">Ce script vous aidera à télécharger vos
génériques de série depuis www.televisiontunes.com Il les enregistrera dans
un fichier theme.mp3 dans vos répertoires de série, ils seront ensuite joué
lorsque vous entrerez dans la série correspondante (cette fonctionalité
requiert une skin compatible</description>
<description lang="es">Este script te ayudará a buscar la banda sonora de
tus series en www.televisiontunes.com se guardará un fichero theme.mp3 en el
directorio de tu serie y será reproducido mientras navegas por dentro de la
carpeta de la serie. (Necesitas una skin compatible para esta
funcionalidad)</description>
+ <description lang="fr">Ce script vous aidera à télécharger vos
génériques de série depuis www.televisiontunes.com Il les enregistrera dans
un fichier theme.mp3 dans vos répertoires de série, ils seront ensuite joué
lorsque vous entrerez dans la série correspondante (cette fonctionalité
requiert une skin compatible</description>
+ <description lang="pt">Este script irá ajudá-lo a obter os temas de sua
biblioteca de Seriados de televisiontunes.com. Ele vai salvá-los em um arquivo
theme.mp3 nas respectivas pastas e reproduzÃ-los enquanto você navega entre
as temporadas e episódios (necessário skin compatÃvel).</description>
<disclaimer lang="en">Skinners, please see changelog.txt to know how to
integrate it in your skin</disclaimer>
- <disclaimer lang="fr">Skinneurs, lisez le changelog.txt pour obtenir les
infos pour l'intégrer à votre skin</disclaimer>
<disclaimer lang="es">Skinners, por favor, revisad changelog.txt para
saber como integrarlo en vuestras skins</disclaimer>
+ <disclaimer lang="fr">Skinneurs, lisez le changelog.txt pour obtenir les
infos pour l'intégrer à votre skin</disclaimer>
+ <disclaimer lang="pt">Skinners, favor ver o changelog.txt para saber como
integrar TVTunes em sua skin.</disclaimer>
</extension>
</addon>
diff --git a/script.tvtunes/changelog.txt b/script.tvtunes/changelog.txt
index 5306e25..01be440 100644
--- a/script.tvtunes/changelog.txt
+++ b/script.tvtunes/changelog.txt
@@ -1,3 +1,22 @@
+v2.0.5
+- fix unicodedecode error when downloading theme
+
+v2.0.4
+- fix unicodedecode errors
+- fix progressdialog wouldn't close at the end of the download
+
+v2.0.3
+- fade tunes when navigating back to the tv show list
+
+v2.0.2
+- catch unicode encode errors
+- add portuguese translation
+- add spanish translation
+
+v2.0.1
+- add scriptname to logging
+- fix unicode encode errors
+
v2.0.0
- add frost to credits
diff --git a/script.tvtunes/default.py b/script.tvtunes/default.py
index 2d3361f..c3c18c9 100644
--- a/script.tvtunes/default.py
+++ b/script.tvtunes/default.py
@@ -4,6 +4,7 @@ import os
import xbmcaddon
__addon__ = xbmcaddon.Addon()
+__addonid__ = __addon__.getAddonInfo('id')
__addonname__ = __addon__.getAddonInfo('name')
__cwd__ = __addon__.getAddonInfo('path')
__author__ = __addon__.getAddonInfo('author')
@@ -13,8 +14,9 @@ __language__ = __addon__.getLocalizedString
RESOURCES_PATH = xbmc.translatePath( os.path.join( __cwd__, 'resources' )
).decode('utf-8')
sys.path.append( RESOURCES_PATH )
-def log(msg):
- xbmc.log( str( msg ),level=xbmc.LOGDEBUG )
+def log(txt):
+ message = '%s: %s' % (__addonid__, txt)
+ xbmc.log(msg=str(message), level=xbmc.LOGDEBUG)
log( "### %s starting ..." % __addonname__ )
log( "### author: %s" % __author__ )
@@ -40,11 +42,11 @@ if params.get("backend", False ):
downvolume = downvolume.split(".")[0]
if xbmc.getInfoLabel( "Window(10025).Property(TvTunesIsRunning)" ) !=
"true":
#log(
'########################################################################%s,loop=%s&downvolume=%s&smb=%s&user=%spassword=%s'
% (os.path.join( RESOURCES_PATH , "tvtunes_backend.py"), loop , downvolume ,
smb , username , password) )
-
xbmc.executebuiltin('XBMC.RunScript(%s,loop=%s&downvolume=%s&smb=%s&user=%s&password=%s)'
% (os.path.join( RESOURCES_PATH , "tvtunes_backend.py"), loop , downvolume ,
smb , username , password))
+
xbmc.executebuiltin('XBMC.RunScript(%s,loop=%s&downvolume=%s&smb=%s&user=%s&password=%s)'
% (str(os.path.join( RESOURCES_PATH , "tvtunes_backend.py")), loop ,
downvolume , smb , username , password))
elif params.get("mode", False ) == "solo":
log( "### params %s" % params )
- xbmc.executebuiltin('XBMC.RunScript(%s,mode=solo&name=%s&path=%s)' %
(os.path.join( RESOURCES_PATH , "tvtunes_scraper.py") , params.get("tvname",
False ) , params.get("tvpath", False ) ) )
+ xbmc.executebuiltin('XBMC.RunScript(%s,mode=solo&name=%s&path=%s)' %
(str(os.path.join( RESOURCES_PATH , "tvtunes_scraper.py")) ,
params.get("tvname", False ) , params.get("tvpath", False ) ) )
else:
log( "### %s v%s" % ( __addon__.getAddonInfo("id") ,
__addon__.getAddonInfo("version") ) )
diff --git a/script.tvtunes/resources/tvtunes_backend.py
b/script.tvtunes/resources/tvtunes_backend.py
index 4068df3..18f320a 100644
--- a/script.tvtunes/resources/tvtunes_backend.py
+++ b/script.tvtunes/resources/tvtunes_backend.py
@@ -12,9 +12,14 @@ import xbmcvfs
import xbmcaddon
__addon__ = xbmcaddon.Addon(id='script.tvtunes')
+__addonid__ = __addon__.getAddonInfo('id')
-def log(msg):
- xbmc.log( str( msg ),level=xbmc.LOGDEBUG )
+def log(txt):
+ message = '%s: %s' % (__addonid__, txt)
+ try:
+ xbmc.log(msg=message, level=xbmc.LOGDEBUG)
+ except:
+ xbmc.log(msg='UnicodeDecodeError', level=xbmc.LOGDEBUG)
try:
# parse sys.argv for params
@@ -70,10 +75,9 @@ class mythread( threading.Thread ):
self.oldpath = ""
self.playpath = ""
log( "### stop playing" )
- xbmc.Player().stop()
+ self.fade_out()
if self.loud: self.raise_volume()
xbmcgui.Window( 10025 ).clearProperty('TvTunesIsAlive')
-
time.sleep( .5 )
except:
print_exc()
@@ -105,6 +109,26 @@ class mythread( threading.Thread ):
xbmc.executebuiltin( 'XBMC.SetVolume(%d)' % vol )
self.loud = False
+ def fade_out( self ):
+ cur_vol = self.get_volume()
+ cur_vol_prec = 100 + (cur_vol * (100/60.0))
+ vol_step = cur_vol_prec / 10
+ # do not mute completely else the mute icon shows up
+ for step in range (0,9):
+ vol = cur_vol_prec - vol_step
+ log( "### vol: %s" % str(vol) )
+ xbmc.executebuiltin('XBMC.SetVolume(%d)' % vol)
+ cur_vol_prec = vol
+ xbmc.sleep(200)
+ xbmc.Player().stop()
+ # wait till player is stopped before raising the volume
+ while xbmc.Player().isPlaying():
+ xbmc.sleep(50)
+ pre_vol_prec = 100 + (cur_vol * (100/60.0))
+ xbmc.executebuiltin('XBMC.SetVolume(%d)' % pre_vol_prec)
+ # wait till xbmc has adjusted the volume before continuing
+ xbmc.sleep(200)
+
def start_playing( self ):
if params.get("smb", "false" ) == "true" and
self.newpath.startswith("smb://") :
log( "### Try authentification share" )
diff --git a/script.tvtunes/resources/tvtunes_scraper.py
b/script.tvtunes/resources/tvtunes_scraper.py
index aee0d57..6d9707c 100644
--- a/script.tvtunes/resources/tvtunes_scraper.py
+++ b/script.tvtunes/resources/tvtunes_scraper.py
@@ -19,8 +19,12 @@ __addonid__ = __addon__.getAddonInfo('id')
__cwd__ = __addon__.getAddonInfo('path')
__language__ = __addon__.getLocalizedString
-def log(msg):
- xbmc.log( str( msg ),level=xbmc.LOGDEBUG )
+def log(txt):
+ message = '%s: %s' % (__addonid__, txt)
+ try:
+ xbmc.log(msg=message, level=xbmc.LOGDEBUG)
+ except:
+ xbmc.log(msg='UnicodeDecodeError', level=xbmc.LOGDEBUG)
try:
# parse sys.argv for params
@@ -88,22 +92,22 @@ class TvTunes:
self.scan(params.get("name", "" ),params.get("path", "false" ))
else:
self.scan()
+ self.DIALOG_PROGRESS.close()
def scan(self , cur_name=False , cur_path=False):
count = 0
if cur_name and cur_path:
log( "### solo mode" )
-
log("####################### %s" % cur_name )
log("####################### %s" % cur_path )
- self.TVlist = [[cur_name,cur_path.encode('utf-8')]]
+ self.TVlist = [[cur_name,cur_path]]
total = len(self.TVlist)
for show in self.TVlist:
count = count + 1
if not self.ERASE and
xbmcvfs.exists(os.path.join(show[1],"theme.mp3")):
log( "### %s already exists, ERASE is set to %s" % (
os.path.join(show[1],"theme.mp3"), [False,True][self.ERASE] ) )
else:
- self.DIALOG_PROGRESS.update( (count*100)/total ,
__language__(32107) + ' ' + show[0] , "")
+ self.DIALOG_PROGRESS.update( (count*100)/total ,
str(__language__(32107)) + ' ' + show[0] , "")
if self.DIALOG_PROGRESS.iscanceled():
self.DIALOG_PROGRESS.close()
xbmcgui.Dialog().ok(__language__(32108),__language__(32109))
@@ -122,7 +126,7 @@ class TvTunes:
def _report_hook( count, blocksize, totalsize ):
percent = int( float( count * blocksize * 100 ) / totalsize )
strProgressBar = str( percent )
- self.DIALOG_PROGRESS.update( percent , __language__(32110) + '
' + theme_url , __language__(32111) + ' ' + destination )
+ self.DIALOG_PROGRESS.update( percent ,
str(__language__(32110)) + ' ' + theme_url , str(__language__(32111)) + ' ' +
destination )
if not xbmcvfs.exists(path):
try:
xbmcvfs.mkdir(path)
@@ -150,7 +154,7 @@ class TvTunes:
theme_list.insert(0 , searchdic)
while theme_url == False:
- select = xbmcgui.Dialog().select(__language__(32112) + ' ' +
searchname, [ theme["name"] for theme in theme_list ])
+ select = xbmcgui.Dialog().select(str(__language__(32112)) + ' ' +
searchname, [ theme["name"] for theme in theme_list ])
if select == -1:
log( "### Canceled by user" )
#xbmcgui.Dialog().ok("Canceled" , "Download canceled by user" )
-----------------------------------------------------------------------
Summary of changes:
script.tvtunes/addon.xml | 11 ++++++---
script.tvtunes/changelog.txt | 19 ++++++++++++++++
script.tvtunes/default.py | 10 +++++---
script.tvtunes/resources/tvtunes_backend.py | 32 +++++++++++++++++++++++---
script.tvtunes/resources/tvtunes_scraper.py | 18 +++++++++------
5 files changed, 71 insertions(+), 19 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
