The branch, eden has been updated
via 0d36214065075775a052999dfb93c2b37361f185 (commit)
from 2afed65b404c35f88d47383c36972a92960b28ac (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=0d36214065075775a052999dfb93c2b37361f185
commit 0d36214065075775a052999dfb93c2b37361f185
Author: taxigps <[email protected]>
Date: Wed Nov 21 14:47:22 2012 +0800
[script.lrclyrics] -v1.4.8
diff --git a/script.lrclyrics/addon.xml b/script.lrclyrics/addon.xml
index 62a5021..0ae2490 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.7"
+ version="1.4.8"
provider-name="Taxigps">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.lrclyrics/changelog.txt b/script.lrclyrics/changelog.txt
index 8c3279a..fdf7445 100644
--- a/script.lrclyrics/changelog.txt
+++ b/script.lrclyrics/changelog.txt
@@ -1,4 +1,8 @@
-[B]1.4.7 (2012.11.19)[/B]
+[B]1.4.8 (2012.11.21)[/B]
+added: MiniLyrics scraper
+fixed: can't read lrc file under music library mode because
xbmc.Player().getPlayingFile() return path like
'musicdb://3/3/4.mp3?albumid=3'. use
xbmc.getInfoLabel('Player.Filenameandpath') to get real file path.
+
+[B]1.4.7 (2012.11.19)[/B]
fixed: handle I/O error
fixed: TXXX(Lyrics) load error
diff --git a/script.lrclyrics/resources/lib/gui.py
b/script.lrclyrics/resources/lib/gui.py
index ec83620..693a011 100644
--- a/script.lrclyrics/resources/lib/gui.py
+++ b/script.lrclyrics/resources/lib/gui.py
@@ -86,7 +86,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
self.menu_items = []
xbmc.sleep( 60 )
- lyrics =
getEmbedLyrics(xbmc.Player().getPlayingFile().decode("utf-8"))
+ lyrics =
getEmbedLyrics(xbmc.getInfoLabel('Player.Filenameandpath').decode("utf-8"))
if ( lyrics ):
self.show_lyrics( lyrics )
self.getControl( 200 ).setEnabled( False )
@@ -121,7 +121,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
return get_textfile( self.song_path )
def get_lyrics_from_file2( self ):
- path = xbmc.Player().getPlayingFile()
+ path = xbmc.getInfoLabel('Player.Filenameandpath')
dirname = os.path.dirname(path)
basename = os.path.basename(path)
filename = basename.rsplit( ".", 1 )[ 0 ]
@@ -253,7 +253,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
artist = xbmc.Player().getMusicInfoTag().getArtist()
print "Song: " + song + " /Artist: " + artist
- songfile = xbmc.Player().getPlayingFile()
+ songfile = xbmc.getInfoLabel('Player.Filenameandpath')
except:
pass
if ( song and ( not artist or self.settings[ "use_filename" ]
) ):
diff --git a/script.lrclyrics/resources/settings.xml
b/script.lrclyrics/resources/settings.xml
index 5cc3ff7..a33095e 100644
--- a/script.lrclyrics/resources/settings.xml
+++ b/script.lrclyrics/resources/settings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
- <setting id="scraper" type="labelenum" label="30100" default="ttplayer"
values="ttplayer|lyrdb" />
+ <setting id="scraper" type="labelenum" label="30100" default="ttplayer"
values="ttplayer|minilyrics|lyrdb" />
<setting type="sep" />
<setting id="save_lyrics" type="bool" label="30101" default="true"/>
<setting id="lyrics_path" type="folder" source="files" label="30102"
default="" />
-----------------------------------------------------------------------
Summary of changes:
script.lrclyrics/addon.xml | 2 +-
script.lrclyrics/changelog.txt | 6 +-
script.lrclyrics/resources/lib/gui.py | 6 +-
.../resources/lib/scrapers/minilyrics}/__init__.py | 0
.../lib/scrapers/minilyrics/lyricsScraper.py | 102 ++++++++++++++++++++
script.lrclyrics/resources/settings.xml | 2 +-
6 files changed, 112 insertions(+), 6 deletions(-)
copy {script.cu.lyrics/resources/lib/scrapers =>
script.lrclyrics/resources/lib/scrapers/minilyrics}/__init__.py (100%)
create mode 100644
script.lrclyrics/resources/lib/scrapers/minilyrics/lyricsScraper.py
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
