1 files changed, 22 insertions, 12 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 299181b..8b295b0 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -1015,151 +1015,161 @@ void PlayListWidget::populateAudioView() {
             newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
         }
     }
 
 }
 
 void PlayListWidget::populateVideoView() {
     videoView->clear();
     StorageInfo storageInfo;
     const QList<FileSystem> &fs = storageInfo.fileSystems();
 
     if(!videoScan ) scanForVideo();
 
     QListIterator<DocLnk> Vdit( vFiles.children() );
     QListIterator<FileSystem> it ( fs );
     videoView->clear();
     QString storage;
     for ( ; Vdit.current(); ++Vdit ) {
         for( ; it.current(); ++it ){
             const QString name = (*it)->name();
             const QString path = (*it)->path();
             if( Vdit.current()->file().find(path) != -1 ) storage=name;
         }
 
         QListViewItem * newItem;
         if ( QFile( Vdit.current()->file()).exists() ) {
             newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
                    QString::number( QFile( Vdit.current()->file() ).size() ),
                                                    storage, Vdit.current()->file());
             newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" ));
         }
     }
 }
 
 void PlayListWidget::openFile() {
     qDebug("<<<<<<<<<OPEN File");
     QString filename, name;
     InputDialog *fileDlg;
     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");
 
+        QString m3uFile;
+        m3uFile = filename;
         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
+//               m3uFile = filename.left( filename.find( ":",8,TRUE));
+                 m3uFile = filename;
+                     if( m3uFile.right( 1 ).find( '/' ) == -1) {
+                         m3uFile += "/";
+                     }
+                filename = m3uFile;
+//                 qDebug("1 "+m3uFile);
+//             } else if(filename.left(4) == "http"){
+//                 m3uFile=filename;
+//                 m3uFile = m3uFile.right( m3uFile.length() - 7);
+//                 qDebug("2 "+m3uFile);
+//             } else{
+//                 m3uFile=filename;
+//                 qDebug("3 "+m3uFile);
+             }
+            lnk.setName( m3uFile ); //sets name
             lnk.setFile( filename ); //sets file name
             lnk.setIcon("opieplayer2/musicfile");
             d->selectedFiles->addToSelection(  lnk );
             writeCurrentM3u();
         }
         else if( filename.right( 3) == "m3u" ) {
             readm3u( filename );
 
         } else if( filename.right(3) == "pls" ) {
             readPls( filename );
         } else {
             lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
             lnk.setFile( filename ); //sets file name
             d->selectedFiles->addToSelection(  lnk);
             writeCurrentM3u();
         }
     }
             
     if( fileDlg ) {
         delete fileDlg;
     }
 }
 
 
 /*
 reads m3u and shows files/urls to playlist widget */
 void PlayListWidget::readm3u( const QString &filename ) { 
     qDebug( "read m3u filename " + filename );
 
     Om3u *m3uList;
     QString s, name;
     m3uList = new Om3u( filename, IO_ReadOnly );
     m3uList->readM3u();
     DocLnk lnk;
     for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
         s = *it;
 //          qDebug("reading "+ s);
         if(s.left(4)=="http") {
           lnk.setName( s ); //sets file name
           lnk.setIcon("opieplayer2/musicfile");
-          if(s.right(4) != '.' || s.right(5) != '.')
+
+//          if(s.right(4) != '.' || s.right(5) != '.')
+          if(s.right(4) != '.' || s.right(5) != '.' )
+             if( s.right(1) != "/")
             lnk.setFile( s+"/"); //if url with no extension
           else
             lnk.setFile( s ); //sets file name
             
         }  else {
           //               if( QFileInfo( s ).exists() ) {
           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 {
             //            qDebug("set link2 "+s);
             lnk.setFile( s);
             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();
     if(m3uList) delete m3uList;
 
     d->selectedFiles->setSelectedItem( s);
     setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(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;