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

Factor out some code

Browse Source
This commit is contained in:
Leo Franchi
2012-06-17 00:09:59 +02:00
parent 89ab3344d4
commit acd6e75a10
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/libtomahawk/GlobalActionManager.cpp
View File

@@ -433,21 +433,13 @@ GlobalActionManager::handlePlaylistCommand( const QUrl& url )
} }
if ( url.hasQueryItem( "xspf" ) ) if ( url.hasQueryItem( "xspf" ) )
{ {
QUrl xspf = QUrl::fromUserInput( url.queryItemValue( "xspf" ) ); createPlaylistFromUrl( "xspf", url.queryItemValue( "xspf" ), url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString() );
QString title = url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString(); return true;
XSPFLoader* l= new XSPFLoader( true, this );
l->setOverrideTitle( title );
l->load( xspf );
connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), this, SLOT( playlistCreatedToShow( Tomahawk::playlist_ptr) ) );
} }
else if ( url.hasQueryItem( "jspf" ) ) else if ( url.hasQueryItem( "jspf" ) )
{ {
QUrl jspf = QUrl::fromUserInput( url.queryItemValue( "jspf" ) ); createPlaylistFromUrl( "jspf", url.queryItemValue( "jspf" ), url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString() );
QString title = url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString(); return true;
JSPFLoader* l= new JSPFLoader( true, this );
l->setOverrideTitle( title );
l->load( jspf );
connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), this, SLOT( playlistCreatedToShow( Tomahawk::playlist_ptr) ) );
} }
} }
else if ( parts [ 0 ] == "new" ) else if ( parts [ 0 ] == "new" )
@@ -486,24 +478,12 @@ GlobalActionManager::handleImportCommand( const QUrl& url )
{ {
if ( url.hasQueryItem( "xspf" ) ) if ( url.hasQueryItem( "xspf" ) )
{ {
QUrl xspf = QUrl::fromUserInput( url.queryItemValue( "xspf" ) ); createPlaylistFromUrl( "xspf", url.queryItemValue( "xspf" ), url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString() );
QString title = url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString();
XSPFLoader* l= new XSPFLoader( true, this );
l->setOverrideTitle( title );
l->load( xspf );
connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), this, SLOT( playlistCreatedToShow( Tomahawk::playlist_ptr) ) );
return true; return true;
} }
else if ( url.hasQueryItem( "jspf" ) ) else if ( url.hasQueryItem( "jspf" ) )
{ {
QUrl jspf = QUrl::fromUserInput( url.queryItemValue( "jspf" ) ); createPlaylistFromUrl( "jspf", url.queryItemValue( "jspf" ), url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString() );
QString title = url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString();
JSPFLoader* l= new JSPFLoader( true, this );
l->setOverrideTitle( title );
l->load( jspf );
connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), this, SLOT( playlistCreatedToShow( Tomahawk::playlist_ptr) ) );
return true; return true;
} }
} }
@@ -512,6 +492,28 @@ GlobalActionManager::handleImportCommand( const QUrl& url )
} }
void
GlobalActionManager::createPlaylistFromUrl( const QString& type, const QString &url, const QString& title )
{
if ( type == "xspf" )
{
QUrl xspf = QUrl::fromUserInput( url );
XSPFLoader* l= new XSPFLoader( true, this );
l->setOverrideTitle( title );
l->load( xspf );
connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), this, SLOT( playlistCreatedToShow( Tomahawk::playlist_ptr) ) );
}
else if ( type == "jspf" )
{
QUrl jspf = QUrl::fromUserInput( url );
JSPFLoader* l= new JSPFLoader( true, this );
l->setOverrideTitle( title );
l->load( jspf );
connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), this, SLOT( playlistCreatedToShow( Tomahawk::playlist_ptr) ) );
}
}
void void
GlobalActionManager::playlistCreatedToShow( const playlist_ptr& pl ) GlobalActionManager::playlistCreatedToShow( const playlist_ptr& pl )
{ {

2
src/libtomahawk/GlobalActionManager.h
View File

@@ -125,6 +125,8 @@ private:
bool handleBookmarkCommand( const QUrl& url ); bool handleBookmarkCommand( const QUrl& url );
bool handleOpenCommand( const QUrl& url ); bool handleOpenCommand( const QUrl& url );
void createPlaylistFromUrl( const QString& type, const QString& url, const QString& title );
QString hostname() const; QString hostname() const;
Tomahawk::playlist_ptr m_toShow; Tomahawk::playlist_ptr m_toShow;