From 1abe1e566fd2039e8914400416b241d4adf41ca0 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 6 Sep 2009 10:53:44 +0000 Subject: removed broken LyricWiki.org support, added lyricsplugin.com instead git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1188 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/lyrics/lyricsfactory.cpp | 2 +- src/plugins/General/lyrics/lyricswindow.cpp | 64 +++++++--------------- src/plugins/General/lyrics/lyricswindow.h | 1 - .../lyrics/translations/lyrics_plugin_cs.ts | 29 ++++------ .../lyrics/translations/lyrics_plugin_de.ts | 29 ++++------ .../lyrics/translations/lyrics_plugin_it.ts | 29 ++++------ .../lyrics/translations/lyrics_plugin_lt.ts | 29 ++++------ .../lyrics/translations/lyrics_plugin_pl.ts | 29 ++++------ .../lyrics/translations/lyrics_plugin_ru.ts | 29 ++++------ .../lyrics/translations/lyrics_plugin_tr.ts | 29 ++++------ .../lyrics/translations/lyrics_plugin_uk_UA.ts | 30 +++++----- .../lyrics/translations/lyrics_plugin_zh_CN.ts | 29 ++++------ .../lyrics/translations/lyrics_plugin_zh_TW.ts | 29 ++++------ 13 files changed, 132 insertions(+), 226 deletions(-) (limited to 'src') diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp index 5fef65803..1ac6d28e8 100644 --- a/src/plugins/General/lyrics/lyricsfactory.cpp +++ b/src/plugins/General/lyrics/lyricsfactory.cpp @@ -49,7 +49,7 @@ void LyricsFactory::showAbout(QWidget *parent) { QMessageBox::about (parent, tr("About Lyrics Plugin"), tr("Qmmp Lyrics Plugin")+"\n"+ - tr("This plugin retrieves lyrics from LyricWiki.org")+"\n"+ + tr("This plugin retrieves lyrics from lyricsplugin.com")+"\n"+ tr("Writen by: Ilya Kotov ")); } diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index 04fb7f330..a3c9262bd 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -28,7 +28,6 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget *parent) : QWidget(parent) { - m_parse_url = FALSE; ui.setupUi(this); setWindowFlags(Qt::Dialog); setAttribute(Qt::WA_DeleteOnClose); @@ -57,52 +56,28 @@ void LyricsWindow::showText(bool error) if (error) { ui.textEdit->setText(m_http->errorString()); - m_parse_url = FALSE; return; } QString content = QString::fromUtf8(m_http->readAll().constData()); - if(m_parse_url) - { - QRegExp url_regexp(""); - if(url_regexp.indexIn(content) > 1) - { - QString url = qPrintable(url_regexp.cap(1)); - qDebug("LyricsWindow: url1=%s", qPrintable(url)); - if(url.endsWith("action=edit")) - ui.textEdit->setHtml(""+tr("Not found")+""); - else - { - url.replace("lyricwiki.org", "lyrics.wikia.com/lyrics"); - m_http->setHost("lyrics.wikia.com"); - qDebug("LyricsWindow: url2=%s", qPrintable(url)); - m_http->get(url); - } - } - else - ui.textEdit->setHtml(""+tr("Error")+""); - } + + QRegExp artist_regexp("
([^<]*)
"); + QRegExp title_regexp("
([^<]*)
"); + QRegExp lyrics_regexp("
([^<]*)
"); + artist_regexp.indexIn(content); + title_regexp.indexIn(content); + content.replace("
", "[br /]"); + lyrics_regexp.indexIn(content); + + QString text = "

" +artist_regexp.cap(1) + " - " + title_regexp.cap(1) + "

"; + QString lyrics = lyrics_regexp.cap(1); + lyrics.replace("[br /]", "
"); + if(lyrics.trimmed().isEmpty()) + ui.textEdit->setHtml("" + tr("Not found") + ""); else { - QRegExp caption_regexp("

([^<]*)

"); - caption_regexp.indexIn(content); - QString text = "

" + caption_regexp.cap(1) + "

"; - text.replace(":", " - "); - int lyric_begin = content.indexOf("
"); - if(lyric_begin > 0) - { - int lyric_end = content.indexOf("
", lyric_begin); - if(lyric_end > 0) - { - text.append(content.mid(lyric_begin, lyric_end - lyric_begin-6)); - ui.textEdit->setHtml(text); - } - else - ui.textEdit->setHtml(""+tr("Error")+""); - } - else - ui.textEdit->setHtml(""+tr("Error")+""); + text += lyrics; + ui.textEdit->setHtml(text); } - m_parse_url = FALSE; } void LyricsWindow::showState(int state) @@ -134,9 +109,8 @@ void LyricsWindow::showState(int state) void LyricsWindow::on_searchPushButton_clicked() { - m_http->setHost("lyricwiki.org"); + m_http->setHost("www.lyricsplugin.com"); setWindowTitle(QString(tr("Lyrics: %1 - %2")).arg(ui.artistLineEdit->text()).arg(ui.titleLineEdit->text())); - m_http->get("/api.php?func=getSong&artist=" + QUrl::toPercentEncoding(ui.artistLineEdit->text()) - +"&song=" + QUrl::toPercentEncoding(ui.titleLineEdit->text()) +"&fmt=html"); - m_parse_url = TRUE; + m_http->get("/winamp03/plugin/?artist=" + QUrl::toPercentEncoding(ui.artistLineEdit->text()) + +"&title=" + QUrl::toPercentEncoding(ui.titleLineEdit->text())); } diff --git a/src/plugins/General/lyrics/lyricswindow.h b/src/plugins/General/lyrics/lyricswindow.h index 1e99f7b07..51e8218b3 100644 --- a/src/plugins/General/lyrics/lyricswindow.h +++ b/src/plugins/General/lyrics/lyricswindow.h @@ -44,7 +44,6 @@ private slots: private: Ui::LyricsWindow ui; - bool m_parse_url; QHttp *m_http; }; diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts index 8247a441e..9b34d1a6f 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_cs.ts @@ -38,62 +38,55 @@ - This plugin retrieves lyrics from LyricWiki.org - Tento modul získává texty písní z LyricWiki.org + This plugin retrieves lyrics from lyricsplugin.com + Tento modul získává texty písní z lyricsplugin.com LyricsWindow - + Lyrics: %1 - %2 Text: %1 - %2 - + No connection Nespojeno - + Not found Nenalezeno - - - - Error - Chyba - - - + Looking up host... Vyhledávám hostitele... - + Connecting... Připojuji se... - + Sending request... Zasílám požadavek... - + Receiving Příjímám - + Connected Připojeno - + Closing connection... Zavírám spojení... diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts index 271ec2b7b..14ded51e7 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_de.ts @@ -38,62 +38,55 @@ - This plugin retrieves lyrics from LyricWiki.org - Dieses Modul empfängt Liedtexte von LyricWiki.org + This plugin retrieves lyrics from lyricsplugin.com + Dieses Modul empfängt Liedtexte von lyricsplugin.com LyricsWindow - + Lyrics: %1 - %2 Liedtext: %1 - %2 - + No connection Keine Verbindung - + Not found Es kann kein Liedtext für dieses Stück gefunden werden. - - - - Error - Fehler - - - + Looking up host... - + Connecting... Verbindung wird hergestellt ... - + Sending request... Anfrage wird gesendet ... - + Receiving Daten werden empfangen - + Connected Verbunden - + Closing connection... Verbindung wird beendet ... diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts index b93b4b5eb..4daa98b38 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_it.ts @@ -38,62 +38,55 @@ - This plugin retrieves lyrics from LyricWiki.org - Modulo che permette di trovare testi di canzoni da LyricWiki.org + This plugin retrieves lyrics from lyricsplugin.com + Modulo che permette di trovare testi di canzoni da lyricsplugin.com LyricsWindow - + Lyrics: %1 - %2 Testo: %1 - %2 - + No connection Nessuna connessione - + Not found - - - - Error - - - - + Looking up host... Ricerca host - + Connecting... Connessione... - + Sending request... Invio richiesta... - + Receiving Ricezione - + Connected Connesso - + Closing connection... Chiusura connessione... diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts index 564c4dcd5..e2698d353 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_lt.ts @@ -38,62 +38,55 @@ - This plugin retrieves lyrics from LyricWiki.org - Šis įskiepis atsiunčia dainų žodžius iš LyricWiki.org + This plugin retrieves lyrics from lyricsplugin.com + Šis įskiepis atsiunčia dainų žodžius iš lyricsplugin.com LyricsWindow - + Lyrics: %1 - %2 Dainos tekstas: %1 - %2 - + No connection Nėra ryšio - + Not found - - - - Error - - - - + Looking up host... Ieškau serverio... - + Connecting... Susijungiu... - + Sending request... Siunčiu užklausą... - + Receiving Gaunu - + Connected Susijungiau - + Closing connection... Atsijungiu... diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts index 29572ac21..172c2ad77 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_pl.ts @@ -33,8 +33,8 @@ - This plugin retrieves lyrics from LyricWiki.org - Ta wtyczka ściąga teksty piosenek z LyricWiki.org + This plugin retrieves lyrics from lyricsplugin.com + Ta wtyczka ściąga teksty piosenek z lyricsplugin.com @@ -45,55 +45,48 @@ LyricsWindow - + Not found Nie znaleziono - - - - Error - Błąd - - - + No connection Nie połączony - + Looking up host... Szukanie hosta... - + Connecting... Łączenie... - + Sending request... Wysyłanie żądania... - + Receiving Odbieranie - + Connected Połączony - + Closing connection... Zamykanie połączenia... - + Lyrics: %1 - %2 Teksty: %1 - %2 diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts index b3b10d568..22ed6ba07 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_ru.ts @@ -38,62 +38,55 @@ - This plugin retrieves lyrics from LyricWiki.org - Этот модуль предназначен для получания текстов песен из LyricWiki.org + This plugin retrieves lyrics from lyricsplugin.com + Этот модуль предназначен для получания текстов песен из lyricsplugin.com LyricsWindow - + Lyrics: %1 - %2 Текст песни: %1 - %2 - + No connection Нет соединения - + Not found - - - - Error - - - - + Looking up host... Поиск сервера... - + Connecting... Соединение... - + Sending request... Отправка запроса... - + Receiving Получение - + Connected Соединено - + Closing connection... Завершение соединения... diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts index 2491495c6..c650efd79 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_tr.ts @@ -33,8 +33,8 @@ - This plugin retrieves lyrics from LyricWiki.org - Bu eklenti şarkı sözlerini LyricWiki.org adresinden alır + This plugin retrieves lyrics from lyricsplugin.com + Bu eklenti şarkı sözlerini lyricsplugin.com adresinden alır @@ -45,55 +45,48 @@ LyricsWindow - + Not found - - - - Error - - - - + No connection Bağlantı yok - + Looking up host... Sunucu aranıyor... - + Connecting... Bağlanıyor... - + Sending request... İstek gönderiliyor... - + Receiving Alınıyor - + Connected Bağlandı - + Closing connection... Bağlantı kapatılıyor... - + Lyrics: %1 - %2 Şarkı Sözü: %1 - %2 diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts index 69d42f034..95fee4347 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_uk_UA.ts @@ -1,6 +1,6 @@ - - + + Lyrics @@ -38,59 +38,55 @@ - This plugin retrieves lyrics from LyricWiki.org - Цей модуль отримує тексти з LyricWiki.org + This plugin retrieves lyrics from lyricsplugin.com + Цей модуль отримує тексти з lyricsplugin.com LyricsWindow - + Lyrics: %1 - %2 Тексти: %1 - %2 + No connection Немає з'єднання - + Not found Не знайдено - - Error - Помилка - - - + Looking up host... Пошук хоста... - + Connecting... З'єднання... - + Sending request... Відсилання запиту... - + Receiving Отримання - + Connected З'єднано - + Closing connection... Закриття з'єднання... diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts index ffbae5b46..e3c947fbc 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_CN.ts @@ -38,62 +38,55 @@ - This plugin retrieves lyrics from LyricWiki.org - 此插件使用的歌词来源于 LyricWiki.org + This plugin retrieves lyrics from lyricsplugin.com + 此插件使用的歌词来源于 lyricsplugin.com LyricsWindow - + Lyrics: %1 - %2 歌词：%1 - %2 - + No connection 无连接 - + Not found - - - - Error - - - - + Looking up host... 查找主机... - + Connecting... 连接... - + Sending request... 发送请求... - + Receiving 接受 - + Connected 已连接 - + Closing connection... 关闭连接... diff --git a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts index 2be015fea..0772fc458 100644 --- a/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts +++ b/src/plugins/General/lyrics/translations/lyrics_plugin_zh_TW.ts @@ -38,62 +38,55 @@ - This plugin retrieves lyrics from LyricWiki.org - 此插件歌詞來自於 LyricWiki.org + This plugin retrieves lyrics from lyricsplugin.com + 此插件歌詞來自於 lyricsplugin.com LyricsWindow - + Lyrics: %1 - %2 歌詞：%1 - %2 - + No connection 無連接 - + Not found - - - - Error - - - - + Looking up host... 找尋主機... - + Connecting... 連接... - + Sending request... 發送請求... - + Receiving 接受 - + Connected 已連接 - + Closing connection... 關閉連接... -- cgit v1.2.3-13-gbd6f