The branch, frodo has been updated
via 125eaaaa03947d44fe3334e4e1bf8d9fa7ede162 (commit)
from b55e70ca941923eb52fff52fa1e8172c16e8c8d2 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=125eaaaa03947d44fe3334e4e1bf8d9fa7ede162
commit 125eaaaa03947d44fe3334e4e1bf8d9fa7ede162
Author: ronie <[email protected]>
Date: Fri Jan 25 01:15:40 2013 +0100
[script.cu.lrclyrics] -v1.0.3
diff --git a/script.cu.lrclyrics/README.txt b/script.cu.lrclyrics/README.txt
index 47f4c95..578e937 100644
--- a/script.cu.lrclyrics/README.txt
+++ b/script.cu.lrclyrics/README.txt
@@ -26,3 +26,9 @@ depending on which options you've enabled, the script
searches for lyrics in thi
when the scripts downloads lyrics through one of the scrapers,
you can optionally save them to a file for future use.
+
+
+properties for other addons:
+Window(Home).Property(culrc.lyrics) - shows the current lyrics, including
timing info in case of lrc lyrics.
+Window(Home).Property(culrc.source) - source or scraper that was used to find
the current lyrics.
+Window(Home).Property(culrc.running) - returns 'true' when the lyrics script
is running, empty if not.
diff --git a/script.cu.lrclyrics/addon.xml b/script.cu.lrclyrics/addon.xml
index 72d9c8a..747af8c 100644
--- a/script.cu.lrclyrics/addon.xml
+++ b/script.cu.lrclyrics/addon.xml
@@ -1,13 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.cu.lrclyrics" name="CU LRC Lyrics" version="1.0.1"
provider-name="Taxigps, ronie">
+<addon id="script.cu.lrclyrics" name="CU LRC Lyrics" version="1.0.3"
provider-name="Taxigps, ronie">
<requires>
- <import addon="xbmc.python" version="2.1"/>
+ <import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.chardet" version="2.1.1"/>
</requires>
<extension point="xbmc.python.lyrics" library="default.py"/>
<extension point="xbmc.addon.metadata">
- <summary>CU LRC Lyrics</summary>
- <description>CU LRC Lyrics is a lyrics script for XBMC. It
supports regular as well as LRC Lyrics. The script can search
synchronized/unsynchronized lyrics embedded, from file or by scrapers. It can
read .lrc/.txt lyrics file saved at the same path by same file name with
.mp3(or other type of music).</description>
+ <summary lang="da">CU LRC Lyrics</summary>
+ <summary lang="de">CU LRC Lyrics</summary>
+ <summary lang="el">ΣÏίÏοι CU LRC</summary>
+ <summary lang="en">CU LRC Lyrics</summary>
+ <summary lang="hu">CU LRC Dalszöveg</summary>
+ <summary lang="it">CU LRC Lyrics</summary>
+ <summary lang="ko">CU LRC Lyrics</summary>
+ <summary lang="pl">CU LRC Lyrics</summary>
+ <summary lang="pt_BR">CU LRC Letras</summary>
+ <summary lang="sk">CU LRC Lyrics</summary>
+ <summary lang="sv">CU LRC Lyrics</summary>
+ <summary lang="zh">CU LRCæè¯</summary>
+ <description lang="da">CU LRC Lyrics er et script til
sangtekster til XBMC. Det understøtter almindelige såvel som LRC sangtekster.
Script'et kan søge i synkroniserede/usynkroniserede sangtekster som er
inkodede i filer eller ved hjælp af scrapere. Det kan læse .lrc/.txt
sangtekstfiler som er gemt i den samme mappe og med samme filnavn som mp3'en
(eller andre typer af musikfiler).</description>
+ <description lang="el">Îι ΣÏίÏοι CU LRC είναι
Îνα script ÏÏίÏÏν για Ïο XBMC. Î¥ÏοÏÏηÏίζει ÏÏ
νηθιÏμÎνοÏ
Ï ÏÏίÏοÏ
Ï ÎºÎ±Î¸ÏÏ ÎºÎ±Î¹ ΣÏίÏοÏ
Ï LRC.
Το script μÏοÏεί να αναζηÏήÏει ÏÏ
γÏÏονιÏμÎνοÏ
Ï ÎºÎ±Î¹ μη ÏÏίÏοÏ
Ï, ενÏÏμαÏÏμÎνοÏ
Ï, αÏÏ
αÏÏεία ή αÏÏ scraper. ÎÏοÏεί να διαβάÏει αÏÏεία
ÏÏίÏÏν ÏÏÏοÏ
.lrc/.txt ÏοÏ
βÏίÏκονÏαι ÏÏον ίδιο
Ïάκελο και ÎÏοÏ
ν Ïο ίδιο Ïνομα με Ïο .mp3 (ή
Î¬Î»Î»Î·Ï ÎºÎ±ÏÎ¬Î»Î·Î¾Î·Ï Î¼Î¿Ï
Ïική).</description>
+ <description lang="en">CU LRC Lyrics is a lyrics script for
XBMC. It supports regular as well as LRC Lyrics. The script can search
synchronized/unsynchronized lyrics embedded, from file or by scrapers. It can
read .lrc/.txt lyrics file saved at the same path by same file name with
.mp3(or other type of music).</description>
+ <description lang="hu">A CU LRC Dalszöveg egy kiegészÃtÅ az
XBMC-hez, ami támogatja a hagyományos és az LRC dalszövegek keresését,
megjelenÃtését. A dalszöveg lehet szinkronizált, vagy szinkronizálatlan,
a zenefájlba beágyazott, vagy leolvasókkal letöltött, vagy akár
származhat a zene könyvtárában található .lrc vagy .txt fájlokból
is.</description>
+ <description lang="it">CU LRC Lyrics è uno script per i testi
per XBMC. Supporta testi come LRC. Lo script può cercare testi incorporati
sincronizzati e non, da file o tramite scapers. Legge file .lrc/.txt salvati
nello stesso percorso e con lo stesso nome dell'.mp3 (o altri tipi di
musica)</description>
+ <description lang="pl">CU LRC Lyrics jest skryptem tekstów dla
XBMC. Wspiera zwykÅe teksty i LRC. Skrypt wspiera teksty synchronizowane lub
niesynchronizowane, osadzone, z pliku lub ze scrapera. Czyta plik .lrc/.txt
zapisany w tym samym katalogu i pod tÄ
samÄ
nazwÄ
co plik mp3 (lub inny plik
muzyczny).</description>
+ <description lang="pt_BR">CU LRC Lyrics é script de letras de
músicas para XBMC. Ele suporta regular bem como Letras LRC. O script pode
procurar por letras embutidas sincronizadas/dessincronizadas, de arquivos ou
usando scrapers. Ele pode ler arquivos de letras .lrc/txt salvos no mesmo
caminho com o mesmo nome do arquivo .mp3 (ou outro formato de
música).</description>
+ <description lang="sk">CU LRC Lyrics je doplnok poskytujúci
texty skladieb pre XBMC. Podporuje bežné ako aj LRC formáty. Doplnok môže
vyhľadávať synchronizované/nesynchronizované Texty skladieb vložené, v
samostatnom súbore alebo cez sÅ¥ahovaÄe. Dokáže ÄÃtaÅ¥ .lrc/.txt súbory
v rovnakom prieÄinku a s rovnakým názvom ako .mp3 súbor (alebo iný
hudobný súbor).</description>
+ <description lang="sv">CU LRC Lyrics är ett skript för XBMC.
Det stödjer såväl vanliga som LRC texter. Skriptet kan söka
synkroniserade/osynkroniserade texter inbäddade från fil eller från
skraport. Det kan läsa .lrc/.txt filer sparade med samma sökväg och filnamn
som .mp3 (eller annan typ av musik).</description>
<description lang="zh">CU LRC
Lyricsæ¯XBMCçæè¯æä»¶ã宿¯æåLRC
Lyricsæè¯æä»¶çåè½ãè¿ä¸ªæä»¶ä¼æç´¢å
åµçãæ¬å°æä»¶æéè¿å®åå¨è·å忥/é忥æè¯ãå®å¯ä»¥è¯»å以ç¸åæä»¶åä¸ææ²æä»¶ä¿åå¨ç¸åç®å½ç.lrc/.txtæè¯æä»¶ã</description>
<platform>all</platform>
</extension>
diff --git a/script.cu.lrclyrics/changelog.txt
b/script.cu.lrclyrics/changelog.txt
index febde43..4c96fb3 100644
--- a/script.cu.lrclyrics/changelog.txt
+++ b/script.cu.lrclyrics/changelog.txt
@@ -1,3 +1,12 @@
+v1.0.3
+-language update
+
+v1.0.2
+- add a script running window property
+- added lyrics source as a window property
+- make lyrics available as a window property
+- fixed would fail for users with a special char in their username
+
v1.0.1
- fixed can't change lyric for track in cue/ape file
- fixed decode error in scrape minilyrics
diff --git a/script.cu.lrclyrics/default.py b/script.cu.lrclyrics/default.py
index 28088e0..54e5074 100644
--- a/script.cu.lrclyrics/default.py
+++ b/script.cu.lrclyrics/default.py
@@ -7,12 +7,12 @@ import xbmcaddon
# Script constants
__addon__ = xbmcaddon.Addon()
__addonname__ = __addon__.getAddonInfo('name')
-__cwd__ = __addon__.getAddonInfo('path').decode("utf-8")
-__profile__ = xbmc.translatePath( __addon__.getAddonInfo('profile')
).decode("utf-8")
+__cwd__ =
xbmc.translatePath(__addon__.getAddonInfo('path')).decode("utf-8")
+__profile__ =
xbmc.translatePath(__addon__.getAddonInfo('profile')).decode("utf-8")
__language__ = __addon__.getLocalizedString
# Shared resources
-BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( __cwd__, 'resources',
'lib' ) )
+BASE_RESOURCE_PATH = os.path.join(__cwd__, 'resources', 'lib')
sys.path.append (BASE_RESOURCE_PATH)
# Start the main gui
diff --git a/script.cu.lrclyrics/resources/language/Chinese
(Simple)/strings.xml b/script.cu.lrclyrics/resources/language/Chinese
(Simple)/strings.xml
index 5bac379..2c009a0 100644
--- a/script.cu.lrclyrics/resources/language/Chinese (Simple)/strings.xml
+++ b/script.cu.lrclyrics/resources/language/Chinese (Simple)/strings.xml
@@ -1,4 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
+<!-- Chinese (Simple) language-Team URL:
http://www.transifex.com/projects/p/xbmc-addons/language/zh/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
<strings>
<!-- Labels -->
<string id="0">XBMCæè¯</string>
@@ -9,7 +13,6 @@
<!-- Settings labels -->
<string id="30101">ä¿åæè¯</string>
<string id="30102">ä¿åç®å½</string>
- <string id="30103"></string>
<string id="30104">ä¿åæè¯æä»¶å°ææç®å½</string>
<string id="30106">ä»
ä½¿ç¨æä»¶åæ¥æ¾</string>
<string id="30107">æä»¶åæ ¼å¼</string>
diff --git a/script.cu.lrclyrics/resources/language/Dutch/strings.xml
b/script.cu.lrclyrics/resources/language/Dutch/strings.xml
index b88f3ef..040bd67 100644
--- a/script.cu.lrclyrics/resources/language/Dutch/strings.xml
+++ b/script.cu.lrclyrics/resources/language/Dutch/strings.xml
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
+<!-- Dutch language-Team URL:
http://www.transifex.com/projects/p/xbmc-addons/language/nl/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
<strings>
<!-- Labels -->
<string id="0">XBMC Lyrics</string>
-
+ <string id="30000">Bestand</string>
<string id="30001">Geen lyrics gevonden!</string>
<!-- Settings labels -->
- <string id="30100">Bron</string>
<string id="30101">Lyrics opslaan</string>
<string id="30102">Opslaan in</string>
<string id="30106">Gebruik bestandsnaam voor zoeken</string>
@@ -14,6 +17,6 @@
<string id="30108">%A - %T</string>
<string id="30109">%A\%B\%T</string>
<string id="30110">%A\%B\%N %T</string>
-
-
+ <string id="30150">Scrapers</string>
+ <string id="30151">Opties</string>
</strings>
diff --git a/script.cu.lrclyrics/resources/language/English/strings.xml
b/script.cu.lrclyrics/resources/language/English/strings.xml
index 692a588..b267c6d 100644
--- a/script.cu.lrclyrics/resources/language/English/strings.xml
+++ b/script.cu.lrclyrics/resources/language/English/strings.xml
@@ -1,4 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
+<!-- English language-Team URL:
http://www.transifex.com/projects/p/xbmc-addons/language/en/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
<strings>
<!-- Labels -->
<string id="0">XBMC Lyrics</string>
@@ -9,7 +13,6 @@
<!-- Settings labels -->
<string id="30101">Save lyrics</string>
<string id="30102">Save folder</string>
- <string id="30103"></string>
<string id="30104">Save lyrics files in artist folders</string>
<string id="30106">Use only filename for search</string>
<string id="30107">Filename format</string>
diff --git a/script.cu.lrclyrics/resources/language/Finnish/strings.xml
b/script.cu.lrclyrics/resources/language/Finnish/strings.xml
index 229f9bd..b0840f9 100644
--- a/script.cu.lrclyrics/resources/language/Finnish/strings.xml
+++ b/script.cu.lrclyrics/resources/language/Finnish/strings.xml
@@ -1,18 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings> <!-- 24.4.2009 Finnish -->
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
+<!-- Finnish language-Team URL:
http://www.transifex.com/projects/p/xbmc-addons/language/fi/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
+<strings>
<!-- Labels -->
<string id="0">XBMC Lyrics</string>
<string id="30000">Tiedosto</string>
<string id="30001">Sanotuksia ei löydy!</string>
<!-- Settings labels -->
- <string id="30100">Hakupaikka</string>
<string id="30101">Tallenna sanoitukset</string>
<string id="30102">Kansioon:</string>
- <string id="30103"></string>
<string id="30106">Haetaan vain tiedostonimeä</string>
<string id="30107">Tiedostonimen muoto</string>
<string id="30108">%A - %T</string>
<string id="30109">%A\%B\%T</string>
<string id="30110">%A\%B\%N %T</string>
+ <string id="30150">Hakupaikat</string>
+ <string id="30151">Valinnat</string>
</strings>
diff --git a/script.cu.lrclyrics/resources/language/French/strings.xml
b/script.cu.lrclyrics/resources/language/French/strings.xml
index 0a6c385..2541313 100644
--- a/script.cu.lrclyrics/resources/language/French/strings.xml
+++ b/script.cu.lrclyrics/resources/language/French/strings.xml
@@ -1,18 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
+<!-- French language-Team URL:
http://www.transifex.com/projects/p/xbmc-addons/language/fr/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
<strings>
<!-- Labels -->
<string id="0">XBMC Lyrics</string>
-
+ <string id="30000">Fichier</string>
<string id="30001">Les paroles n'ont pas été retrouvées!</string>
<!-- Settings labels -->
- <string id="30100">Scraper</string>
<string id="30101">Sauvegarder les paroles</string>
<string id="30102">Dossier de Sauvegardes</string>
- <string id="30103"></string>
<string id="30106">Utiliser uniquement le nom du fichier pour la
recherche</string>
<string id="30107">Format de nom du fichier</string>
<string id="30108">Artiste - Chanson.ext</string>
<string id="30109">Artiste\Album\Chanson.ext</string>
<string id="30110">Artiste\Album\Piste Chanson.ext</string>
+ <string id="30150">Scrapers</string>
+ <string id="30151">Options</string>
</strings>
diff --git a/script.cu.lrclyrics/resources/language/Polish/strings.xml
b/script.cu.lrclyrics/resources/language/Polish/strings.xml
index 3efa367..5e6b772 100644
--- a/script.cu.lrclyrics/resources/language/Polish/strings.xml
+++ b/script.cu.lrclyrics/resources/language/Polish/strings.xml
@@ -1,18 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
+<!-- Polish language-Team URL:
http://www.transifex.com/projects/p/xbmc-addons/language/pl/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
<strings>
<!-- Labels -->
<string id="0">XBMC Lyrics</string>
-
- <string id="30001">Nie znalazÅem tekstu</string>
+ <string id="30000">Plik</string>
+ <string id="30001">Nie znaleziono tekstu</string>
+ <string id="30002">Osadzony</string>
<!-- Settings labels -->
- <string id="30100">Scraper</string>
<string id="30101">Zapisuj teksty na dysk</string>
<string id="30102">Zapisz do ..</string>
- <string id="30103"></string>
+ <string id="30104">Zapisz tekst w folderze artysty</string>
<string id="30106">Tylko nazwa pliku jako podstawa szukania</string>
<string id="30107">Format nazwy pliku</string>
<string id="30108">%A - %T</string>
<string id="30109">%A\%B\%T</string>
<string id="30110">%A\%B\%N %T</string>
+ <string id="30111">Wczytaj tekst o tej samej nazwie z podfolderu</string>
+ <string id="30112">- Nazwa podfolderu</string>
+ <string id="30150">Scrapery</string>
+ <string id="30151">Opcje</string>
+ <string id="30152">Szukaj osadzonych tekstów</string>
+ <string id="30153">Szukaj pliki tekstów lokalnie</string>
+ <string id="30154">Scrapery synchronizowanych tekstów</string>
+ <string id="30155">Scrapery zwykÅych tekstów</string>
</strings>
diff --git a/script.cu.lrclyrics/resources/language/Swedish/strings.xml
b/script.cu.lrclyrics/resources/language/Swedish/strings.xml
index 3c3fffd..17c6c97 100644
--- a/script.cu.lrclyrics/resources/language/Swedish/strings.xml
+++ b/script.cu.lrclyrics/resources/language/Swedish/strings.xml
@@ -1,18 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Translated using Transifex web application. For support, or if you would
like to to help out, please visit your language team! -->
+<!-- Swedish language-Team URL:
http://www.transifex.com/projects/p/xbmc-addons/language/sv/ -->
+<!-- Report language file syntax bugs at: [email protected] -->
+
<strings>
<!-- Labels -->
<string id="0">XBMC Lyrics</string>
<string id="30000">Fil</string>
<string id="30001">Inga texter hittade!</string>
+ <string id="30002">Inbäddade</string>
<!-- Settings labels -->
- <string id="30100">Tolk</string>
<string id="30101">Spara sångtext</string>
<string id="30102">Spara mapp</string>
- <string id="30103"></string>
+ <string id="30104">Spara textfiler i artistmappar</string>
<string id="30106">Använd endast filnamn för sökning</string>
<string id="30107">Filnamnsformat</string>
<string id="30108">%A - %T</string>
<string id="30109">%A\%B\%T</string>
<string id="30110">%A\%B\%N %T</string>
+ <string id="30111">Ladda texter med samma namn från undermapp</string>
+ <string id="30112">- Undermappsnamn</string>
+ <string id="30150">Skrapor</string>
+ <string id="30151">Val</string>
+ <string id="30152">Sök efter inbäddade texter</string>
+ <string id="30153">Sök efter lokala texfiler</string>
+ <string id="30154">Synkroniserad textskrapor</string>
+ <string id="30155">Vanliga textskrapor</string>
</strings>
diff --git a/script.cu.lrclyrics/resources/lib/gui.py
b/script.cu.lrclyrics/resources/lib/gui.py
index 68e2eba..7526ebe 100644
--- a/script.cu.lrclyrics/resources/lib/gui.py
+++ b/script.cu.lrclyrics/resources/lib/gui.py
@@ -25,6 +25,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
except:
pass
self.setup_variables()
+ self.win.setProperty('culrc.running', 'true')
self.get_scraper_list()
self.getMyPlayer()
if ( __addon__.getSetting( "save_lyrics_path" ) == "" ):
@@ -49,6 +50,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
self.fetchedLyrics = []
self.current_lyrics = Lyrics()
self.scroll_line = int(self.get_page_lines() / 2)
+ self.win = xbmcgui.Window( 10000 )
def get_page_lines( self ):
self.getControl( 110 ).setVisible( False )
@@ -230,20 +232,9 @@ class GUI( xbmcgui.WindowXMLDialog ):
lyr = lyrics.lyrics
else:
lyr = lyrics.lyrics.encode('utf-8')
-
-# xbmcvfs.File().write() corrupts files
-# disable it until the bug is fixed
-# http://trac.xbmc.org/ticket/13545
-# lyrics_file = xbmcvfs.File( self.song_path, "w" )
-# lyrics_file.write( lyr )
-# lyrics_file.close()
-
- tmp_name = os.path.join(__profile__, u'lyrics.tmp')
- tmp_file = open(tmp_name , "w" )
- tmp_file.write( lyr )
- tmp_file.close()
- xbmcvfs.copy(tmp_name, song_path)
- xbmcvfs.delete(tmp_name)
+ lyrics_file = xbmcvfs.File( self.song_path, "w" )
+ lyrics_file.write( lyr )
+ lyrics_file.close()
return True
except:
log( "failed to save lyrics" )
@@ -251,11 +242,12 @@ class GUI( xbmcgui.WindowXMLDialog ):
def show_error(self):
self.getControl( 100 ).setText( __language__( 30001 ) )
+ self.win.setProperty('culrc.lyrics', __language__( 30001 ))
self.show_control( 100 )
- self.getControl( 200 ).setLabel('')
def show_lyrics( self, lyrics ):
- self.reset_controls()
+ self.win.setProperty('culrc.lyrics', lyrics.lyrics)
+ self.win.setProperty('culrc.source', lyrics.source)
if lyrics.list:
source = '%s (%d)' % (lyrics.source, len(lyrics.list))
else:
@@ -314,11 +306,16 @@ class GUI( xbmcgui.WindowXMLDialog ):
success = self.save_lyrics_to_file( self.current_lyrics )
def reset_controls( self ):
- self.getControl( 100 ).reset()
+ self.getControl( 100 ).setText(xbmc.getLocalizedString(194))
self.getControl( 110 ).reset()
self.getControl( 200 ).setLabel('')
+ self.win.clearProperty('culrc.lyrics')
+ self.win.clearProperty('culrc.source')
def exit_script( self ):
+ self.win.clearProperty('culrc.lyrics')
+ self.win.clearProperty('culrc.source')
+ self.win.clearProperty('culrc.running')
self.allowtimer = False
self.stop_refresh()
self.close()
@@ -351,6 +348,7 @@ class GUI( xbmcgui.WindowXMLDialog ):
song = Song.current()
if ( song and ( self.current_lyrics.song != song ) ):
self.stop_refresh()
+ self.reset_controls()
lyrics = self.get_lyrics( song )
self.current_lyrics = lyrics
if lyrics.lyrics:
diff --git
a/script.cu.lrclyrics/resources/lib/scrapers/lyricsmode/lyricsScraper.py
b/script.cu.lrclyrics/resources/lib/scrapers/lyricsmode/lyricsScraper.py
index 2311e40..bd94ac7 100644
--- a/script.cu.lrclyrics/resources/lib/scrapers/lyricsmode/lyricsScraper.py
+++ b/script.cu.lrclyrics/resources/lib/scrapers/lyricsmode/lyricsScraper.py
@@ -73,6 +73,8 @@ class LyricsFetcher:
if line.find("Lyrics from:") < 0:
lir.append(line)
lyr = u"\n".join( lir )
+ if lyr.startswith('These lyrics are missing'):
+ return None
lyrics.lyrics = lyr
return lyrics
except:
-----------------------------------------------------------------------
Summary of changes:
script.cu.lrclyrics/README.txt | 6 ++++
script.cu.lrclyrics/addon.xml | 27 ++++++++++++++--
script.cu.lrclyrics/changelog.txt | 9 +++++
script.cu.lrclyrics/default.py | 6 ++--
.../resources/language/Afrikaans/strings.xml | 10 ++++++
.../resources/language/Amharic/strings.xml | 9 +++++
.../resources/language/Arabic/strings.xml | 10 ++++++
.../resources/language/Basque/strings.xml | 10 ++++++
.../resources/language/Belarusian/strings.xml | 10 ++++++
.../resources/language/Bosnian/strings.xml | 10 ++++++
.../resources/language/Bulgarian/strings.xml | 10 ++++++
.../resources/language/Catalan/strings.xml | 10 ++++++
.../language/Chinese (Simple)/strings.xml | 7 +++-
.../language/Chinese (Traditional)/strings.xml | 10 ++++++
.../resources/language/Croatian/strings.xml | 10 ++++++
.../resources/language/Czech/strings.xml | 10 ++++++
.../resources/language/Danish/strings.xml | 30 ++++++++++++++++++
.../resources/language/Dutch/strings.xml | 13 +++++---
.../resources/language/English/strings.xml | 7 +++-
.../resources/language/Estonian/strings.xml | 10 ++++++
.../resources/language/Finnish/strings.xml | 12 +++++--
.../resources/language/French/strings.xml | 12 +++++--
.../resources/language/Galician/strings.xml | 10 ++++++
.../resources/language/German/strings.xml | 24 +++++++++++++++
.../resources/language/Greek/strings.xml | 30 ++++++++++++++++++
.../resources/language/Hebrew/strings.xml | 10 ++++++
.../language/Hindi (Devanagiri)/strings.xml | 8 +++++
.../resources/language/Hungarian/strings.xml | 30 ++++++++++++++++++
.../resources/language/Icelandic/strings.xml | 10 ++++++
.../resources/language/Italian/strings.xml | 30 ++++++++++++++++++
.../resources/language/Japanese/strings.xml | 10 ++++++
.../resources/language/Korean/strings.xml | 26 ++++++++++++++++
.../resources/language/Lithuanian/strings.xml | 10 ++++++
.../resources/language/Macedonian/strings.xml | 9 +++++
.../resources/language/Maltese/strings.xml | 8 +++++
.../resources/language/Norwegian/strings.xml | 10 ++++++
.../resources/language/Persian/strings.xml | 8 +++++
.../resources/language/Polish/strings.xml | 22 ++++++++++---
.../language/Portuguese (Brazil)/strings.xml | 30 ++++++++++++++++++
.../resources/language/Portuguese/strings.xml | 10 ++++++
.../resources/language/Romanian/strings.xml | 10 ++++++
.../resources/language/Russian/strings.xml | 10 ++++++
.../language/Serbian (Cyrillic)/strings.xml | 10 ++++++
.../resources/language/Serbian/strings.xml | 10 ++++++
.../resources/language/Slovak/strings.xml | 30 ++++++++++++++++++
.../resources/language/Slovenian/strings.xml | 10 ++++++
.../language/Spanish (Argentina)/strings.xml | 10 ++++++
.../language/Spanish (Mexico)/strings.xml | 10 ++++++
.../resources/language/Spanish/strings.xml | 10 ++++++
.../resources/language/Swedish/strings.xml | 18 +++++++++--
.../resources/language/Thai/strings.xml | 10 ++++++
.../resources/language/Turkish/strings.xml | 10 ++++++
.../resources/language/Ukrainian/strings.xml | 10 ++++++
script.cu.lrclyrics/resources/lib/gui.py | 32 +++++++++----------
.../lib/scrapers/lyricsmode/lyricsScraper.py | 2 +
55 files changed, 686 insertions(+), 49 deletions(-)
create mode 100644 script.cu.lrclyrics/resources/language/Afrikaans/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Amharic/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Arabic/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Basque/strings.xml
create mode 100644
script.cu.lrclyrics/resources/language/Belarusian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Bosnian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Bulgarian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Catalan/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Chinese
(Traditional)/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Croatian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Czech/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Danish/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Estonian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Galician/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/German/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Greek/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Hebrew/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Hindi
(Devanagiri)/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Hungarian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Icelandic/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Italian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Japanese/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Korean/strings.xml
create mode 100644
script.cu.lrclyrics/resources/language/Lithuanian/strings.xml
create mode 100644
script.cu.lrclyrics/resources/language/Macedonian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Maltese/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Norwegian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Persian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Portuguese
(Brazil)/strings.xml
create mode 100644
script.cu.lrclyrics/resources/language/Portuguese/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Romanian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Russian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Serbian
(Cyrillic)/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Serbian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Slovak/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Slovenian/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Spanish
(Argentina)/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Spanish
(Mexico)/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Spanish/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Thai/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Turkish/strings.xml
create mode 100644 script.cu.lrclyrics/resources/language/Ukrainian/strings.xml
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons