From 5e2d196ba00251efccc7e92a5952966825f94dbb Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Mon, 4 Apr 2011 10:36:07 +0200 Subject: [PATCH] * Fixed mtimes issue with windows paths. --- src/libtomahawk/database/databasecommand_dirmtimes.cpp | 10 ++++------ src/libtomahawk/database/databasecommand_dirmtimes.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/database/databasecommand_dirmtimes.cpp b/src/libtomahawk/database/databasecommand_dirmtimes.cpp index 5b6034086..210f5e7e2 100644 --- a/src/libtomahawk/database/databasecommand_dirmtimes.cpp +++ b/src/libtomahawk/database/databasecommand_dirmtimes.cpp @@ -36,11 +36,12 @@ DatabaseCommand_DirMtimes::exec( DatabaseImpl* dbi ) void DatabaseCommand_DirMtimes::execSelect( DatabaseImpl* dbi ) { - qDebug() << Q_FUNC_INFO << m_prefix << m_update; + QDir dir( m_prefix ); + qDebug() << Q_FUNC_INFO << dir.absolutePath() << m_update; QMap mtimes; TomahawkSqlQuery query = dbi->newquery(); - if( m_prefix.isEmpty() ) + if ( m_prefix.isEmpty() ) { query.exec( "SELECT name, mtime FROM dirs_scanned" ); } @@ -49,15 +50,12 @@ DatabaseCommand_DirMtimes::execSelect( DatabaseImpl* dbi ) query.prepare( QString( "SELECT name, mtime " "FROM dirs_scanned " "WHERE name LIKE :prefix" ) ); - query.bindValue( ":prefix", m_prefix + "%" ); - qDebug() << query.lastQuery(); + query.bindValue( ":prefix", dir.absolutePath() + "%" ); query.exec(); - qDebug() << query.lastQuery(); } while( query.next() ) { - qDebug() << query.value( 0 ).toString(); mtimes.insert( query.value( 0 ).toString(), query.value( 1 ).toUInt() ); } diff --git a/src/libtomahawk/database/databasecommand_dirmtimes.h b/src/libtomahawk/database/databasecommand_dirmtimes.h index f35a78437..8b7c1c95d 100644 --- a/src/libtomahawk/database/databasecommand_dirmtimes.h +++ b/src/libtomahawk/database/databasecommand_dirmtimes.h @@ -34,7 +34,7 @@ class DLLEXPORT DatabaseCommand_DirMtimes : public DatabaseCommand Q_OBJECT public: - explicit DatabaseCommand_DirMtimes( const QString& prefix = "", QObject* parent = 0 ) + explicit DatabaseCommand_DirMtimes( const QString& prefix = QString(), QObject* parent = 0 ) : DatabaseCommand( parent ), m_prefix( prefix ), m_update( false ) {}