The branch, eden has been updated
       via  bbaeebca6bfa32645f843524cc3e45ad3598b5a3 (commit)
      from  a610197bea6ef7f09ce3a86eea2ba934d15af639 (commit)

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

commit bbaeebca6bfa32645f843524cc3e45ad3598b5a3
Author: taxigps <[email protected]>
Date:   Mon Nov 19 16:09:46 2012 +0800

    [script.lrclyrics] -v1.4.7

diff --git a/script.lrclyrics/addon.xml b/script.lrclyrics/addon.xml
index 2de8089..62a5021 100644
--- a/script.lrclyrics/addon.xml
+++ b/script.lrclyrics/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.lrclyrics"
        name="LRC Lyrics"
-       version="1.4.6"
+       version="1.4.7"
        provider-name="Taxigps">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
diff --git a/script.lrclyrics/changelog.txt b/script.lrclyrics/changelog.txt
index cb1d0a5..8c3279a 100644
--- a/script.lrclyrics/changelog.txt
+++ b/script.lrclyrics/changelog.txt
@@ -1,4 +1,8 @@
-[B]1.4.6 (2012.11.18)[/B]
+[B]1.4.7 (2012.11.19)[/B]
+fixed: handle I/O error
+fixed: TXXX(Lyrics) load error
+
+[B]1.4.6 (2012.11.18)[/B]
 fixed: can't change lyrics when skip to next song
 fixed: encoding error and lrc error by additional \n\r with SYLT lyrics
 
diff --git a/script.lrclyrics/resources/lib/embedlrc.py 
b/script.lrclyrics/resources/lib/embedlrc.py
index 2be0e38..67c126a 100644
--- a/script.lrclyrics/resources/lib/embedlrc.py
+++ b/script.lrclyrics/resources/lib/embedlrc.py
@@ -3,16 +3,19 @@ import chardet
 from tagger import *
 
 def getEmbedLyrics(filename):
-    lyrics = getLyrics3(filename)
-    if (not lyrics):
-        lyrics = getID3Lyrics(filename)
-    if (lyrics):
-        enc = chardet.detect(lyrics)
-        if (enc['encoding'] == 'utf-8'):
-            return lyrics
-        else:
-            return unicode( lyrics, enc['encoding'] ).encode( "utf-8")
-    return None
+    try:
+        lyrics = getLyrics3(filename)
+        if (not lyrics):
+            lyrics = getID3Lyrics(filename)
+        if (lyrics):
+            enc = chardet.detect(lyrics)
+            if (enc['encoding'] == 'utf-8'):
+                return lyrics
+            else:
+                return unicode( lyrics, enc['encoding'] ).encode( "utf-8")
+        return None
+    except IOError:
+        return None
 
 """
 Get LRC lyrics embed with Lyrics3/Lyrics3V2 format

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

Summary of changes:
 script.lrclyrics/addon.xml                 |    2 +-
 script.lrclyrics/changelog.txt             |    6 +++++-
 script.lrclyrics/resources/lib/embedlrc.py |   23 +++++++++++++----------
 3 files changed, 19 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to