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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Leo Franchi <lfranchi () gmail ! com>
Date:       2008-09-01 3:08:18
Message-ID: 1220238498.353646.18884.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 855535 by lfranchi:

remove stale code, and clean up newlines in lyrics better


 M  +0 -2      context/applets/lyrics/LyricsApplet.cpp  
 M  +21 -17    scripts/lyrics_lyrc/main.js  


--- trunk/extragear/multimedia/amarok/src/context/applets/lyrics/LyricsApplet.cpp #855534:855535
@@ -93,8 +93,6 @@
         QVariantList lyrics  = data[ "lyrics" ].toList();
 
         m_lyrics->setPlainText( lyrics[ 3 ].toString() );
-        //m_lyrics->adjustSize();
-        //m_lyricsProxy->resize( m_lyrics->size() );
     }
     else if( data.contains( "notfound" ) )
         m_lyrics->setPlainText( i18n( "There were no lyrics found for this track" ) );
--- trunk/extragear/multimedia/amarok/src/scripts/lyrics_lyrc/main.js #855534:855535
@@ -56,23 +56,24 @@
     root.setAttribute( "artist", artistStr );
 
     try {
-    lyrics = /(<\/u><\/font>)(.*)/.exec( lyrics )[ 2 ];
-    // html -> plaintext:
-    lyrics = lyrics.replace( /<[Bb][Rr][^>]*>/g, "\n" );
-    lyrics = lyrics.replace( /\n\n/g, "\n" );
-    lyrics = lyrics.replace( /<.*>/g, "" ); // erase everything after the lyric
-    lyricsStr = lyrics.replace( /\n\n\n[\n]+/g, "\n" );
-    //print( "got cleaned lyrics: " + lyrics );
+        lyrics = /(<\/u><\/font>)(.*)/.exec( lyrics )[ 2 ];
+        // html -> plaintext:
+        lyrics = lyrics.replace( /<[Bb][Rr][^>]*>/g, "\n" );
+        lyrics = lyrics.replace( "\n\n", "" ).replace( "\r", "" );
+        lyrics = lyrics.replace( "\n\n", "\n" ).replace( "\r", "" );
+        lyrics = lyrics.replace( /<.*>/g, "" ); // erase everything after the lyric
+        lyricsStr = lyrics.replace( /\n\n[\n]+/g, "\n" );
+        //print( "got cleaned lyrics: " + lyrics );
 
-    xml = xml.replace( "{artist}", artistStr );
-    xml = xml.replace( "{title}", titleStr );
-    xml = xml.replace( "{page}", page_url );
-    xml = xml.replace( "{lyrics}", lyricsStr );
-    text = doc.createTextNode( "lyricsText" );
-    text.setData( lyricsStr );
+        xml = xml.replace( "{artist}", artistStr );
+        xml = xml.replace( "{title}", titleStr );
+        xml = xml.replace( "{page}", page_url );
+        xml = xml.replace( "{lyrics}", lyricsStr );
+        text = doc.createTextNode( "lyricsText" );
+        text.setData( lyricsStr );
 
-    //xml = doc.toString();
-    print( "xml: " + xml );
+        //xml = doc.toString();
+        print( "xml: " + xml );
     } catch (err) {
         print( "error!: " + err );
     }
@@ -86,7 +87,9 @@
     //Amarok.alert( "lyrics slot called!" );
     print( "got result from lyrics fetch:" + reply );
     try {
-        print( "got size of result from lyrics fetch:" + reply.size() );
+        Importer.loadQtBinding( "qt.network" );
+        Importer.loadQtBinding( "qt.core" );
+//        print( "got size of result from lyrics fetch:" + reply.size() );
         lyrics = reply.readAll().toString();
     } catch( err )
     {
@@ -115,8 +118,9 @@
         parseLyrics( lyrics.slice( lyricsPos ) );
     } else if( lyrics.indexOf( "Suggestions" ) > 0 )
     {
-        Amarok.alert( "Suggestions not implemented yet" );
+        //Amarok.alert( "Suggestions not implemented yet" );
         // TODO parse suggestions
+        print( "suggestions not implemented yet" );
     }
 
 }
[prev in list] [next in list] [prev in thread] [next in thread]