The branch, frodo has been updated
via a7197996fb8a2dbf4665243b9dc35f50864ef336 (commit)
from e66a9907f2b8e3abe6b948b5b1ad3df4f04e6bc2 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=a7197996fb8a2dbf4665243b9dc35f50864ef336
commit a7197996fb8a2dbf4665243b9dc35f50864ef336
Author: taxigps <[email protected]>
Date: Mon Dec 10 13:06:14 2012 +0800
[script.cu.lrclyrics] v1.0.1
diff --git a/script.cu.lrclyrics/addon.xml b/script.cu.lrclyrics/addon.xml
index 5ff15ea..72d9c8a 100644
--- a/script.cu.lrclyrics/addon.xml
+++ b/script.cu.lrclyrics/addon.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.cu.lrclyrics" name="CU LRC Lyrics" version="1.0.0"
provider-name="Taxigps, ronie">
+<addon id="script.cu.lrclyrics" name="CU LRC Lyrics" version="1.0.1"
provider-name="Taxigps, ronie">
<requires>
<import addon="xbmc.python" version="2.1"/>
+ <import addon="script.module.chardet" version="2.1.1"/>
</requires>
<extension point="xbmc.python.lyrics" library="default.py"/>
<extension point="xbmc.addon.metadata">
diff --git a/script.cu.lrclyrics/changelog.txt
b/script.cu.lrclyrics/changelog.txt
index e6c6c19..febde43 100644
--- a/script.cu.lrclyrics/changelog.txt
+++ b/script.cu.lrclyrics/changelog.txt
@@ -1,3 +1,8 @@
+v1.0.1
+- fixed can't change lyric for track in cue/ape file
+- fixed decode error in scrape minilyrics
+- added requires for script.module.chardet
+
v1.0.0
- initial release
diff --git a/script.cu.lrclyrics/resources/lib/gui.py
b/script.cu.lrclyrics/resources/lib/gui.py
index f249db1..68e2eba 100644
--- a/script.cu.lrclyrics/resources/lib/gui.py
+++ b/script.cu.lrclyrics/resources/lib/gui.py
@@ -349,7 +349,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
else:
for cnt in range( 5 ):
song = Song.current()
- if ( song and ( self.current_lyrics.song.filepath !=
song.filepath ) ):
+ if ( song and ( self.current_lyrics.song != song ) ):
self.stop_refresh()
lyrics = self.get_lyrics( song )
self.current_lyrics = lyrics
diff --git
a/script.cu.lrclyrics/resources/lib/scrapers/minilyrics/lyricsScraper.py
b/script.cu.lrclyrics/resources/lib/scrapers/minilyrics/lyricsScraper.py
index 15b7841..7cec25b 100644
--- a/script.cu.lrclyrics/resources/lib/scrapers/minilyrics/lyricsScraper.py
+++ b/script.cu.lrclyrics/resources/lib/scrapers/minilyrics/lyricsScraper.py
@@ -125,7 +125,5 @@ class LyricsFetcher:
))
return None
enc = chardet.detect(lyrics)
- if (enc['encoding'] == 'utf-8'):
- return lyrics
- else:
- return unicode( lyrics, enc['encoding'] ).encode( "utf-8")
+ lyrics = lyrics.decode(enc['encoding'], 'ignore')
+ return lyrics
-----------------------------------------------------------------------
Summary of changes:
script.cu.lrclyrics/addon.xml | 3 +-
script.cu.lrclyrics/changelog.txt | 5 +
.../resources/lib/chardet/__init__.py | 26 -
.../resources/lib/chardet/big5freq.py | 923 --------------------
.../resources/lib/chardet/big5prober.py | 41 -
.../resources/lib/chardet/chardistribution.py | 200 -----
.../resources/lib/chardet/charsetgroupprober.py | 96 --
.../resources/lib/chardet/charsetprober.py | 60 --
.../resources/lib/chardet/codingstatemachine.py | 59 --
.../resources/lib/chardet/constants.py | 47 -
.../resources/lib/chardet/escprober.py | 79 --
script.cu.lrclyrics/resources/lib/chardet/escsm.py | 240 -----
.../resources/lib/chardet/eucjpprober.py | 85 --
.../resources/lib/chardet/euckrfreq.py | 594 -------------
.../resources/lib/chardet/euckrprober.py | 41 -
.../resources/lib/chardet/euctwfreq.py | 426 ---------
.../resources/lib/chardet/euctwprober.py | 41 -
.../resources/lib/chardet/gb2312freq.py | 471 ----------
.../resources/lib/chardet/gb2312prober.py | 41 -
.../resources/lib/chardet/hebrewprober.py | 269 ------
.../resources/lib/chardet/jisfreq.py | 567 ------------
.../resources/lib/chardet/jpcntx.py | 216 -----
.../resources/lib/chardet/langbulgarianmodel.py | 228 -----
.../resources/lib/chardet/langcyrillicmodel.py | 329 -------
.../resources/lib/chardet/langgreekmodel.py | 225 -----
.../resources/lib/chardet/langhebrewmodel.py | 201 -----
.../resources/lib/chardet/langhungarianmodel.py | 225 -----
.../resources/lib/chardet/langthaimodel.py | 200 -----
.../resources/lib/chardet/latin1prober.py | 139 ---
.../resources/lib/chardet/mbcharsetprober.py | 82 --
.../resources/lib/chardet/mbcsgroupprober.py | 50 --
.../resources/lib/chardet/mbcssm.py | 514 -----------
.../resources/lib/chardet/sbcharsetprober.py | 109 ---
.../resources/lib/chardet/sbcsgroupprober.py | 64 --
.../resources/lib/chardet/sjisprober.py | 85 --
.../resources/lib/chardet/universaldetector.py | 160 ----
.../resources/lib/chardet/utf8prober.py | 76 --
script.cu.lrclyrics/resources/lib/gui.py | 2 +-
.../lib/scrapers/minilyrics/lyricsScraper.py | 6 +-
39 files changed, 10 insertions(+), 7215 deletions(-)
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/__init__.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/big5freq.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/big5prober.py
delete mode 100644
script.cu.lrclyrics/resources/lib/chardet/chardistribution.py
delete mode 100644
script.cu.lrclyrics/resources/lib/chardet/charsetgroupprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/charsetprober.py
delete mode 100644
script.cu.lrclyrics/resources/lib/chardet/codingstatemachine.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/constants.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/escprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/escsm.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/eucjpprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/euckrfreq.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/euckrprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/euctwfreq.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/euctwprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/gb2312freq.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/gb2312prober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/hebrewprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/jisfreq.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/jpcntx.py
delete mode 100644
script.cu.lrclyrics/resources/lib/chardet/langbulgarianmodel.py
delete mode 100644
script.cu.lrclyrics/resources/lib/chardet/langcyrillicmodel.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/langgreekmodel.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/langhebrewmodel.py
delete mode 100644
script.cu.lrclyrics/resources/lib/chardet/langhungarianmodel.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/langthaimodel.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/latin1prober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/mbcharsetprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/mbcsgroupprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/mbcssm.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/sbcharsetprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/sbcsgroupprober.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/sjisprober.py
delete mode 100644
script.cu.lrclyrics/resources/lib/chardet/universaldetector.py
delete mode 100644 script.cu.lrclyrics/resources/lib/chardet/utf8prober.py
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
