From 3ab81e9becd4492a25bfe0e80d3e2375835ea8ad Mon Sep 17 00:00:00 2001 From: Max Bo Date: Mon, 11 Aug 2014 19:44:10 +0600 Subject: [PATCH] Fix sites.js formatting, ultimate_providers.xml update --- data/lyrics/ultimate_providers.xml | 7 +++++ tools/ultimate_lyrics_parser/sites.js | 38 +++++++++++++-------------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/data/lyrics/ultimate_providers.xml b/data/lyrics/ultimate_providers.xml index da2ebb18a..e353a62b1 100644 --- a/data/lyrics/ultimate_providers.xml +++ b/data/lyrics/ultimate_providers.xml @@ -59,6 +59,13 @@ + + + + + + + diff --git a/tools/ultimate_lyrics_parser/sites.js b/tools/ultimate_lyrics_parser/sites.js index 13a93b1b5..3282664da 100644 --- a/tools/ultimate_lyrics_parser/sites.js +++ b/tools/ultimate_lyrics_parser/sites.js @@ -376,25 +376,25 @@ const siteDescriptors = { charset: "utf-8", extract: [['?','",""]], - invalidIndicator: "Verifique se o nome do seu arquivo e sua", - }, - "lololyrics.com": { - charset: "utf-8", - url: "http://api.lololyrics.com/0.5/getLyric?artist={artist}&track={title}", - urlFormat : [ - {rep: "_", punct: "_@,;&\\/\"#" }, - ], - extract: '', - invalidIndicator: "ERROR", - }, + "letras.mus.br": { + charset: "iso-8859-1", + url: "http://letras.terra.com.br/winamp.php?musica={title}&artista={artist}", + urlFormat : [ + {rep: "_", punct: "_@,;&\\/\"" }, + {rep: "+", punct: " " }, + ], + extract: [["",""]], + invalidIndicator: "Verifique se o nome do seu arquivo e sua", + }, + "lololyrics.com": { + charset: "utf-8", + url: "http://api.lololyrics.com/0.5/getLyric?artist={artist}&track={title}", + urlFormat : [ + {rep: "_", punct: "_@,;&\\/\"#" }, + ], + extract: '', + invalidIndicator: "ERROR", + }, } // --------------------------------------------------------------------------------------------------------------------------------