VLC Lyrics Finder 0.3.6:

* Fix support for MetroLyrics
* Add a few texts to the invalid lyrics detection
* Bulgarian translation
* Ukrainian translation

CHANGELOG.md

@@ -0,0 +1,97 @@
+0.3.6
+=====
+* Fix support for MetroLyrics
+* Add a few texts to the invalid lyrics detection
+* Bulgarian translation
+* Ukrainian translation
+
+0.3.5
+=====
+* Improve/fix MetroLyrics support
+* Make installer for Windows compatible with mixed installations (32 bit VLC on 64 bit Windows)
+* Expand README to include MetroLyrics
+
+0.3.4.1
+=====
+* Fix uninstaller
+
+0.3.4
+=====
+* Fix for "no song loaded" scenario, updated locales
+* Fix for #7 (Google does not work with spaces on Windows)
+* Update NSIS setup file to support WoW systems, fixes #6
+* Remove w_lyrics from filename
+* fix: check for LANG variable to exist, otherwise take LC_ALL
+* confirm working of `open` cmd
+* remove unnecessary variable and correct read argument, see http://www…
+* mac layout fixes - resolves #4
+* fix osx specifics, e.g. fix language
+* README: fix URL to installer for Windows
+* Updated readme: add OS X path, fixes #3
+* Fix spelling mistake in comment
+* Trim artist & title, fix for Wham! - Wake Me Up Before You Go-Go
+
+0.3.3
+=====
+* Crash fix for attempt to perform arithmetic on a nil value (local
+* Fix for nil compare
+* LyricsMode does not use "and"
+
+0.3.2
+=====
+* Improve support for LyricsMode for artists with the same name (Womack & Womack - MPB)
+* Fix button Get Updates
+* Improve handling of space_space as space&space
+* Expanded usage section of README
+* Fix spelling mistake in README
+* Expanded README with a way to add your own lyrics
+* Increase LyricsMode priority
+* Improve support for groups that start with "the" on MetroLyrics
+* Don't try to fetch the same URL twice for Womack & Womack (and similar)
+
+0.3.1.1
+=====
+* Crash fix
+
+0.3.1
+=====
+* Updated README for version 0.3.1
+* Better handling of M3U playlists and improvents to parsing and fetching of lyrics
+* Update exe installer with Roisin Murphy fix
+* Fix for Roisin Murphy
+* Fix mistake in README
+* Fix layout
+* Updated README with Windows installer
+* NSIS installer for Windows
+* Minor change to Turkish
+* Add Turkish translation (tur.xml)
+* Updated Dutch translation
+* Cleanup: do not output string values of translation
+* Prevent crash when the file name does not contain spaces but does con…
+* Fix for unequal space in artist name, for example "The Alan Parsons P…
+* Do not wrap
+* Screenshot below intro
+* Add screenshot to README
+* Do not refresh the lyrics when the same song is repeatedly played
+* Improvement to csv-to-xml script for generating xml files from transifex
+* Add afr.xml (translation for Afrikaans)
+* Small translation fix for Spanish
+* Correct Spanish translation
+* Add fre.xml (French) and spa.xml (Spanish)
+* ...
+
+0.3.0
+=====
+* Add 6 additional lyrics websites
+* Add intelligent guessing based on URI
+* Add support for network streams (IceCast) that have a Now Playing attribute
+* Add translation support
+* Add GPL header
+* Wider window
+* Search with Google button
+* Switch artist and title with one click on the button Switch
+* Song change updates the metadata in Lyrics Finder
+* Better error messages
+* Add debug mode
+* Bugfixes
+* ...

README.md

@@ -1,15 +1,15 @@
 VLC Lyrics Finder
 ==============
 
-VLC media player lyrics extension. Supports MetroLyrics, Sonic Hits, Lyrics Mode, Golyr.de, AZ Lyrics, Lyrics.com and Lyricsmania.com.
+VLC Media Player lyrics extension. Supports MetroLyrics, Sonic Hits, Lyrics Mode, Golyr.de, AZ Lyrics, Lyrics.com and Lyricsmania.com.
 
 ![Lyrics Finder 0.3.0 on Linux](http://hugsmile.eu/file/lyricsfinder/screenshot-v030.png)
 
 Installation
 -------------
-Download installer for Windows: [install](https://github.com/Smile4ever/VLC-Lyrics-Finder/raw/master/windows-releases/lyricsfinder-0.3.5.exe)
+Download installer for Windows: [install](https://github.com/Smile4ever/VLC-Lyrics-Finder/raw/master/windows-releases/lyricsfinder-0.3.6.exe)
 
-Package for Arch Linux: [vlc-extension-lyricsfinder-git](https://aur.archlinux.org/packages/vlc-extension-lyricsfinder-git)
+AUR package for Arch Linux: [vlc-extension-lyricsfinder-git](https://aur.archlinux.org/packages/vlc-extension-lyricsfinder-git)
 
 Installation steps for Linux and OS X:
 

locale/ukr.xml

@@ -0,0 +1,18 @@
+<dialogtitle_normal>Слова пісні</dialogtitle_normal>
+<dialogtitle_notfound>Не знайдено</dialogtitle_notfound>
+<dialogtitle_lyricsof>Слова пісні</dialogtitle_lyricsof>
+<dialogtitle_performedby>написані</dialogtitle_lyricsof>
+<button_getlyrics>Шукати тексти пісень</button_getlyrics>
+<button_refresh>Відновити</button_refresh>
+<button_switch>Змінити місцями</button_switch>
+<button_close>Закрити</button_close>
+<button_google>Пошук за допомогою Google</button_google>
+<button_update>Шукати оновлення</button_update>
+<label_title>Назва:</label_title>
+<label_artist>Виконавець:</label_artist>
+<label_source>Знайдено в:</label_source>
+<message_newsong>Нова пісня завантажена. Щоб отримати текст, натисніть кнопку "Шукати тексти пісень."</message_newsong>
+<message_loading>Завантажується...</message_loading>
+<message_incorrect>Некоректний виконавець або назва.</message_incorrect>
+<message_notfound>Текст не знайден</message_notfound>
+<message_nosong>пісня не завантажена</message_nosong>

lyricsfinder.lua

@@ -226,7 +226,7 @@ local lang_os_to_iso = {
 function descriptor()
 	return {
 				title = "Lyrics Finder";
-				version = "0.3.5";
+				version = "0.3.6";
 				author = "rsyh93, alexxxnf, Smile4ever";
 				url = 'https://github.com/Smile4ever/VLC-Lyrics-Finder';
 				description = "<center><b>Lyrics Finder</b></center>"
@@ -567,8 +567,6 @@ function get_lyrics(title_x, artist_x)
 
 	if is_lyric_page(lyric_string) == false then		
 		local metrourl = "http://www.metrolyrics.com/"..metrotitle.."-lyrics-"..artist_metro..".html"
-		--lyric_string = fetch_lyrics(metrourl)
-
 		local artist_and_location = string.find(artist_metro, "-and-")
 
 		if artist_and_location then
@@ -822,6 +820,10 @@ function get_lyrics(title_x, artist_x)
 	end
 end
 
+function trim6(s)
+  return s:match'^()%s*$' and '' or s:match'^%s*(.*%S)'
+end
+
 function fetch_lyrics(url)
 	local metro_pos = url:find('metrolyrics')
 	local lyricsmania = url:find('lyricsmania')
@@ -883,7 +885,7 @@ function fetch_lyrics(url)
 				data:sub(endWidgetPhotos)
 
 		local lyricsEnd = string.find(data, "writers", a) - 10
-		return data:sub(a + 13, lyricsEnd)
+		return trim6(data:sub(a + 13, lyricsEnd))
 	end
 	if lyricsmania then
 		local strong_text = "</strong>"
@@ -1080,6 +1082,16 @@ function is_lyric_page(lyric_string)
 		return false
 	end
 
+	if lyric_string:find("Unfortunately, we aren't authorized to display these lyrics") then
+		--metrolyrics
+		return false
+	end
+
+	if lyric_string:find("No lyrics text found for this track.") then
+		--sonic hits
+		return false
+	end
+
 	if lyric_string:find("No lyrics found for this song") then
 		if debug_enabled then
 			vlc.msg.dbg("[Lyrics Finder] Data dump: " .. lyric_string)

nsis-installer/Setup.nsi

@@ -1,7 +1,7 @@
 ;Product Info
 Name "VLC Lyrics Finder"
 !define PRODUCT "VLC Lyrics Finder"
-!define VERSION "0.3.5"
+!define VERSION "0.3.6"
 !include "MUI.nsh"
 !include x64.nsh