mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 14:46:33 +02:00
Code Issues Releases Wiki Activity

Handle JSPF playlists in Import Playlist dialog

Browse Source 
Additionally, use the job status view to show errors
when loading XSPF playlists instead of modals
This commit is contained in:
Leo Franchi
2015-01-21 19:07:38 -08:00
parent ae39385ee0
commit 8efd47a17e
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/tomahawk/TomahawkWindow.cpp
View File

@@ -49,6 +49,7 @@
#include "utils/WidgetDragFilter.h" #include "utils/WidgetDragFilter.h"
#include "utils/NetworkAccessManager.h" #include "utils/NetworkAccessManager.h"
#include "utils/M3uLoader.h" #include "utils/M3uLoader.h"
#include "utils/JspfLoader.h"
#include "widgets/AccountsToolButton.h" #include "widgets/AccountsToolButton.h"
#include "widgets/AnimatedSplitter.h" #include "widgets/AnimatedSplitter.h"
#include "widgets/ContainedMenuButton.h" #include "widgets/ContainedMenuButton.h"
@@ -1203,23 +1204,31 @@ TomahawkWindow::importPlaylist( const QString& url, bool autoUpdate )
{ {
const QUrl u = QUrl::fromUserInput( url ); const QUrl u = QUrl::fromUserInput( url );
if ( u.toString().toLower().endsWith( ".m3u" ) ) const QString ext = u.toString().toLower();
if ( ext.endsWith( ".m3u" ) )
{ {
M3uLoader* loader = new M3uLoader( u.toString(), true ); M3uLoader* loader = new M3uLoader( u.toString(), true );
loader->parse(); loader->parse();
} }
else if ( ext.endsWith( ".jspf" ) )
{
JSPFLoader* loader = new JSPFLoader( true );
connect( loader, SIGNAL( failed() ), SLOT( onJSPFError() ) );
connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onNewPlaylistOk( Tomahawk::playlist_ptr ) ) );
loader->load( u );
}
else else
{ {
XSPFLoader* loader = new XSPFLoader( true, autoUpdate ); XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) ); connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onXSPFOk( Tomahawk::playlist_ptr ) ) ); connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onNewPlaylistOk( Tomahawk::playlist_ptr ) ) );
loader->load( u ); loader->load( u );
} }
} }
void void
TomahawkWindow::onXSPFOk( const Tomahawk::playlist_ptr& pl ) TomahawkWindow::onNewPlaylistOk( const Tomahawk::playlist_ptr& pl )
{ {
ViewManager::instance()->show( pl ); ViewManager::instance()->show( pl );
} }
@@ -1228,21 +1237,26 @@ TomahawkWindow::onXSPFOk( const Tomahawk::playlist_ptr& pl )
void void
TomahawkWindow::onXSPFError( XSPFLoader::XSPFErrorCode error ) TomahawkWindow::onXSPFError( XSPFLoader::XSPFErrorCode error )
{ {
QString msg;
switch ( error ) switch ( error )
{ {
case XSPFLoader::ParseError: case XSPFLoader::ParseError:
QMessageBox::critical( this, tr( "XSPF Error" ), tr( "This is not a valid XSPF playlist." ) ); msg = tr( "This is not a valid XSPF playlist." );
break; break;
case XSPFLoader::InvalidTrackError: case XSPFLoader::InvalidTrackError:
QMessageBox::warning( this, tr( "Failed to save tracks" ), tr( "Some tracks in the playlist do not contain an artist and a title. They will be ignored." ), QMessageBox::Ok ); msg = tr( "Some tracks in the playlist do not contain an artist and a title. They will be ignored." );
break; break;
default: default:
//FIXME: This includes FetchError return;
break;
} }
JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( msg, 15 ) );
} }
void
TomahawkWindow::onJSPFError() {
JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Failed to load JSPF playlist"), 15 ) );
}
void void
TomahawkWindow::onAudioEngineError( AudioEngine::AudioErrorCode /* error */ ) TomahawkWindow::onAudioEngineError( AudioEngine::AudioErrorCode /* error */ )

3
src/tomahawk/TomahawkWindow.h
View File

@@ -121,7 +121,8 @@ private slots:
void onAudioEngineError( AudioEngine::AudioErrorCode error ); void onAudioEngineError( AudioEngine::AudioErrorCode error );
void onXSPFError( XSPFLoader::XSPFErrorCode error ); void onXSPFError( XSPFLoader::XSPFErrorCode error );
void onXSPFOk( const Tomahawk::playlist_ptr& ); void onJSPFError();
void onNewPlaylistOk( const Tomahawk::playlist_ptr& );
void onPlaybackLoading( const Tomahawk::result_ptr result ); void onPlaybackLoading( const Tomahawk::result_ptr result );