fix for a stupid bug .. op1 wants to strip the extension, but instead

stripps everything after the first '.'. So filenames like
"02. foobar.mp3" become "02"

1 files changed, 14 insertions, 7 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index c28548c..8b25a4c 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -80,12 +80,19 @@
 #define CAN_SAVE_LOAD_PLAYLISTS
 
 extern AudioWidget *audioUI;
 extern VideoWidget *videoUI;
 extern MediaPlayerState *mediaPlayerState;
 
+static inline QString fullBaseName ( const QFileInfo &fi )
+{
+        QString str = fi. fileName ( );
+        return str. left ( str. findRev ( '.' ));
+}
+
+
 QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg";
 // class myFileSelector {
 
 // };
 class PlayListWidgetPrivate {
 public:
@@ -321,13 +328,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     setCentralWidget( vbox5 );
 
     Config cfg( "OpiePlayer" );
     readConfig( cfg );
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default");
     loadList(DocLnk( currentPlaylist));
-    setCaption(tr("OpiePlayer: ")+ QFileInfo(currentPlaylist).baseName());
+    setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlaylist)));
     
     initializeStates();
 }
 
 
 PlayListWidget::~PlayListWidget() {
@@ -678,13 +685,13 @@ void PlayListWidget::addSelected() {
     filename=videoView->currentItem()->text(3);
     //          tabWidget->setCurrentPage(0);
     
   }
     break;
   };
-  lnk.setName( QFileInfo(filename).baseName() ); //sets name
+  lnk.setName( fullBaseName ( QFileInfo(filename))); //sets name
   lnk.setFile( filename ); //sets file name
   d->selectedFiles->addToSelection(  lnk);
   tabWidget->setCurrentPage(0);
   writeCurrentM3u();          
 
 }
@@ -713,13 +720,13 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
     };
     //      case 1: {
     DocLnk lnk;
     QString filename;
 
     filename=it->text(3);
-    lnk.setName( QFileInfo(filename).baseName() ); //sets name
+    lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
     lnk.setFile( filename ); //sets file name
     d->selectedFiles->addToSelection(  lnk);
  
     writeCurrentM3u();          
     tabWidget->setCurrentPage(0);
         
@@ -1035,13 +1042,13 @@ void PlayListWidget::openFile() {
         else if( filename.right( 3) == "m3u" ) {
             readm3u( filename );
 
         } else if( filename.right(3) == "pls" ) {
             readPls( filename );
         } else {
-            lnk.setName( QFileInfo(filename).baseName() ); //sets name
+            lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
             lnk.setFile( filename ); //sets file name
             d->selectedFiles->addToSelection(  lnk);
             writeCurrentM3u();
         }
     }
             
@@ -1071,13 +1078,13 @@ void PlayListWidget::readm3u( const QString &filename ) {
             lnk.setFile( s+"/"); //if url with no extension
           else
             lnk.setFile( s ); //sets file name
             
         }  else {
           //               if( QFileInfo( s ).exists() ) {
-          lnk.setName( QFileInfo(s).baseName());
+          lnk.setName( fullBaseName ( QFileInfo(s)));
           //                 if(s.right(4) == '.')   {//if regular file
           if(s.left(1) != "/")  { 
             //            qDebug("set link "+QFileInfo(filename).dirPath()+"/"+s);
             lnk.setFile( QFileInfo(filename).dirPath()+"/"+s);
             lnk.setIcon("SoundPlayer");
           } else {
@@ -1097,13 +1104,13 @@ void PlayListWidget::readm3u( const QString &filename ) {
 
 //    m3uList->write();
     m3uList->close();
     if(m3uList) delete m3uList;
 
     d->selectedFiles->setSelectedItem( s);
-    setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName());
+    setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(filename)));
     
 }
 
 /*
 reads pls and adds files/urls to playlist  */
 void PlayListWidget::readPls( const QString &filename ) {
@@ -1116,13 +1123,13 @@ void PlayListWidget::readPls( const QString &filename ) {
 
     for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
         s = *it;
         //        s.replace( QRegExp( "%20" )," " );
         DocLnk lnk( s );
         QFileInfo f( s );
-        QString name = f.baseName();
+        QString name = fullBaseName ( f);
 
         if( name.left( 4 ) == "http" ) {
             name = s.right( s.length() - 7);
         }  else {
             name = s;
         }