check for local file existing before adding to playlist

1 files changed, 26 insertions, 18 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index e33998f..612fd45 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -229,198 +229,200 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     tabWidget->insertTab(aTab,tr("Audio"));
 
     QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
 
     QWidget *vTab;
     vTab = new QWidget( tabWidget, "vTab" );
     videoView = new QListView( vTab, "Videoview" );
     videoView->setMinimumSize(233,260);
 
     videoView->addColumn(tr("Title"),140);
     videoView->addColumn(tr("Size"),-1);
     videoView->addColumn(tr("Media"),-1);
     videoView->setColumnAlignment(1, Qt::AlignRight);
     videoView->setColumnAlignment(2, Qt::AlignRight);
     videoView->setAllColumnsShowFocus(TRUE);
     videoView->setMultiSelection( TRUE );
     videoView->setSelectionMode( QListView::Extended);
 
     QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
 
     tabWidget->insertTab( vTab,tr("Video"));
 
     //playlists list
     QWidget *LTab;
     LTab = new QWidget( tabWidget, "LTab" );
     playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
     playLists->setMinimumSize(233,260);
     tabWidget->insertTab(LTab,tr("Lists"));
 
     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( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled() ) );
 
     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( mediaPlayerState, SIGNAL( playlistToggled( bool ) ),   this,         SLOT( setPlaylist( bool ) ) );
     connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
 
     setCentralWidget( vbox5 );
 
     readConfig( cfg );
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
     loadList(DocLnk( currentPlaylist));
     setCaption(tr("OpiePlayer: ")+ currentPlaylist );
 
     initializeStates();
 }
 
 
 PlayListWidget::~PlayListWidget() {
     Config cfg( "OpiePlayer" );
     writeConfig( cfg );
 
     if ( d->current ) {
         delete d->current;
     }
     delete d;
 }
 
 
 void PlayListWidget::initializeStates() {
 
     d->tbPlay->setOn( mediaPlayerState->playing() );
     d->tbLoop->setOn( mediaPlayerState->looping() );
     d->tbShuffle->setOn( mediaPlayerState->shuffled() );
     setPlaylist( true);
 }
 
 
 void PlayListWidget::readConfig( Config& cfg ) {
     cfg.setGroup("PlayList");
     QString currentString = cfg.readEntry("current", "" );
     int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
     for ( int i = 0; i < noOfFiles; i++ ) {
         QString entryName;
         entryName.sprintf( "File%i", i + 1 );
         QString linkFile = cfg.readEntry( entryName );
-        DocLnk lnk( linkFile );
-        if ( lnk.isValid() ) {
-            d->selectedFiles->addToSelection( lnk );
+        if(QFileInfo( linkFile).exists() ) {
+            DocLnk lnk( linkFile );
+            if ( QFileInfo( lnk.file()).exists() || linkFile.find("http",0,TRUE) != -1) {
+                d->selectedFiles->addToSelection( lnk );
+            }
         }
     }
-    d->selectedFiles->setSelectedItem( currentString);
+d->selectedFiles->setSelectedItem( currentString);
 }
 
 
 void PlayListWidget::writeConfig( Config& cfg ) const {
 
     d->selectedFiles->writeCurrent( cfg);
     cfg.setGroup("PlayList");
     int noOfFiles = 0;
     d->selectedFiles->first();
     do {
         const DocLnk *lnk = d->selectedFiles->current();
         if ( lnk ) {
             QString entryName;
             entryName.sprintf( "File%i", noOfFiles + 1 );
             cfg.writeEntry( entryName, lnk->linkFile() );
               // if this link does exist, add it so we have the file
               // next time...
             if ( !QFile::exists( lnk->linkFile() ) ) {
                   // the way writing lnks doesn't really check for out
                   // of disk space, but check it anyway.
                 if ( !lnk->writeLink() ) {
                     QMessageBox::critical( 0, tr("Out of space"),
                                            tr( "There was a problem saving "
                                                "the playlist.\n"
                                                "Your playlist "
                                                "may be missing some entries\n"
                                                "the next time you start it." )
                                            );
                 }
             }
             noOfFiles++;
         }
     }
     while ( d->selectedFiles->next() );
     cfg.writeEntry("NumberOfFiles", noOfFiles );
 }
 
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
         d->setDocumentUsed = FALSE;
         if ( mediaPlayerState->playlist() ) {
             if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" )
                 d->selectedFiles->addToSelection( lnk );
         }
         else
             mediaPlayerState->setPlaying( TRUE );
 }
 
 
 void PlayListWidget::clearList() {
     while ( first() ) {
         d->selectedFiles->removeSelected();
     }
 }
 
 
 void PlayListWidget::addAllToList() {
     DocLnkSet filesAll;
     Global::findDocuments(&filesAll, "video/*;audio/*");
     QListIterator<DocLnk> Adit( filesAll.children() );
     for ( ; Adit.current(); ++Adit ) {
         if(QFileInfo(Adit.current()->file()).exists()) {
             d->selectedFiles->addToSelection( **Adit );
         }
     }
 }
 
 
 void PlayListWidget::addAllMusicToList() {
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit ) {
         if(QFileInfo(dit.current()->file()).exists()) {
             d->selectedFiles->addToSelection( **dit );
         }
     }
 }
 
 
 void PlayListWidget::addAllVideoToList() {
     QListIterator<DocLnk> dit( vFiles.children() );
     for ( ; dit.current(); ++dit )
         if(QFileInfo( dit.current()->file()).exists())
             d->selectedFiles->addToSelection( **dit );
 }
 
 
 void PlayListWidget::setDocument(const QString& fileref) {
     qDebug(fileref);
     fromSetDocument = TRUE;
     if ( fileref.isNull() ) {
         QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
         return;
     }
 
     if(fileref.find("m3u",0,TRUE) != -1) { //is m3u
         readm3u( fileref);
@@ -558,252 +560,256 @@ bool PlayListWidget::first() {
 }
 
 
 bool PlayListWidget::last() {
     if ( mediaPlayerState->playlist() )
         return d->selectedFiles->last();
     else
         return mediaPlayerState->looping();
 }
 
 
 void PlayListWidget::saveList() {
 
     QString filename;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         if ( d->current )
             delete d->current;
         filename = fileDlg->LineEdit1->text();//+".playlist";
         //         qDebug("saving playlist "+filename+".playlist");
         Config cfg( filename +".playlist");
         writeConfig( cfg );
 
         DocLnk lnk;
         lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
         lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
         lnk.setIcon("opieplayer2/playlist2");
         lnk.setName( filename); //sets file name
         // qDebug(filename);
         if(!lnk.writeLink()) {
             qDebug("Writing doclink did not work");
         }
     }
     Config config( "OpiePlayer" );
     config.writeEntry("CurrentPlaylist",filename);
     setCaption(tr("OpiePlayer: ")+filename);
     d->selectedFiles->first();
     if(fileDlg) {
         delete fileDlg;
     }
 }
 
 void PlayListWidget::loadList( const DocLnk & lnk) {
     QString name= lnk.name();
     // qDebug("currentList is "+name);
     if( name.length()>1) {
         setCaption("OpiePlayer: "+name);
         // qDebug("load list "+ name+".playlist");
         clearList();
         Config cfg( name+".playlist");
         readConfig(cfg);
 
         tabWidget->setCurrentPage(0);
 
         Config config( "OpiePlayer" );
         config.writeEntry("CurrentPlaylist", name);
         //        d->selectedFiles->first();
     }
 
 }
 
 void PlayListWidget::setPlaylist( bool shown ) {
     if ( shown ) {
         d->playListFrame->show();
     } else {
         d->playListFrame->hide();
     }
 }
 
 void PlayListWidget::setView( char view ) {
     if ( view == 'l' )
         showMaximized();
     else
         hide();
 }
 
 void PlayListWidget::addSelected() {
 
     Config cfg( "OpiePlayer" );
     cfg.setGroup("PlayList");
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
 //    int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
 
     switch (tabWidget->currentPageIndex()) {
       case 0: //playlist
           break;
       case 1: { //audio
           QListViewItemIterator it(  audioView  );
             // iterate through all items of the listview
           for ( ; it.current(); ++it ) {
               if ( it.current()->isSelected() ) {
                   QListIterator<DocLnk> dit( files.children() );
                   for ( ; dit.current(); ++dit ) {
                       if( dit.current()->name() == it.current()->text(0) ) {
-                          d->selectedFiles->addToSelection(  **dit );
+                          if(QFileInfo( dit.current()->file()).exists())
+                              d->selectedFiles->addToSelection(  **dit );
                       }
                   }
                   audioView->setSelected( it.current(),FALSE);
               }
           }
           tabWidget->setCurrentPage(0);
       }
       break;
       case 2: { // video
           QListViewItemIterator it(  videoView  );
             // iterate through all items of the listview
           for ( ; it.current(); ++it ) {
               if ( it.current()->isSelected() ) {
                   QListIterator<DocLnk> dit( vFiles.children() );
                   for ( ; dit.current(); ++dit ) {
                       if( dit.current()->name() == it.current()->text(0) ) {
-                          d->selectedFiles->addToSelection(  **dit );
+                          if(QFileInfo( dit.current()->file()).exists())
+                              d->selectedFiles->addToSelection(  **dit );
                       }
                   }
                   videoView->setSelected( it.current(),FALSE);
               }
           }
           tabWidget->setCurrentPage(0);
       }
       break;
     };
 }
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
 }
 
 void PlayListWidget::playIt( QListViewItem *it) {
     // if(it==NULL) return;
     qDebug("playIt");
     mediaPlayerState->setPlaying(FALSE);
     mediaPlayerState->setPlaying(TRUE);
     d->selectedFiles->unSelect();
 }
 
 void PlayListWidget::addToSelection( QListViewItem *it) {
     d->setDocumentUsed = FALSE;
 
     if(it) {
         switch (tabWidget->currentPageIndex()) {
           case 1: {
               QListIterator<DocLnk> dit( files.children() );
               for ( ; dit.current(); ++dit ) {
                   if( dit.current()->name() == it->text(0)) {
-                      d->selectedFiles->addToSelection(  **dit );
+                      if(QFileInfo( dit.current()->file()).exists())
+                          d->selectedFiles->addToSelection(  **dit );
                   }
               }
           }
           break;
           case 2: {
               QListIterator<DocLnk> dit( vFiles.children() );
               for ( ; dit.current(); ++dit ) {
                   if( dit.current()->name() == it->text(0)) {
-                      d->selectedFiles->addToSelection(  **dit );
+                      if(QFileInfo( dit.current()->file()).exists())
+                          d->selectedFiles->addToSelection(  **dit );
                   }
               }
           }
           break;
           case 0:
               break;
         };
         tabWidget->setCurrentPage(0);
     }
 }
 
 void PlayListWidget::tabChanged(QWidget *) {
 
     switch ( tabWidget->currentPageIndex()) {
       case 0:
       {
           if( !tbDeletePlaylist->isHidden())
               tbDeletePlaylist->hide();
           d->tbRemoveFromList->setEnabled(TRUE);
           d->tbAddToList->setEnabled(FALSE);
       }
       break;
       case 1:
       {
           audioView->clear();
           populateAudioView();
 
           if( !tbDeletePlaylist->isHidden())
               tbDeletePlaylist->hide();
           d->tbRemoveFromList->setEnabled(FALSE);
           d->tbAddToList->setEnabled(TRUE);
       }
       break;
       case 2:
       {
           videoView->clear();
           populateVideoView();
           if( !tbDeletePlaylist->isHidden())
               tbDeletePlaylist->hide();
           d->tbRemoveFromList->setEnabled(FALSE);
           d->tbAddToList->setEnabled(TRUE);
       }
       break;
       case 3:
       {
           if( tbDeletePlaylist->isHidden())
               tbDeletePlaylist->show();
           playLists->reread();
       }
       break;
     };
 }
 
 void PlayListWidget::btnPlay(bool b) {
 
 //    mediaPlayerState->setPlaying(b);
     switch ( tabWidget->currentPageIndex()) {
     case 0:
       {
           mediaPlayerState->setPlaying(b);
       }
       break;
     case 1:
     {
         addToSelection( audioView->currentItem() );
         mediaPlayerState->setPlaying(b);
         d->selectedFiles->removeSelected( );
         tabWidget->setCurrentPage(1);
         d->selectedFiles->unSelect();
         insanityBool=FALSE;
     }//          audioView->clearSelection();
     break;
     case 2:
     {
         addToSelection( videoView->currentItem() );
         mediaPlayerState->setPlaying(b);
         qApp->processEvents();
         d->selectedFiles->removeSelected( );
         tabWidget->setCurrentPage(2);
         d->selectedFiles->unSelect();
         insanityBool=FALSE;
     }//          videoView->clearSelection();
     break;
     };
 
 }
 
 void PlayListWidget::deletePlaylist() {
     switch( QMessageBox::information( this, (tr("Remove Playlist?")),
                                       (tr("You really want to delete\nthis playlist?")),
                                       (tr("Yes")), (tr("No")), 0 )){
       case 0: // Yes clicked,
           QFile().remove(playLists->selected()->file());
           QFile().remove(playLists->selected()->linkFile());
           playLists->reread();
           break;
@@ -1018,202 +1024,204 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
           break;
 //       case Key_P: //play
 //           qDebug("Play");
 //           playSelected();
 //           break;
       case Key_Space:
           qDebug("Play");
 //          playSelected(); puh
           break;
       case Key_1:
           tabWidget->setCurrentPage(0);
           break;
       case Key_2:
           tabWidget->setCurrentPage(1);
           break;
     case Key_3:
       tabWidget->setCurrentPage(2);
       break;
     case Key_4:
       tabWidget->setCurrentPage(3);
       break;
     case Key_Down:
       if ( !d->selectedFiles->next() )
         d->selectedFiles->first();
 
       break;
     case Key_Up:
       if ( !d->selectedFiles->prev() )
         //        d->selectedFiles->last();
 
       break;
 
     }
 }
 
 void PlayListWidget::keyPressEvent( QKeyEvent *)
 {
 //    qDebug("Key press");
 //     switch ( e->key() ) {
 // ////////////////////////////// Zaurus keys
 //       case Key_A: //add to playlist
 //           qDebug("Add");
 //           addSelected();
 //           break;
 //       case Key_R: //remove from playlist
 //           removeSelected();
 //           break;
 //       case Key_P: //play
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //       case Key_Space:
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //     }
 }
 
 void PlayListWidget::doBlank() {
     qDebug("do blanking");
     fd=open("/dev/fb0",O_RDWR);
     if (fd != -1) {
         ioctl(fd,FBIOBLANK,1);
 //            close(fd);
     }
 }
 
 void PlayListWidget::doUnblank() {
     // this crashes opieplayer with a segfault
     //      int fd;
     //       fd=open("/dev/fb0",O_RDWR);
     qDebug("do unblanking");
     if (fd != -1) {
         ioctl(fd,FBIOBLANK,0);
         close(fd);
     }
     QCopEnvelope h("QPE/System", "setBacklight(int)");
     h <<-3;// v[1]; // -3 Force on
 }
 
 void PlayListWidget::readm3u(const QString &filename) {
 
     qDebug("m3u filename is "+filename);
     QFile f(filename);
 
     if(f.open(IO_ReadOnly)) {
         QTextStream t(&f);
         QString s;//, first, second;
         int i=0;
         while ( !t.atEnd()) {
             s=t.readLine();
 
             if(s.find("#",0,TRUE) == -1) {
                 if(s.find(" ",0,TRUE) == -1)  { // not sure if this is neede since cf uses vfat
                     if(s.left(2) == "E:" || s.left(2) == "P:") {
                         s=s.right(s.length()-2);
-                        DocLnk lnk( s );
-                        QFileInfo f(s);
-                        QString name = f.baseName();
-                        name = name.right( name.length()-name.findRev( "\\",-1,TRUE ) -1 );
-                        lnk.setName( name );
-                        s=s.replace( QRegExp("\\"),"/");
-                        lnk.setFile( s );
-                        lnk.writeLink();
-                        qDebug("add "+name);
-                        d->selectedFiles->addToSelection( lnk);
+                        if(QFile(s).exists()) {
+                            DocLnk lnk( s );
+                            QFileInfo f(s);
+                            QString name = f.baseName();
+                            name = name.right( name.length()-name.findRev( "\\",-1,TRUE ) -1 );
+                            lnk.setName( name );
+                            s=s.replace( QRegExp("\\"),"/");
+                            lnk.setFile( s );
+                            lnk.writeLink();
+                            qDebug("add "+name);
+                            d->selectedFiles->addToSelection( lnk);
+                        }
                     } else { // is url
                         s.replace(QRegExp("%20")," ");
                         DocLnk lnk( s );
                         QString name;
                         if(name.left(4)=="http") {
                             name = s.right( s.length() - 7);
                         } else {
                             name = s;
                         }
                         lnk.setName(name);
                         if(s.at(s.length()-4) == '.') {
                             lnk.setFile( s);
                         } else {
                             lnk.setFile( s+"/");
                         }
                         lnk.setType("audio/x-mpegurl");
                         lnk.writeLink();
                         d->selectedFiles->addToSelection( lnk);
                     }
                     i++;
                 }
             }
         }
     }
     f.close();
 }
 
 void PlayListWidget::writem3u() {
 
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Save m3u Playlist "),TRUE, 0);
     fileDlg->exec();
         QString filename,list;
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->LineEdit1->text();
         qDebug(filename);
         int noOfFiles = 0;
         d->selectedFiles->first();
         do {
             // we dont check for existance because of url's
             //         qDebug(d->selectedFiles->current()->file());
                 list += d->selectedFiles->current()->file()+"\n";
                 noOfFiles++;
         }
         while ( d->selectedFiles->next() );
         qDebug(list);
         if(filename.left(1) != "/")
             filename=QPEApplication::documentDir()+"/"+filename;
         if(filename.right(3) != "m3u")
             filename=filename+".m3u";
 
         QFile f(filename);
         f.open(IO_WriteOnly);
         f.writeBlock(list, list.length());
         f.close();
     }
     if(fileDlg) delete fileDlg;
 }
 
 void PlayListWidget::readPls(const QString &filename) {
 
     qDebug("pls filename is "+filename);
     QFile f(filename);
 
     if(f.open(IO_ReadOnly)) {
         QTextStream t(&f);
         QString s;//, first, second;
         int i=0;
         while ( !t.atEnd()) {
             s=t.readLine();
             if(s.left(4) == "File") {
                 s=s.right(s.length() - 6);
                 s.replace(QRegExp("%20")," ");
                 qDebug("adding "+s+" to playlist");
                 // numberofentries=2
                 // File1=http
                 // Title
                 // Length
                 // Version
                 // File2=http
                 s=s.replace( QRegExp("\\"),"/");
                 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);
                 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);