The branch, gotham has been updated
via 6a6e1512f891e4c2bd7542e66eeadfadcf39bb27 (commit)
from 3aacd7a92525afddb96351f9cc688b446023e16b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=6a6e1512f891e4c2bd7542e66eeadfadcf39bb27
commit 6a6e1512f891e4c2bd7542e66eeadfadcf39bb27
Author: ronie <ronie>
Date: Tue Oct 7 00:35:41 2014 +0200
script.cu.lrclyrics 2.0.12
diff --git a/script.cu.lrclyrics/addon.xml b/script.cu.lrclyrics/addon.xml
index 68033ea..6fd0015 100644
--- a/script.cu.lrclyrics/addon.xml
+++ b/script.cu.lrclyrics/addon.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.cu.lrclyrics" name="CU LRC Lyrics" version="2.0.11"
provider-name="Taxigps|ronie">
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="script.cu.lrclyrics" name="CU LRC Lyrics" version="2.0.12"
provider-name="Taxigps|ronie">
<requires>
<import addon="xbmc.python" version="2.12.0"/>
<import addon="script.module.chardet" version="2.1.2"/>
+ <import addon="script.module.simplejson" version="3.3.0"/>
</requires>
<extension point="xbmc.python.lyrics" library="default.py"/>
<extension point="xbmc.service" library="default.py" start="login"/>
diff --git a/script.cu.lrclyrics/changelog.txt
b/script.cu.lrclyrics/changelog.txt
index 9f02f4e..cb88587 100644
--- a/script.cu.lrclyrics/changelog.txt
+++ b/script.cu.lrclyrics/changelog.txt
@@ -1,3 +1,8 @@
+v2.0.12
+- fix .xml name
+- fix detection of text based Lyrics3 tags
+- fix some lrc lyrics did not work (time tag not recognised)
+
v2.0.11
- fix wikilyric scraper
diff --git a/script.cu.lrclyrics/resources/lib/embedlrc.py
b/script.cu.lrclyrics/resources/lib/embedlrc.py
index 81731e9..e8a4f2f 100644
--- a/script.cu.lrclyrics/resources/lib/embedlrc.py
+++ b/script.cu.lrclyrics/resources/lib/embedlrc.py
@@ -33,7 +33,7 @@ def getEmbedLyrics(song, getlrc):
return lyrics
"""
-Get LRC lyrics embed with Lyrics3/Lyrics3V2 format
+Get lyrics embed with Lyrics3/Lyrics3V2 format
See: http://id3.org/Lyrics3
http://id3.org/Lyrics3v2
"""
@@ -50,7 +50,8 @@ def getLyrics3(filename):
buf = f.read(5100+11)
f.close();
start = buf.find("LYRICSBEGIN")
- return buf[start+11:]
+ if (getlrc and content.startswith('[')) or (not getlrc and not
content.startswith('[')):
+ return buf[start+11:]
elif (buf == "LYRICS200"):
""" Find Lyrics3v2 """
f.seek(-9-6, os.SEEK_CUR)
@@ -65,7 +66,8 @@ def getLyrics3(filename):
length = int(buf[3:8])
content = buf[8:8+length]
if (tag == 'LYR'):
- return content
+ if (getlrc and content.startswith('[')) or (not getlrc and
not content.startswith('[')):
+ return content
buf = buf[8+length:]
f.close();
return None
diff --git a/script.cu.lrclyrics/resources/lib/gui.py
b/script.cu.lrclyrics/resources/lib/gui.py
index 098cc3e..6a05624 100644
--- a/script.cu.lrclyrics/resources/lib/gui.py
+++ b/script.cu.lrclyrics/resources/lib/gui.py
@@ -385,7 +385,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
def parser_lyrics(self, lyrics):
self.pOverlay = []
- tag = re.compile('\[(\d+):(\d\d)(\.\d+|)\]')
+ tag = re.compile('\[(\d+):(\d\d)([\.:]\d+|)\]')
lyrics = lyrics.replace( "\r\n" , "\n" )
sep = "\n"
for x in lyrics.split( sep ):
-----------------------------------------------------------------------
Summary of changes:
script.cu.lrclyrics/addon.xml | 5 +++--
script.cu.lrclyrics/changelog.txt | 5 +++++
script.cu.lrclyrics/resources/lib/embedlrc.py | 8 +++++---
script.cu.lrclyrics/resources/lib/gui.py | 2 +-
4 files changed, 14 insertions(+), 6 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Slashdot TV. Videos for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
