The branch, frodo has been updated
       via  3816c912250bbd84f227f56e1b81c083897b2b72 (commit)
      from  3579f8d3c44c1cfe44f5bc8e33fff2d58f831f44 (commit)

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

commit 3816c912250bbd84f227f56e1b81c083897b2b72
Author: sphere <[email protected]>
Date:   Wed May 7 10:00:42 2014 +0200

    [script.artistslideshow] updated to version 1.6.5

diff --git a/script.artistslideshow/addon.xml b/script.artistslideshow/addon.xml
index 65d30dd..89b7536 100755
--- 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.4" 
provider-name="ronie|pkscuot">
+<addon id="script.artistslideshow" name="Artist Slideshow" version="1.6.5" 
provider-name="ronie|pkscuot">
        <requires>
                <import addon="xbmc.python" version="2.1.0"/>
                <import addon="xbmc.addon" version="12.0.0"/>
diff --git a/script.artistslideshow/changelog.txt 
b/script.artistslideshow/changelog.txt
index a515bf5..09d0b97 100755
--- a/script.artistslideshow/changelog.txt
+++ b/script.artistslideshow/changelog.txt
@@ -1,3 +1,7 @@
+v.1.6.5
+- fixed crash during version migration process related to UTF8 characters
+- fixed crash when using cache manager to trim size of image cache
+
 v.1.6.4
 - added full support for remote file systems without mapping drive in OS
 - fix for crash with access violation in random situations
diff --git a/script.artistslideshow/default.py 
b/script.artistslideshow/default.py
index be702f6..51b0258 100755
--- a/script.artistslideshow/default.py
+++ b/script.artistslideshow/default.py
@@ -1050,9 +1050,9 @@ class Main:
         for folder in folders:
             lw.log( ['checking ' + folder] )
             if type == 'cache':
-                thepath = os.path.join( loc, folder )
+                thepath = os.path.join( loc, smartUTF8(folder).decode('utf-8') 
)
             elif type == 'local':
-                thepath = os.path.join( loc, folder, self.FANARTFOLDER )
+                thepath = os.path.join( loc, 
smartUTF8(folder).decode('utf-8'), self.FANARTFOLDER )
             try:
                 dirs, files = xbmcvfs.listdir( thepath )
             except Exception, e:
@@ -1254,13 +1254,13 @@ class Main:
                 lw.log( ['trimming the cache down to %s bytes' % 
self.maxcachesize]  )
                 cache_root = xbmc.translatePath( 
'special://profile/addon_data/%s/ArtistSlideshow/' % __addonname__ 
).decode('utf-8')
                 folders, fls = xbmcvfs.listdir( cache_root )
-                folders.sort( key=lambda x: os.path.getmtime(x), reverse=True )
+                folders.sort( key=lambda x: os.path.getmtime( os.path.join ( 
cache_root, x ) ), reverse=True )
                 cache_size = 0
                 first_folder = True
                 for folder in folders:
                     if( self._playback_stopped_or_changed() ):
                         break
-                    cache_size = cache_size + self._get_folder_size( 
cache_root + folder )
+                    cache_size = cache_size + self._get_folder_size( 
os.path.join (cache_root, folder ) )
                     lw.log( ['looking at folder %s cache size is now %s' % 
(folder, cache_size)] )
                     if( cache_size > self.maxcachesize and not first_folder ):
                         self._clean_dir( os.path.join(cache_root, folder) )

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

Summary of changes:
 script.artistslideshow/addon.xml     |    2 +-
 script.artistslideshow/changelog.txt |    4 ++++
 script.artistslideshow/default.py    |    8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
&#149; 3 signs your SCM is hindering your productivity
&#149; Requirements for releasing software faster
&#149; Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to