author | llornkcor <llornkcor> | 2003-04-18 16:19:10 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-04-18 16:19:10 (UTC) |
commit | 486db3bff8680e22bade85c348a7673f847a6f37 (patch) (side-by-side diff) | |
tree | adb4c1faff1bc5e97229333ffbbf8cb54d991f2f | |
parent | 81776eb70dcad6748b8494ff13fbd048c60c1fae (diff) | |
download | opie-486db3bff8680e22bade85c348a7673f847a6f37.zip opie-486db3bff8680e22bade85c348a7673f847a6f37.tar.gz opie-486db3bff8680e22bade85c348a7673f847a6f37.tar.bz2 |
fix typed in url file/name problem
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 30 |
1 files changed, 20 insertions, 10 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 @@ -1047,46 +1047,53 @@ void PlayListWidget::populateVideoView() { } 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.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); } - -// qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile); - lnk.setName( filename ); //sets name + 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(); } @@ -1101,33 +1108,36 @@ void PlayListWidget::openFile() { /* 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(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"); |