author | llornkcor <llornkcor> | 2002-08-16 02:46:12 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-16 02:46:12 (UTC) |
commit | 40527ffb82b83ad521ed766f11b47636db055ffe (patch) (unidiff) | |
tree | d94fb1f21fa57b9dfbe2aa45beab05de024c97a3 | |
parent | f25db7780ff234b2770ac13d8c02887b79a57a26 (diff) | |
download | opie-40527ffb82b83ad521ed766f11b47636db055ffe.zip opie-40527ffb82b83ad521ed766f11b47636db055ffe.tar.gz opie-40527ffb82b83ad521ed766f11b47636db055ffe.tar.bz2 |
check for local file existing before adding to playlist
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 10 |
1 files changed, 9 insertions, 1 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 | |||
@@ -322,11 +322,13 @@ void PlayListWidget::readConfig( Config& cfg ) { | |||
322 | QString entryName; | 322 | QString entryName; |
323 | entryName.sprintf( "File%i", i + 1 ); | 323 | entryName.sprintf( "File%i", i + 1 ); |
324 | QString linkFile = cfg.readEntry( entryName ); | 324 | QString linkFile = cfg.readEntry( entryName ); |
325 | if(QFileInfo( linkFile).exists() ) { | ||
325 | DocLnk lnk( linkFile ); | 326 | DocLnk lnk( linkFile ); |
326 | if ( lnk.isValid() ) { | 327 | if ( QFileInfo( lnk.file()).exists() || linkFile.find("http",0,TRUE) != -1) { |
327 | d->selectedFiles->addToSelection( lnk ); | 328 | d->selectedFiles->addToSelection( lnk ); |
328 | } | 329 | } |
329 | } | 330 | } |
331 | } | ||
330 | d->selectedFiles->setSelectedItem( currentString); | 332 | d->selectedFiles->setSelectedItem( currentString); |
331 | } | 333 | } |
332 | 334 | ||
@@ -651,6 +653,7 @@ void PlayListWidget::addSelected() { | |||
651 | QListIterator<DocLnk> dit( files.children() ); | 653 | QListIterator<DocLnk> dit( files.children() ); |
652 | for ( ; dit.current(); ++dit ) { | 654 | for ( ; dit.current(); ++dit ) { |
653 | if( dit.current()->name() == it.current()->text(0) ) { | 655 | if( dit.current()->name() == it.current()->text(0) ) { |
656 | if(QFileInfo( dit.current()->file()).exists()) | ||
654 | d->selectedFiles->addToSelection( **dit ); | 657 | d->selectedFiles->addToSelection( **dit ); |
655 | } | 658 | } |
656 | } | 659 | } |
@@ -668,6 +671,7 @@ void PlayListWidget::addSelected() { | |||
668 | QListIterator<DocLnk> dit( vFiles.children() ); | 671 | QListIterator<DocLnk> dit( vFiles.children() ); |
669 | for ( ; dit.current(); ++dit ) { | 672 | for ( ; dit.current(); ++dit ) { |
670 | if( dit.current()->name() == it.current()->text(0) ) { | 673 | if( dit.current()->name() == it.current()->text(0) ) { |
674 | if(QFileInfo( dit.current()->file()).exists()) | ||
671 | d->selectedFiles->addToSelection( **dit ); | 675 | d->selectedFiles->addToSelection( **dit ); |
672 | } | 676 | } |
673 | } | 677 | } |
@@ -701,6 +705,7 @@ void PlayListWidget::addToSelection( QListViewItem *it) { | |||
701 | QListIterator<DocLnk> dit( files.children() ); | 705 | QListIterator<DocLnk> dit( files.children() ); |
702 | for ( ; dit.current(); ++dit ) { | 706 | for ( ; dit.current(); ++dit ) { |
703 | if( dit.current()->name() == it->text(0)) { | 707 | if( dit.current()->name() == it->text(0)) { |
708 | if(QFileInfo( dit.current()->file()).exists()) | ||
704 | d->selectedFiles->addToSelection( **dit ); | 709 | d->selectedFiles->addToSelection( **dit ); |
705 | } | 710 | } |
706 | } | 711 | } |
@@ -710,6 +715,7 @@ void PlayListWidget::addToSelection( QListViewItem *it) { | |||
710 | QListIterator<DocLnk> dit( vFiles.children() ); | 715 | QListIterator<DocLnk> dit( vFiles.children() ); |
711 | for ( ; dit.current(); ++dit ) { | 716 | for ( ; dit.current(); ++dit ) { |
712 | if( dit.current()->name() == it->text(0)) { | 717 | if( dit.current()->name() == it->text(0)) { |
718 | if(QFileInfo( dit.current()->file()).exists()) | ||
713 | d->selectedFiles->addToSelection( **dit ); | 719 | d->selectedFiles->addToSelection( **dit ); |
714 | } | 720 | } |
715 | } | 721 | } |
@@ -1111,6 +1117,7 @@ void PlayListWidget::readm3u(const QString &filename) { | |||
1111 | if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat | 1117 | if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat |
1112 | if(s.left(2) == "E:" || s.left(2) == "P:") { | 1118 | if(s.left(2) == "E:" || s.left(2) == "P:") { |
1113 | s=s.right(s.length()-2); | 1119 | s=s.right(s.length()-2); |
1120 | if(QFile(s).exists()) { | ||
1114 | DocLnk lnk( s ); | 1121 | DocLnk lnk( s ); |
1115 | QFileInfo f(s); | 1122 | QFileInfo f(s); |
1116 | QString name = f.baseName(); | 1123 | QString name = f.baseName(); |
@@ -1121,6 +1128,7 @@ void PlayListWidget::readm3u(const QString &filename) { | |||
1121 | lnk.writeLink(); | 1128 | lnk.writeLink(); |
1122 | qDebug("add "+name); | 1129 | qDebug("add "+name); |
1123 | d->selectedFiles->addToSelection( lnk); | 1130 | d->selectedFiles->addToSelection( lnk); |
1131 | } | ||
1124 | } else { // is url | 1132 | } else { // is url |
1125 | s.replace(QRegExp("%20")," "); | 1133 | s.replace(QRegExp("%20")," "); |
1126 | DocLnk lnk( s ); | 1134 | DocLnk lnk( s ); |