[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Mark Kretschmann <markey () web ! de>
Date:       2006-01-27 16:54:58
Message-ID: 1138380898.651211.21605.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 502952 by markey:

Make "Add Lyrics" and "Search Lyrics" work again. (astraweb script doesn't yet support it)



 M  +11 -2     contextbrowser.cpp  
 M  +8 -10     scripts/lyrics_lyrc/lyrics_lyrc.rb  


--- trunk/extragear/multimedia/amarok/src/contextbrowser.cpp #502951:502952
@@ -2102,9 +2102,18 @@
     QString lyrics;
 
     QDomElement el = doc.documentElement();
-//     m_lyricAddUrl    = el.attribute( "add_url" );
-//     m_lyricSearchUrl = el.attribute( "search_url" )
+    m_lyricAddUrl    = el.attribute( "add_url" );
+    m_lyricSearchUrl = el.attribute( "search_url" );
 
+    m_lyricAddUrl.replace( "MAGIC_ARTIST", KURL::encode_string_no_slash( \
EngineController::instance()->bundle().artist() ) ); +    m_lyricAddUrl.replace( "MAGIC_TITLE", \
KURL::encode_string_no_slash( EngineController::instance()->bundle().title() ) ); +    \
m_lyricAddUrl.replace( "MAGIC_ALBUM", KURL::encode_string_no_slash( \
EngineController::instance()->bundle().album() ) ); +    m_lyricAddUrl.replace( "MAGIC_YEAR", \
KURL::encode_string_no_slash( QString::number( EngineController::instance()->bundle().year() ) ) ); +
+    m_lyricSearchUrl.replace( "MAGIC_ARTIST", KURL::encode_string_no_slash( '"' + \
EngineController::instance()->bundle().artist() + '"', 106 /*utf-8*/ ) ); +    m_lyricSearchUrl.replace( \
"MAGIC_TITLE", KURL::encode_string_no_slash( '"' + EngineController::instance()->bundle().title() + '"', \
106 /*utf-8*/ ) ); +
+
     if ( el.tagName() == "suggestions" )
     {
         lyrics = i18n( "Lyrics for track not found, here are some suggestions:" ) + "<br/><br/>";
--- trunk/extragear/multimedia/amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb #502951:502952
@@ -43,14 +43,8 @@
     doc = REXML::Document.new()
     root = doc.add_element( "lyrics" )
 
-#     m_lyricAddUrl = QString( "http://lyrc.com.ar/en/add/add.php?grupo=%1&tema=%2&disco=%3&ano=%4" \
                ).arg(
-#             KURL::encode_string_no_slash( artist ),
-#             KURL::encode_string_no_slash( title ),
-#             KURL::encode_string_no_slash( EngineController::instance()->bundle().album() ),
-#             KURL::encode_string_no_slash( QString::number( \
                EngineController::instance()->bundle().year() ) ) );
-#     m_lyricSearchUrl = QString( "http://www.google.com/search?ie=UTF-8&q=lyrics %1 %2" )
-#         .arg( KURL::encode_string_no_slash( '"'+EngineController::instance()->bundle().artist()+'"', \
                106 /*utf-8*/ ),
-#               KURL::encode_string_no_slash( '"'+title+'"', 106 /*utf-8*/ ) );
+    root.add_attribute( "add_url", \
"http://lyrc.com.ar/en/add/add.php?grupo=MAGIC_ARTIST&tema=MAGIC_TITLE&disco=MAGIC_ALBUM&ano=MAGIC_YEAR" \
) +    root.add_attribute( "search_url", "http://www.google.com/search?ie=UTF-8&q=lyrics MAGIC_ARTIST \
MAGIC_TITLE" )  
     root.add_attribute( "site", "Lyrc" )
     root.add_attribute( "site_url", "http://lyrc.com.ar" )
@@ -82,6 +76,9 @@
     doc = REXML::Document.new()
     root = doc.add_element( "suggestions" )
 
+    root.add_attribute( "add_url", \
"http://lyrc.com.ar/en/add/add.php?grupo=MAGIC_ARTIST&tema=MAGIC_TITLE&disco=MAGIC_ALBUM&ano=MAGIC_YEAR" \
) +    root.add_attribute( "search_url", "http://www.google.com/search?ie=UTF-8&q=lyrics MAGIC_ARTIST \
MAGIC_TITLE" ) +
     entries = lyrics.split( "<br>" )
     entries.delete_at( 0 )
 
@@ -119,7 +116,7 @@
     if url.empty?()
         response = h.get( "/en/tema1en.php?artist=#{artist}&songname=#{title}" )
     else
-        puts( "Fetching by URL: #{url}" )
+        debug "Fetching by URL: #{url}"
         response = h.get( "/en/#{url}" )
     end
 
@@ -156,7 +153,8 @@
 ##################################################################
 
 # fetchLyrics( "Cardigans", "Lovefool", "" )
-# fetchLyrics( "queen", "mama", "" )
+fetchLyrics( "queen", "mama", "" )
+ObjectSpace.garbage_collect
 # fetchLyrics( "station_rose_", "_dave_(original_1992)", "" )
 # exit()
 


[prev in list] [next in list] [prev in thread] [next in thread]