The branch, helix has been updated
via c21f7046bfb8cca17fd704756b771ca8060a01a2 (commit)
via 576c1a3df01f1c0a4abee27dc147290bd089266e (commit)
from a3284128f4eb08b9699cbea40db0f7453fc9119b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=c21f7046bfb8cca17fd704756b771ca8060a01a2
commit c21f7046bfb8cca17fd704756b771ca8060a01a2
Author: ronie <ronie>
Date: Mon Oct 6 19:01:27 2014 +0200
script.cu.lrclyrics 3.0.2
diff --git a/script.cu.lrclyrics/addon.xml b/script.cu.lrclyrics/addon.xml
index 2044682..1ab37ce 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="3.0.1"
provider-name="Taxigps|ronie">
+<addon id="script.cu.lrclyrics" name="CU LRC Lyrics" version="3.0.2"
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 60105c1..a0d777c 100644
--- a/script.cu.lrclyrics/changelog.txt
+++ b/script.cu.lrclyrics/changelog.txt
@@ -1,3 +1,7 @@
+v3.0.2
+- fix detection of text based Lyrics3 tags
+- fix some lrc lyrics did not work (time tag not recognised)
+
v3.0.1
- fix lyricwiki scraper
diff --git a/script.cu.lrclyrics/resources/lib/embedlrc.py
b/script.cu.lrclyrics/resources/lib/embedlrc.py
index 81731e9..e805497 100644
--- a/script.cu.lrclyrics/resources/lib/embedlrc.py
+++ b/script.cu.lrclyrics/resources/lib/embedlrc.py
@@ -15,11 +15,10 @@ def getEmbedLyrics(song, getlrc):
lyrics.lrc = getlrc
filename = song.filepath.decode("utf-8")
lry = None
- if getlrc:
- try:
- lry = getLyrics3(filename)
- except:
- pass
+ try:
+ lry = getLyrics3(filename, getlrc)
+ except:
+ pass
if lry:
enc = chardet.detect(lry)
lyrics.lyrics = lry.decode(enc['encoding'])
@@ -33,11 +32,11 @@ 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
"""
-def getLyrics3(filename):
+def getLyrics3(filename, getlrc):
f = xbmcvfs.File(filename)
f.seek(-128-9, os.SEEK_END)
buf = f.read(9)
@@ -50,7 +49,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 +65,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 78f5c6b..3f2a672 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 ):
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=576c1a3df01f1c0a4abee27dc147290bd089266e
commit 576c1a3df01f1c0a4abee27dc147290bd089266e
Author: ronie <ronie>
Date: Mon Oct 6 19:01:05 2014 +0200
service.scrobbler.lastfm 1.0.1
diff --git a/service.scrobbler.lastfm/addon.xml
b/service.scrobbler.lastfm/addon.xml
index f14d034..0fd5e70 100644
--- a/service.scrobbler.lastfm/addon.xml
+++ b/service.scrobbler.lastfm/addon.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="service.scrobbler.lastfm" name="Last.fm" version="1.0.0"
provider-name="Team-Kodi">
+<addon id="service.scrobbler.lastfm" name="Last.fm" version="1.0.1"
provider-name="Team-Kodi">
<requires>
<import addon="xbmc.python" version="2.12.0"/>
+ <import addon="script.module.simplejson" version="3.3.0"/>
</requires>
<extension point="xbmc.service" library="scrobbler.py" start="login"/>
<extension point="xbmc.addon.metadata">
diff --git a/service.scrobbler.lastfm/changelog.txt
b/service.scrobbler.lastfm/changelog.txt
index ea100c4..ad26a27 100644
--- a/service.scrobbler.lastfm/changelog.txt
+++ b/service.scrobbler.lastfm/changelog.txt
@@ -1,3 +1,6 @@
+v1.0.1
+- add missing dependency
+
v1.0.0
- kodi name change
-----------------------------------------------------------------------
Summary of changes:
script.cu.lrclyrics/addon.xml | 3 ++-
script.cu.lrclyrics/changelog.txt | 4 ++++
script.cu.lrclyrics/resources/lib/embedlrc.py | 19 ++++++++++---------
script.cu.lrclyrics/resources/lib/gui.py | 2 +-
service.scrobbler.lastfm/addon.xml | 3 ++-
service.scrobbler.lastfm/changelog.txt | 3 +++
6 files changed, 22 insertions(+), 12 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
