The branch, dharma has been updated
via 7353b49e131e469981428a6eecacf41c7b1173d7 (commit)
from 9f698165bed7dc31bc947763971cbd7ff9fb196b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=7353b49e131e469981428a6eecacf41c7b1173d7
commit 7353b49e131e469981428a6eecacf41c7b1173d7
Author: amet <a...@nospam>
Date: Fri Dec 24 01:13:13 2010 +0400
[script.cu.lyrics] -v1.0.1
- added: two more scrapers, Lyricsmode and Lyricstime
diff --git a/script.cu.lyrics/addon.xml b/script.cu.lyrics/addon.xml
index 9f16ec4..a5e1943 100644
--- a/script.cu.lyrics/addon.xml
+++ b/script.cu.lyrics/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.cu.lyrics"
name="CU Lyrics"
- version="1.0.0"
+ version="1.0.1"
provider-name="Amet">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.cu.lyrics/changelog.txt b/script.cu.lyrics/changelog.txt
index 8d93040..82a1622 100644
--- a/script.cu.lyrics/changelog.txt
+++ b/script.cu.lyrics/changelog.txt
@@ -1,3 +1,6 @@
+1.0.1
+- added: two more scrapers Lyricsmode and Lyricstime
+
1.0.0
- changed: more os.getcwd() found
diff --git a/script.cu.lyrics/default.py b/script.cu.lyrics/default.py
index dc3373d..dc13e38 100644
--- a/script.cu.lyrics/default.py
+++ b/script.cu.lyrics/default.py
@@ -4,19 +4,19 @@ import os
import xbmc
import xbmcaddon
# Script constants
-__scriptname__ = "CU Lyrics"
-__author__ = "Amet, ZorMonkey"
-__url__ = ""
-__scriptid__ = "script.cu.lyrics"
-__credits__ = "EnderW,Nuka1195"
-__version__ = "0.9.2"
+__scriptname__ = "CU Lyrics"
+__author__ = "Amet, ZorMonkey"
+__url__ = ""
+__scriptid__ = "script.cu.lyrics"
+__credits__ = "EnderW,Nuka1195"
+__version__ = "1.0.1"
__XBMC_Revision__ = "30001"
+__settings__ = xbmcaddon.Addon(id=__scriptid__)
+__language__ = __settings__.getLocalizedString
+__version__ = __settings__.getAddonInfo('version')
+__cwd__ = __settings__.getAddonInfo('path')
# Shared resources
-__settings__ = xbmcaddon.Addon(id=__scriptid__)
-__language__ = __settings__.getLocalizedString
-__cwd__ = __settings__.getAddonInfo('path')
-
BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( __cwd__, 'resources',
'lib' ) )
sys.path.append (BASE_RESOURCE_PATH)
diff --git a/script.cu.lyrics/resources/language/English/strings.xml
b/script.cu.lyrics/resources/language/English/strings.xml
index 4ea840d..6afbc22 100644
--- a/script.cu.lyrics/resources/language/English/strings.xml
+++ b/script.cu.lyrics/resources/language/English/strings.xml
@@ -8,6 +8,8 @@
<string id="30003">LyricWiki.org API</string>
<string id="30004">Fetching lyrics from %s failed</string>
<string id="30005">File</string>
+ <string id="30006">Lyricsmode.com API</string>
+ <string id="30007">Lyricstime.com API</string>
<!-- Settings -->
<string id="30100">Smooth Scrolling</string>
@@ -19,5 +21,6 @@
<string id="30106">Original authors</string>
<string id="30107">Use embeded lyrics</string>
<string id="30108"> - Save embeded lyrics to file</string>
+ <string id="30109">Select Scraper</string>
</strings>
diff --git a/script.cu.lyrics/resources/lib/gui.py
b/script.cu.lyrics/resources/lib/gui.py
index 05b9cfc..104c7c2 100755
--- a/script.cu.lyrics/resources/lib/gui.py
+++ b/script.cu.lyrics/resources/lib/gui.py
@@ -48,7 +48,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
self.getMyPlayer()
def get_scraper( self ):
- import lyricsScraper as lyricsScraper
+ exec ( "from scrapers.%s import lyricsScraper as lyricsScraper" %
(__settings__.getSetting( "scraper")))
self.LyricsScraper = lyricsScraper.LyricsFetcher()
self.scraper_title = lyricsScraper.__title__
self.scraper_exceptions = lyricsScraper.__allow_exceptions__
diff --git a/script.cu.lyrics/resources/settings.xml
b/script.cu.lyrics/resources/settings.xml
index 382b99c..48ceb68 100644
--- a/script.cu.lyrics/resources/settings.xml
+++ b/script.cu.lyrics/resources/settings.xml
@@ -5,5 +5,6 @@
<setting id="save_lyrics" type="bool" label="30101" default="true"/>
<setting id="show_embeded_lyrics" type="bool" label="30107"
default="true"/>
<setting id="save_embeded_lyrics" type="bool" visible= "eq(-1,true)"
enable="eq(-1,true)" label="30108" default="false"/>
+ <setting id="scraper" type="fileenum" mask="/" label="30109"
default="lyricwiki" values="/resources/lib/scrapers" />
</category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
script.cu.lyrics/addon.xml | 2 +-
script.cu.lyrics/changelog.txt | 3 +
script.cu.lyrics/default.py | 20 ++--
.../resources/language/English/strings.xml | 3 +
script.cu.lyrics/resources/lib/gui.py | 2 +-
.../resources/lib/scrapers/__init__.py | 0
.../resources/lib/scrapers/lyricsmode}/__init__.py | 0
.../lib/scrapers/lyricsmode/lyricsScraper.py | 167 ++++++++++++++++++++
.../resources/lib/scrapers/lyricstime}/__init__.py | 0
.../lib/scrapers/lyricstime/lyricsScraper.py | 167 ++++++++++++++++++++
.../resources/lib/scrapers/lyricwiki}/__init__.py | 0
.../lib/{ => scrapers/lyricwiki}/lyricsScraper.py | 17 +-
script.cu.lyrics/resources/settings.xml | 1 +
13 files changed, 361 insertions(+), 21 deletions(-)
copy {script.lrclyrics => script.cu.lyrics}/resources/lib/scrapers/__init__.py
(100%)
copy {script.lrclyrics/resources/lib/scrapers =>
script.cu.lyrics/resources/lib/scrapers/lyricsmode}/__init__.py (100%)
create mode 100644
script.cu.lyrics/resources/lib/scrapers/lyricsmode/lyricsScraper.py
copy {script.lrclyrics/resources/lib/scrapers =>
script.cu.lyrics/resources/lib/scrapers/lyricstime}/__init__.py (100%)
create mode 100644
script.cu.lyrics/resources/lib/scrapers/lyricstime/lyricsScraper.py
copy {script.lrclyrics/resources/lib/scrapers =>
script.cu.lyrics/resources/lib/scrapers/lyricwiki}/__init__.py (100%)
rename script.cu.lyrics/resources/lib/{ =>
scrapers/lyricwiki}/lyricsScraper.py (95%)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
