The branch, frodo has been updated
via da09d6def6b5e077402988476c250f24ded760cf (commit)
from 5ed4bf4f1fd401a874434b28548fd8c102f3bb74 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=da09d6def6b5e077402988476c250f24ded760cf
commit da09d6def6b5e077402988476c250f24ded760cf
Author: taxigps <taxi...@sina.com>
Date: Wed Feb 20 10:02:20 2013 +0800
[script.cu.lrclyrics] -v1.0.5
diff --git a/script.cu.lrclyrics/addon.xml b/script.cu.lrclyrics/addon.xml
index d08179f..583a7c7 100644
--- a/script.cu.lrclyrics/addon.xml
+++ b/script.cu.lrclyrics/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.cu.lrclyrics" name="CU LRC Lyrics" version="1.0.4"
provider-name="Taxigps|ronie">
+<addon id="script.cu.lrclyrics" name="CU LRC Lyrics" version="1.0.5"
provider-name="Taxigps|ronie">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.chardet" version="2.1.1"/>
diff --git a/script.cu.lrclyrics/changelog.txt
b/script.cu.lrclyrics/changelog.txt
index c716399..396d557 100644
--- a/script.cu.lrclyrics/changelog.txt
+++ b/script.cu.lrclyrics/changelog.txt
@@ -1,5 +1,10 @@
+v1.0.5
+- fixed can't show lyric right after reselect in list, need reset control
+- handle encode error in scraper GomAudio
+
v1.0.4
- fixed saving lyrics
+- add Korean scraper(Alsong, GomAudio), credit for hojel
v1.0.3
-language update
diff --git a/script.cu.lrclyrics/resources/lib/audiofile.py
b/script.cu.lrclyrics/resources/lib/audiofile.py
index 1a18838..16205db 100644
--- a/script.cu.lrclyrics/resources/lib/audiofile.py
+++ b/script.cu.lrclyrics/resources/lib/audiofile.py
@@ -17,27 +17,27 @@ class AudioFile(object):
def Open(self,file):
self.audioStart = 0
- self.f = xbmcvfs.File(file)
- ext = os.path.splitext(file)[1].lower()
- if ext == '.mp3': self.AnalyzeMp3()
- elif ext == '.ogg': self.AnalyzeOgg()
- elif ext == '.wma': self.AnalyzeWma()
- #elif ext == '.flac': self.AnalyzeFlac()
- elif ext == '.flac': pass
- elif ext == '.ape': pass
- elif ext == '.wav': pass
- else: # not supported format
- self.f.close()
- self.f = None
- raise UnknownFormat
+ self.f = xbmcvfs.File(file)
+ ext = os.path.splitext(file)[1].lower()
+ if ext == '.mp3': self.AnalyzeMp3()
+ elif ext == '.ogg': self.AnalyzeOgg()
+ elif ext == '.wma': self.AnalyzeWma()
+ #elif ext == '.flac': self.AnalyzeFlac()
+ elif ext == '.flac': pass
+ elif ext == '.ape': pass
+ elif ext == '.wav': pass
+ else: # not supported format
+ self.f.close()
+ self.f = None
+ raise UnknownFormat
def Close(self):
self.f.close()
- self.f = None
+ self.f = None
def ReadAudioStream(self, len, offset=0):
- self.f.seek(self.audioStart+offset, 0)
- return self.f.read(len)
+ self.f.seek(self.audioStart+offset, 0)
+ return self.f.read(len)
def AnalyzeMp3(self):
# Searching ID3v2 tag
@@ -85,12 +85,12 @@ class AudioFile(object):
segtbl = struct.unpack('%dB'%numseg, self.f.read(numseg)) #
segment table
for seglen in segtbl:
buf = self.f.read(7) # segment header
- #print "segLen(%s): %d" % (buf[1:7],seglen)
+ #print "segLen(%s): %d" % (buf[1:7],seglen)
if buf == "\x05vorbis":
self.f.seek(-7,1) # rollback
self.audioStart = self.f.seek(0,1)
- return
- self.f.seek(seglen-7,1) # skip to next segment
+ return
+ self.f.seek(seglen-7,1) # skip to next segment
def AnalyzeWma(self):
# Searching GUID
@@ -100,9 +100,9 @@ class AudioFile(object):
raise FormatError
guid = buf.encode("hex");
if guid == "3626b2758e66cf11a6d900aa0062ce6c":
- # ASF_Data_Object
+ # ASF_Data_Object
self.f.seek(-16,1) # rollback
- self.audioStart = self.f.seek(0,1)
+ self.audioStart = self.f.seek(0,1)
return
else:
objlen = struct.unpack('<Q', self.f.read(8))[0]
@@ -110,7 +110,7 @@ class AudioFile(object):
def AnalyzeFlac(self):
if self.f.read(4) != 'fLaC':
- raise UnknownFormat
+ raise UnknownFormat
# Searching GUID
while True:
buf = self.f.read(4)
@@ -120,6 +120,6 @@ class AudioFile(object):
metalen = buf[1] | (buf[2]<<8) | (buf[3]<<16);
self.f.seek(metalen,1) # skip this metadata block
if buf[0] & 0x80:
- # it was the last metadata block
- self.audioStart = self.f.seek(0,1)
+ # it was the last metadata block
+ self.audioStart = self.f.seek(0,1)
return
diff --git a/script.cu.lrclyrics/resources/lib/gui.py
b/script.cu.lrclyrics/resources/lib/gui.py
index 68296ef..9c79b0f 100644
--- a/script.cu.lrclyrics/resources/lib/gui.py
+++ b/script.cu.lrclyrics/resources/lib/gui.py
@@ -301,6 +301,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
while not self.selected:
xbmc.sleep(50)
self.selected = False
+ self.getControl( 110 ).reset()
self.show_lyrics( self.current_lyrics )
if ( __addon__.getSetting( "save_lyrics" ) == "true" ):
success = self.save_lyrics_to_file( self.current_lyrics )
diff --git
a/script.cu.lrclyrics/resources/lib/scrapers/gomaudio/lyricsScraper.py
b/script.cu.lrclyrics/resources/lib/scrapers/gomaudio/lyricsScraper.py
index 17eb922..93eeb0b 100644
--- a/script.cu.lrclyrics/resources/lib/scrapers/gomaudio/lyricsScraper.py
+++ b/script.cu.lrclyrics/resources/lib/scrapers/gomaudio/lyricsScraper.py
@@ -56,8 +56,8 @@ class LyricsFetcher:
if not key:
return None
- url = GOM_URL %(key,
urllib.quote(song.title.decode("utf-8").encode("euc-kr")),
urllib.quote(song.artist.decode("utf-8").encode("euc-kr")))
try:
+ url = GOM_URL %(key,
urllib.quote(song.title.decode("utf-8").encode("euc-kr")),
urllib.quote(song.artist.decode("utf-8").encode("euc-kr")))
response = urllib.urlopen( url )
Page = response.read()
except:
-----------------------------------------------------------------------
Summary of changes:
script.cu.lrclyrics/addon.xml | 2 +-
script.cu.lrclyrics/changelog.txt | 5 ++
script.cu.lrclyrics/resources/lib/audiofile.py | 48 ++++++++++----------
script.cu.lrclyrics/resources/lib/gui.py | 1 +
.../lib/scrapers/gomaudio/lyricsScraper.py | 2 +-
5 files changed, 32 insertions(+), 26 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
