mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

* Style fixes to dynamic playlist code.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-09-26 11:27:08 +02:00
parent 735c2107a3
commit 887cd9dacb
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp
View File

@@ -45,9 +45,9 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
// now load the controls etc // now load the controls etc
TomahawkSqlQuery controlsQuery = dbi->newquery(); TomahawkSqlQuery controlsQuery = dbi->newquery();
controlsQuery.prepare("SELECT playlist_revision.playlist, controls, plmode, pltype " controlsQuery.prepare( "SELECT playlist_revision.playlist, controls, plmode, pltype "
"FROM dynamic_playlist_revision, playlist_revision " "FROM dynamic_playlist_revision, playlist_revision "
"WHERE dynamic_playlist_revision.guid = ? AND playlist_revision.guid = dynamic_playlist_revision.guid"); "WHERE dynamic_playlist_revision.guid = ? AND playlist_revision.guid = dynamic_playlist_revision.guid" );
controlsQuery.addBindValue( revisionGuid() ); controlsQuery.addBindValue( revisionGuid() );
controlsQuery.exec(); controlsQuery.exec();
@@ -61,20 +61,19 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
// "FROM dynamic_playlist_revision, playlist_revision " // "FROM dynamic_playlist_revision, playlist_revision "
// "WHERE dynamic_playlist_revision.guid = "<< revisionGuid() << " AND playlist_revision.guid = dynamic_playlist_revision.guid"; // "WHERE dynamic_playlist_revision.guid = "<< revisionGuid() << " AND playlist_revision.guid = dynamic_playlist_revision.guid";
if( controlsQuery.first() ) if ( controlsQuery.first() )
{ {
playlist_guid = controlsQuery.value( 0 ).toString(); playlist_guid = controlsQuery.value( 0 ).toString();
bool ok; bool ok;
QVariant v = TomahawkUtils::parseJson( controlsQuery.value(1).toByteArray(), &ok ); QVariant v = TomahawkUtils::parseJson( controlsQuery.value(1).toByteArray(), &ok );
Q_ASSERT( ok && v.type() == QVariant::List ); //TODO Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
type = controlsQuery.value( 3 ).toString(); type = controlsQuery.value( 3 ).toString();
mode = static_cast<GeneratorMode>( controlsQuery.value( 2 ).toInt() ); mode = static_cast<GeneratorMode>( controlsQuery.value( 2 ).toInt() );
QStringList controlIds = v.toStringList(); QStringList controlIds = v.toStringList();
// qDebug() << "Got controls in dynamic playlist, loading:" << controlIds << controlsQuery.value(1); // qDebug() << "Got controls in dynamic playlist, loading:" << controlIds << controlsQuery.value(1);
foreach( const QString& controlId, controlIds ) foreach ( const QString& controlId, controlIds )
{ {
TomahawkSqlQuery controlQuery = dbi->newquery(); TomahawkSqlQuery controlQuery = dbi->newquery();
controlQuery.prepare( "SELECT selectedType, match, input " controlQuery.prepare( "SELECT selectedType, match, input "
@@ -82,7 +81,7 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
"WHERE id = :id" ); "WHERE id = :id" );
controlQuery.bindValue( ":id", controlId ); controlQuery.bindValue( ":id", controlId );
controlQuery.exec(); controlQuery.exec();
if( controlQuery.next() ) if ( controlQuery.next() )
{ {
QVariantMap c; QVariantMap c;
c[ "type" ] = type; c[ "type" ] = type;
@@ -100,7 +99,7 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
return; return;
} }
if( mode == OnDemand ) if ( mode == OnDemand )
{ {
// Q_ASSERT( m_entrymap.isEmpty() ); // ondemand should have no entry // Q_ASSERT( m_entrymap.isEmpty() ); // ondemand should have no entry

10
src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h
View File

@@ -48,16 +48,16 @@ public:
signals: signals:
// used if loading an ondemand playlist // used if loading an ondemand playlist
void done( QString, void done( QString,
bool, bool,
QString, QString,
QList< QVariantMap>, QList< QVariantMap >,
bool ); bool );
// used when loading a static playlist // used when loading a static playlist
void done( QString, void done( QString,
QList< QString >, QList< QString >,
QList< QString >, QList< QString >,
QString, QString,
QList< QVariantMap>, QList< QVariantMap >,
bool, bool,
QMap< QString, Tomahawk::plentry_ptr >, QMap< QString, Tomahawk::plentry_ptr >,
bool ); bool );

12
src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
View File

@@ -315,7 +315,8 @@ DynamicPlaylist::loadRevision( const QString& rev )
setBusy( true ); setBusy( true );
DatabaseCommand_LoadDynamicPlaylistEntries* cmd = new DatabaseCommand_LoadDynamicPlaylistEntries( rev.isEmpty() ? currentrevision() : rev ); DatabaseCommand_LoadDynamicPlaylistEntries* cmd = new DatabaseCommand_LoadDynamicPlaylistEntries( rev.isEmpty() ? currentrevision() : rev );
if ( d->generator->mode() == OnDemand ) { if ( d->generator->mode() == OnDemand )
{
connect( cmd, SIGNAL( done( QString, connect( cmd, SIGNAL( done( QString,
bool, bool,
QString, QString,
@@ -325,8 +326,10 @@ DynamicPlaylist::loadRevision( const QString& rev )
bool, bool,
QString, QString,
QList< QVariantMap >, QList< QVariantMap >,
bool) ) ); bool ) ) );
} else if ( d->generator->mode() == Static ) { }
else if ( d->generator->mode() == Static )
{
connect( cmd, SIGNAL( done( QString, connect( cmd, SIGNAL( done( QString,
QList< QString >, QList< QString >,
QList< QString >, QList< QString >,
@@ -345,6 +348,9 @@ DynamicPlaylist::loadRevision( const QString& rev )
bool ) ) ); bool ) ) );
} }
else
Q_ASSERT( false );
Database::instance()->enqueue( Tomahawk::dbcmd_ptr( cmd ) ); Database::instance()->enqueue( Tomahawk::dbcmd_ptr( cmd ) );
} }