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

Add a missing delquery.exec() in deletefiles, probably causing the

Browse Source 
remote delete failures
This commit is contained in:
Jeff Mitchell
2012-01-19 17:32:13 -05:00
parent 46723bf9d3
commit 5d215b1326
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,14 +18,14 @@
#include "databasecommand_deletefiles.h" #include "databasecommand_deletefiles.h"
#include <QSqlQuery> #include <QtSql/QSqlQuery>
#include "artist.h" #include "artist.h"
#include "album.h" #include "album.h"
#include "collection.h" #include "collection.h"
#include "source.h" #include "source.h"
#include "database/database.h" #include "database/database.h"
#include "databaseimpl.h" #include "database/databaseimpl.h"
#include "network/servent.h" #include "network/servent.h"
#include "utils/logger.h" #include "utils/logger.h"
#include "utils/tomahawkutils.h" #include "utils/tomahawkutils.h"
@@ -60,7 +60,7 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
{ {
Q_ASSERT( !source().isNull() ); Q_ASSERT( !source().isNull() );
QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id(); int srcid = source()->isLocal() ? 0 : source()->id();
TomahawkSqlQuery delquery = dbi->newquery(); TomahawkSqlQuery delquery = dbi->newquery();
if ( m_deleteAll ) if ( m_deleteAll )
@@ -68,8 +68,8 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
TomahawkSqlQuery dirquery = dbi->newquery(); TomahawkSqlQuery dirquery = dbi->newquery();
dirquery.prepare( QString( "SELECT id FROM file WHERE source %1" ) dirquery.prepare( QString( "SELECT id FROM file WHERE source %1" )
.arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) ); .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) );
dirquery.exec(); dirquery.exec();
while ( dirquery.next() ) while ( dirquery.next() )
m_idList << dirquery.value( 0 ).toUInt(); m_idList << dirquery.value( 0 ).toUInt();
} }
@@ -115,7 +115,8 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
delquery.prepare( QString( "SELECT id FROM file WHERE source = %1 AND url IN ( %2 )" ) delquery.prepare( QString( "SELECT id FROM file WHERE source = %1 AND url IN ( %2 )" )
.arg( source()->id() ) .arg( source()->id() )
.arg( idstring ) ); .arg( idstring ) );
delquery.exec();
idstring = QString(); idstring = QString();
while ( delquery.next() ) while ( delquery.next() )
{ {
@@ -128,7 +129,6 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
delquery.prepare( QString( "DELETE FROM file WHERE source %1 AND id IN ( %2 )" ) delquery.prepare( QString( "DELETE FROM file WHERE source %1 AND id IN ( %2 )" )
.arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) )
.arg( idstring ) ); .arg( idstring ) );
delquery.exec(); delquery.exec();
} }

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

@@ -19,9 +19,9 @@
#ifndef DATABASECOMMAND_DELETEFILES_H #ifndef DATABASECOMMAND_DELETEFILES_H
#define DATABASECOMMAND_DELETEFILES_H #define DATABASECOMMAND_DELETEFILES_H
#include <QObject> #include <QtCore/QObject>
#include <QDir> #include <QtCore/QDir>
#include <QVariantMap> #include <QtCore/QVariantMap>
#include "database/databasecommandloggable.h" #include "database/databasecommandloggable.h"
#include "typedefs.h" #include "typedefs.h"

2
src/musicscanner.cpp
View File

@@ -18,7 +18,7 @@
#include "musicscanner.h" #include "musicscanner.h"
#include <QCoreApplication> #include <QtCore/QCoreApplication>
#include "utils/tomahawkutils.h" #include "utils/tomahawkutils.h"
#include "tomahawksettings.h" #include "tomahawksettings.h"

18
src/musicscanner.h
View File

@@ -26,15 +26,15 @@
#include <taglib/fileref.h> #include <taglib/fileref.h>
#include <taglib/tag.h> #include <taglib/tag.h>
#include <QVariantMap> #include <QtCore/QVariantMap>
#include <QDir> #include <QtCore/QDir>
#include <QFileInfo> #include <QtCore/QFileInfo>
#include <QString> #include <QtCore/QString>
#include <QDateTime> #include <QtCore/QDateTime>
#include <QTimer> #include <QtCore/QTimer>
#include <QMutex> #include <QtCore/QMutex>
#include <QMutexLocker> #include <QtCore/QMutexLocker>
#include <QWeakPointer> #include <QtCore/QWeakPointer>
#include <database/database.h> #include <database/database.h>
// descend dir tree comparing dir mtimes to last known mtime // descend dir tree comparing dir mtimes to last known mtime

6
src/scanmanager.cpp
View File

@@ -18,9 +18,9 @@
#include "scanmanager.h" #include "scanmanager.h"
#include <QThread> #include <QtCore/QThread>
#include <QCoreApplication> #include <QtCore/QCoreApplication>
#include <QTimer> #include <QtCore/QTimer>
#include "musicscanner.h" #include "musicscanner.h"
#include "tomahawksettings.h" #include "tomahawksettings.h"

12
src/scanmanager.h
View File

@@ -21,12 +21,12 @@
#include "typedefs.h" #include "typedefs.h"
#include <QHash> #include <QtCore/QHash>
#include <QMap> #include <QtCore/QMap>
#include <QObject> #include <QtCore/QObject>
#include <QStringList> #include <QtCore/QStringList>
#include <QWeakPointer> #include <QtCore/QWeakPointer>
#include <QSet> #include <QtCore/QSet>
class MusicScanner; class MusicScanner;
class QThread; class QThread;