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

Proper ID generation

Browse Source
This commit is contained in:
Jeff Mitchell
2011-09-30 16:06:35 -04:00
parent dad726b6ca
commit 76ff49a8ba
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libtomahawk/database/databasecommand_deletefiles.cpp
View File

@@ -71,13 +71,13 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
qDebug() << "Deleting" << m_dir.path() << "from db for localsource" << srcid; qDebug() << "Deleting" << m_dir.path() << "from db for localsource" << srcid;
TomahawkSqlQuery dirquery = dbi->newquery(); TomahawkSqlQuery dirquery = dbi->newquery();
dirquery.prepare( QString( "SELECT url FROM file WHERE source IS NULL AND url LIKE ?" ) ); dirquery.prepare( QString( "SELECT id, url FROM file WHERE source IS NULL AND url LIKE ?" ) );
dirquery.bindValue( 0, "file://" + m_dir.canonicalPath() + "/%" ); dirquery.bindValue( 0, "file://" + m_dir.canonicalPath() + "/%" );
dirquery.exec(); dirquery.exec();
while ( dirquery.next() ) while ( dirquery.next() )
{ {
QFileInfo fi( dirquery.value( 0 ).toString().mid( 7 ) ); // remove file:// QFileInfo fi( dirquery.value( 1 ).toString().mid( 7 ) ); // remove file://
if ( fi.canonicalPath() != m_dir.canonicalPath() ) if ( fi.canonicalPath() != m_dir.canonicalPath() )
{ {
if ( lastPath != fi.canonicalPath() ) if ( lastPath != fi.canonicalPath() )
@@ -87,15 +87,16 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
continue; continue;
} }
m_files << dirquery.value( 0 ).toString(); m_files << dirquery.value( 1 ).toString();
m_ids << dirquery.value( 0 ).toUInt(); m_ids << dirquery.value( 0 ).toUInt();
m_localUrlMapping[ dirquery.value( 0 ).toString() ] = dirquery.value( 1 ).toString();;
} }
} }
else if ( !m_ids.isEmpty() ) else if ( !m_ids.isEmpty() )
{ {
TomahawkSqlQuery dirquery = dbi->newquery(); TomahawkSqlQuery dirquery = dbi->newquery();
dirquery.prepare( QString( "SELECT url FROM file WHERE source IS NULL AND id IN ( ? )" ) ); dirquery.prepare( QString( "SELECT id, url FROM file WHERE source IS NULL AND id IN ( ? )" ) );
QString idstring; QString idstring;
foreach( const QVariant& id, m_ids ) foreach( const QVariant& id, m_ids )
@@ -105,7 +106,10 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
dirquery.bindValue( 0, idstring ); dirquery.bindValue( 0, idstring );
dirquery.exec(); dirquery.exec();
while ( dirquery.next() ) while ( dirquery.next() )
m_files << dirquery.value( 0 ).toString(); {
m_files << dirquery.value( 1 ).toString();
m_localUrlMapping[ dirquery.value( 0 ).toString() ] = dirquery.value( 1 ).toString();;
}
} }
} }
else else
@@ -137,8 +141,13 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
QString idstring; QString idstring;
foreach( const QVariant& id, m_ids ) foreach( const QVariant& id, m_ids )
idstring.append( id.toString() + ", " ); {
idstring.chop( 2 ); //remove the trailing ", " if ( source()->isLocal() )
idstring.append( '"' + m_localUrlMapping[ id.toString() ] + "\", " );
else
idstring.append( '"' + id.toString() + "\", " );
}
idstring.chop( 3 ); //remove the trailing "\", "
delquery.bindValue( 0, idstring ); delquery.bindValue( 0, idstring );
if( !delquery.exec() ) if( !delquery.exec() )

1
src/libtomahawk/database/databasecommand_deletefiles.h
View File

@@ -79,6 +79,7 @@ private:
QDir m_dir; QDir m_dir;
QVariantList m_ids; QVariantList m_ids;
bool m_deleteAll; bool m_deleteAll;
QHash< QString, QString > m_localUrlMapping;
}; };
#endif // DATABASECOMMAND_DELETEFILES_H #endif // DATABASECOMMAND_DELETEFILES_H