moved readM3u and readPls to one function. fixed pls. more to come

3 files changed, 73 insertions, 74 deletions

diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 235d973..841d950 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -65,65 +65,66 @@ void Om3u::readM3u() {
         s=t.readLine();
 //                qDebug(s);
         if( s.find( "#", 0, TRUE) == -1 ) {
                 if( s.left(2) == "E:" || s.left(2) == "P:" ) {
                     s = s.right( s.length() -2 );
                     QFileInfo f( s );
                     QString name = f.baseName();
                     name = name.right( name.length() - name.findRev( "\\", -1, TRUE )  -1 );
                     s=s.replace( QRegExp( "\\" ), "/" );
                     append(s);
 //                    qDebug(s);
                 } else { // is url
                     s.replace( QRegExp( "%20" )," " );
                     QString name;
 //                     if( name.left( 4 ) == "http" ) {
 //                         name = s.right( s.length() - 7 );
 //                     } else {
                         name = s;
 //                     }
                     append(name);
 //                    qDebug(name);
                 }
         }
     }
 }
 
 void Om3u::readPls() { //it's a pls file
         QTextStream t( &f );
         QString s;
         while ( !t.atEnd() ) {
             s = t.readLine();
             if( s.left(4)  == "File" ) {
-                s = s.right( s.length() - 6 );
+                s = s.right( s.length() - s.find("=",0,true)-1 );
+                s = s.stripWhiteSpace();
                 s.replace( QRegExp( "%20" )," ");
 //                qDebug( "adding " + s + " to playlist" );
                 // numberofentries=2
                 // File1=http
                 // Title
                 // Length
                 // Version
                 // File2=http
                 s = s.replace( QRegExp( "\\" ), "/" );
                 QFileInfo f( s );
                 QString name = f.baseName();
                 if( name.left( 4 ) == "http" ) {
                     name = s.right( s.length() - 7);
                 }  else {
                     name = s;
                 }
                 name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
                 if( s.at( s.length() - 4) == '.') // if this is probably a file
                 append(s);
                 else { //if its a url
 //                     if( name.right( 1 ).find( '/' ) == -1) {
 //                         s += "/";
 //                     }
                     append(s);
                 }
             }
         }
 }
 
 void Om3u::write() { //writes list to m3u file
   QString list;
   if(count()>0) {
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index a65495e..6e2457f 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -78,65 +78,65 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
     (void)new MenuItem( pmPlayList, tr( "Add all video files" ),
                         this, SLOT( addAllVideoToList() ) );
     (void)new MenuItem( pmPlayList, tr( "Add all files" ),
                         this, SLOT( addAllToList() ) );
     pmPlayList->insertSeparator(-1);
 //     (void)new MenuItem( pmPlayList, tr( "Save PlayList" ),
 //                         this, SLOT( saveList() ) );
     (void)new MenuItem( pmPlayList, tr( "Save Playlist" ),
                         this, SLOT(writem3u() ) );
     pmPlayList->insertSeparator(-1);
     (void)new MenuItem( pmPlayList, tr( "Open File or URL" ),
                         this,SLOT( openFile() ) );
     pmPlayList->insertSeparator(-1);
     (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ),
                         audioView, SLOT( scanFiles() ) );
     (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ),
                         videoView, SLOT( scanFiles() ) );
 
     pmView->insertItem(  Resource::loadPixmap("fullscreen") , tr( "Full Screen"),
                          &mediaPlayerState, SLOT( toggleFullscreen() ) );
 
     Config cfg( "OpiePlayer" );
     bool b= cfg.readBoolEntry("FullScreen", 0);
     mediaPlayerState.setFullscreen(  b );
     pmView->setItemChecked( -16, b );
 
     (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up",
                           d->selectedFiles, SLOT(moveSelectedUp() ) );
     (void)new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut",
                           d->selectedFiles, SLOT(removeSelected() ) );
     (void)new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down",
                           d->selectedFiles, SLOT(moveSelectedDown() ) );
-    QVBox *stretch2 = new QVBox( vbox1 );
+    //    QVBox *stretch2 = new QVBox( vbox1 );
 
     connect( tbDeletePlaylist, ( SIGNAL( released() ) ),
              SLOT( deletePlaylist() ) );
     connect( pmView, SIGNAL( activated( int ) ),
              this, SLOT( pmViewActivated( int ) ) );
     connect( skinsMenu, SIGNAL( activated( int ) ) ,
              this, SLOT( skinsMenuActivated( int ) ) );
     connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ),
              this,SLOT( playlistViewPressed( int, QListViewItem *, const QPoint&, int ) ) );
     connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int ) ),
              this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int ) ) );
     connect( audioView, SIGNAL( returnPressed( QListViewItem *) ),
              this,SLOT( playIt( QListViewItem *) ) );
     connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ),
              this, SLOT( addToSelection( QListViewItem *) ) );
     connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ),
              this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) );
     connect( videoView, SIGNAL( returnPressed( QListViewItem *) ),
              this,SLOT( playIt( QListViewItem *) ) );
     connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ),
              this, SLOT( addToSelection( QListViewItem *) ) );
     connect( playLists, SIGNAL( fileSelected( const DocLnk &) ),
              this, SLOT( loadList( const DocLnk & ) ) );
     connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ),
              this, SLOT( tabChanged( QWidget* ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
              d->tbPlay,  SLOT( setOn( bool ) ) );
     connect( &mediaPlayerState, SIGNAL( loopingToggled( bool ) ),
              d->tbLoop, SLOT( setOn( bool ) ) );
     connect( &mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),
              d->tbShuffle, SLOT( setOn( bool ) ) );
     connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ),
@@ -336,82 +336,84 @@ void PlayListWidget::addAllVideoToList() {
 
   videoView->populateView();
 
   QListViewItemIterator videoIt( videoView );
   DocLnk lnk;
   QString filename;
   for ( ; videoIt.current(); ++videoIt ) {
     filename = videoIt.current()->text(3);
     lnk.setName( QFileInfo(filename).baseName() ); //sets name
     lnk.setFile( filename ); //sets file name
     d->selectedFiles->addToSelection(  lnk);
   }
 
 
   /*    if(!videoScan)
         scanForVideo();
     QListIterator<DocLnk> dit( vFiles.children() );
     for ( ; dit.current(); ++dit ) {
         if( QFileInfo( dit.current()->file() ).exists() ) {
             d->selectedFiles->addToSelection( **dit );
         }
     }
 */
     tabWidget->setCurrentPage(0);
     writeCurrentM3u();
     d->selectedFiles->first();
 }
 
 
 void PlayListWidget::setDocument( const QString& fileref ) {
   //    qDebug( "<<<<<<<<set document>>>>>>>>>> "+fileref );
     fromSetDocument = TRUE;
-    if ( fileref.isNull() ) {
+    QFileInfo fileInfo(fileref);
+    
+    if ( !fileInfo.exists() ) {
         QMessageBox::warning( this, tr( "Invalid File" ),
                                tr( "There was a problem in getting the file." ) );
         return;
     }
 
     clearList();
-    if( fileref.find( "m3u", 0, TRUE) != -1  ) { //is m3u
-        readm3u( fileref );
-    } else if( DocLnk( fileref).file().find( "m3u", 0, TRUE) != -1 ) {
-        readm3u( DocLnk( fileref).file() );
-    } else if( fileref.find( "pls", 0, TRUE) != -1 ) { //is pls
-        readPls( fileref );
-    } else if( DocLnk( fileref).file().find( "pls", 0, TRUE) != -1 ) {
-        readPls( DocLnk( fileref).file() );
+    QString extension = fileInfo.extension(false);
+
+    if( extension.find( "m3u", 0, false) != -1  
+       || extension.find( "pls", 0, false) != -1 ) {
+        readListFromFile( fileref );
     } else {
         clearList();
-        addToSelection( DocLnk( fileref ) );
+        DocLnk lnk;
+        lnk.setName( fileInfo.baseName() ); //sets name
+        lnk.setFile( fileref ); //sets file name
+        addToSelection( lnk );
         writeCurrentM3u();
 
         d->setDocumentUsed = TRUE;
         mediaPlayerState.setPlaying( FALSE );
         mediaPlayerState.setPlaying( TRUE );
     }
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 const DocLnk *PlayListWidget::current() const { // this is fugly
     assert( currentTab() == CurrentPlayList );
 
     const DocLnk *lnk = d->selectedFiles->current();
     if ( !lnk ) {
         d->selectedFiles->first();
         lnk = d->selectedFiles->current();
     }
     assert( lnk );
     return lnk;
 }
 
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState.isShuffled() ) {
         const DocLnk *cur = current();
         int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
         for ( int i = 0; i < j; i++ ) {
@@ -447,65 +449,66 @@ bool PlayListWidget::next() {
             } else {
                 return FALSE;
             }
         }
         return TRUE;
     }
 }
 
 
 bool PlayListWidget::first() {
     return d->selectedFiles->first();
 }
 
 
 bool PlayListWidget::last() {
     return d->selectedFiles->last();
 }
 
 
  void PlayListWidget::saveList() {
    writem3u();
  }
 
 
 void PlayListWidget::loadList( const DocLnk & lnk) {
     QString name = lnk.name();
     //  qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
 
     if( name.length()>0) {
         setCaption("OpiePlayer: "+name);
 //       qDebug("<<<<<<<<<<<<load list "+ lnk.file());
         clearList();
-        readm3u(lnk.file());
+//        readm3u(lnk.file());
+        readListFromFile(lnk.file());
         tabWidget->setCurrentPage(0);
     }
 }
 
 void PlayListWidget::addSelected() {
   assert( inFileListMode() );
 
   QListViewItemIterator it( currentFileListView );
   for ( ; it.current(); ++it )
       if ( it.current()->isSelected() ) {
           QString filename = it.current()->text(3);
 
           DocLnk lnk;
           lnk.setName( QFileInfo( filename ).baseName() ); //sets name
           lnk.setFile( filename ); //sets file name
 
           d->selectedFiles->addToSelection( lnk );
       }
 
   currentFileListView->clearSelection();
 
 //  tabWidget->setCurrentPage( 0 );
   writeCurrentM3u();
 }
 
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
     writeCurrentM3u();
 }
 
 
@@ -651,179 +654,173 @@ void PlayListWidget::openFile() {
     fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->text();
         qDebug( "Selected filename is " + filename );
         //            Om3u *m3uList;
             DocLnk lnk;
             Config cfg( "OpiePlayer" );
             cfg.setGroup("PlayList");
 
         if(filename.left(4) == "http") {
             QString m3uFile, m3uFilePath;
             if(filename.find(":",8,TRUE) != -1) { //found a port
                 m3uFile = filename.left( filename.find( ":",8,TRUE));
                 m3uFile = m3uFile.right(  7);
             } else if(filename.left(4) == "http"){
                 m3uFile=filename;
                 m3uFile = m3uFile.right( m3uFile.length() - 7);
             } else{
                 m3uFile=filename;
             }
 
 //            qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile);
             lnk.setName( filename ); //sets name
             lnk.setFile( filename ); //sets file name
 
 //            lnk.setIcon("opieplayer2/musicfile");
 
             d->selectedFiles->addToSelection(  lnk );
             writeCurrentM3u();
             d->selectedFiles->setSelectedItem( lnk.name());
         }
-        else if( filename.right( 3) == "m3u" ) {
-            readm3u( filename );
-
-        } else if( filename.right(3) == "pls" ) {
-            readPls( filename );
+        else if( filename.right( 3) == "m3u" ||  filename.right(3) == "pls" ) {
+            readListFromFile( filename );
+//            readPls( filename );
         } else {
             lnk.setName( QFileInfo(filename).baseName() ); //sets name
             lnk.setFile( filename ); //sets file name
             d->selectedFiles->addToSelection(  lnk);
             writeCurrentM3u();
             d->selectedFiles->setSelectedItem( lnk.name());
         }
     }
 
+
     delete fileDlg;
 }
 
-/*
-reads m3u and shows files/urls to playlist widget */
-void PlayListWidget::readm3u( const QString &filename ) {
-    qDebug( "read m3u filename " + filename );
-
+void PlayListWidget::readListFromFile( const QString &filename ) {
+    qDebug( "read list filename " + filename );
+    QFileInfo fi(filename);
     Om3u *m3uList;
     QString s, name;
     m3uList = new Om3u( filename, IO_ReadOnly );
+    if(fi.extension(false).find("m3u",0,false) != -1 )
     m3uList->readM3u();
+    else if(fi.extension(false).find("pls",0,false) != -1 )
+        m3uList->readPls();
+
     DocLnk lnk;
     for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
         s = *it;
-//          qDebug("reading "+ s);
+        //        qDebug(s);
         if(s.left(4)=="http") {
           lnk.setName( s ); //sets file name
           lnk.setIcon("opieplayer2/musicfile");
           lnk.setFile( s ); //sets file name
 
-        }  else {
-          //               if( QFileInfo( s ).exists() ) {
+        }  else { //is file
           lnk.setName( QFileInfo(s).baseName());
-          //                 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(MimeType(s).pixmap() );
-//            lnk.setIcon("SoundPlayer");
           } else {
-            //            qDebug("set link2 "+s);
             lnk.setFile( s);
-//            lnk.setIcon(MimeType(s).pixmap() );
-//            lnk.setIcon("SoundPlayer");
           }
         }
         d->selectedFiles->addToSelection( lnk );
     }
     Config config( "OpiePlayer" );
     config.setGroup( "PlayList" );
 
     config.writeEntry("CurrentPlaylist",filename);
     config.write();
     currentPlayList=filename;
 
 //    m3uList->write();
     m3uList->close();
     delete m3uList;
 
     d->selectedFiles->setSelectedItem( s);
     setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName());
 
 }
 
-/*
-reads pls and adds files/urls to playlist  */
-void PlayListWidget::readPls( const QString &filename ) {
+// /*
+// reads pls and adds files/urls to playlist  */
+// void PlayListWidget::readPls( const QString &filename ) {
 
-    qDebug( "pls filename is " + filename );
-    Om3u *m3uList;
-    QString s, name;
-    m3uList = new Om3u( filename, IO_ReadOnly );
-    m3uList->readPls();
-
-    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();
-
-        if( name.left( 4 ) == "http" ) {
-            name = s.right( s.length() - 7);
-        }  else {
-            name = s;
-        }
+//     qDebug( "pls filename is " + filename );
+//     Om3u *m3uList;
+//     QString s, name;
+//     m3uList = new Om3u( filename, IO_ReadOnly );
+//     m3uList->readPls();
+
+//     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();
+
+//         if( name.left( 4 ) == "http" ) {
+//             name = s.right( s.length() - 7);
+//         }  else {
+//             name = s;
+//         }
 
-        name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
+//         name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
 
-        lnk.setName( name );
-        if( s.at( s.length() - 4) == '.') {// if this is probably a file
-            lnk.setFile( s );
-         } else { //if its a url
-//             if( name.right( 1 ).find( '/' ) == -1) {
-//                 s += "/";
+//         lnk.setName( name );
+//         if( s.at( s.length() - 4) == '.') {// if this is probably a file
+//             lnk.setFile( s );
+//          } else { //if its a url
+// //             if( name.right( 1 ).find( '/' ) == -1) {
+// //                 s += "/";
+// //             }
+//             lnk.setFile( s );
 //             }
-            lnk.setFile( s );
-        }
-        lnk.setType( "audio/x-mpegurl" );
+//         lnk.setType( "audio/x-mpegurl" );
 
-        lnk.writeLink();
-        d->selectedFiles->addToSelection( lnk );
-    }
+//         lnk.writeLink();
+//         d->selectedFiles->addToSelection( lnk );
+//     }
 
-    m3uList->close();
-    delete m3uList;
-}
+//     m3uList->close();
+//     delete m3uList;
+// }
 
-/*
- writes current playlist to current m3u file */
+// /*
+//  writes current playlist to current m3u file */
 void PlayListWidget::writeCurrentM3u() {
   qDebug("writing to current m3u");
   Config cfg( "OpiePlayer" );
   cfg.setGroup("PlayList");
   QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default");
 
   Om3u *m3uList;
   m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate );
   if( d->selectedFiles->first()) {
 
       do {
           //      qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file());
           m3uList->add( d->selectedFiles->current()->file() );
       }
       while ( d->selectedFiles->next() );
       //    qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
       m3uList->write();
       m3uList->close();
   }
   delete m3uList;
 
 }
 
   /*
  writes current playlist to m3u file */
 void PlayListWidget::writem3u() {
     InputDialog *fileDlg;
     fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0);
     fileDlg->exec();
     QString name, filename, list;
     Om3u *m3uList;
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index e8bf211..cb65d5c 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -65,66 +65,67 @@ public:
         Entry( const QString &_fileName )
             : name( _fileName ), file( _fileName ) {}
 
         QString name;
         QString file;
     };
 
     PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~PlayListWidget();
 
     // retrieve the current playlist entry (media file link)
     const DocLnk *current() const;
     void useSelectedDocument();
     TabType currentTab() const;
 
     Entry currentEntry() const;
 
 public slots:
     bool first();
     bool last();
     bool next();
     bool prev();
     void writeDefaultPlaylist( );
     QString currentFileListPathName() const;
 protected:
     void keyReleaseEvent( QKeyEvent *e);
 
 signals:
     void skinSelected();
 
 private:
     int defaultSkinIndex;
-    void readm3u(const QString &);
-    void readPls(const QString &);
+/*     void readm3u(const QString &); */
+/*     void readPls(const QString &); */
+    void readListFromFile(const QString &);
     void initializeStates();
 
     bool inFileListMode() const;
 
 private slots:
     void populateSkinsMenu();
     void skinsMenuActivated(int);
     void pmViewActivated(int);
     void writem3u();
     void writeCurrentM3u();
     void openFile();
     void setDocument( const QString& fileref );
     void addToSelection( const DocLnk& ); // Add a media file to the playlist
     void addToSelection( QListViewItem* ); // Add a media file to the playlist
     void clearList();
     void addAllToList();
     void addAllMusicToList();
     void addAllVideoToList();
     void saveList();  // Save the playlist
     void loadList( const DocLnk &);  // Load a playlist
     void playIt( QListViewItem *);
     void btnPlay(bool);
     void deletePlaylist();
     void addSelected();
     void removeSelected();
     void tabChanged(QWidget*);
     void viewPressed( int, QListViewItem *, const QPoint&, int);
     void playlistViewPressed( int, QListViewItem *, const QPoint&, int);
     void playSelected();
 
 private:
     bool fromSetDocument;