diff --git a/cexif.cpp b/cexif.cpp index 481b115..73dcb7e 100644 --- a/cexif.cpp +++ b/cexif.cpp @@ -227,7 +227,7 @@ bool cEXIF::fromFile(const QString& szFileName) query.first(); if(!query.value("cnt").toInt()) { - query.prepare("INSERT INTO files (fileName, fileSize, fileDate, thumbnail) VALUES (:fileName, :fileSize, :fileDate, :thumbnail);"); + query.prepare("INSERT INTO files (fileName, fileSize, fileDate, cacheDate, thumbnail) VALUES (:fileName, :fileSize, :fileDate, DATETIME('now'), :thumbnail);"); query.bindValue(":fileName", szFileName); query.bindValue(":fileSize", fileInfo.size()); query.bindValue(":fileDate", fileInfo.birthTime()); diff --git a/cfilebrowser.cpp b/cfilebrowser.cpp index c21aeb8..67d5f4c 100644 --- a/cfilebrowser.cpp +++ b/cfilebrowser.cpp @@ -16,6 +16,7 @@ #include #include +#include cFileBrowser::cFileBrowser(QProgressBar* lpProgressBar, QList* lpImageFormats, QWidget *parent) : @@ -43,7 +44,7 @@ cFileBrowser::cFileBrowser(QProgressBar* lpProgressBar, QList* lpIm m_cacheDB = QSqlDatabase::addDatabase("QSQLITE", "cacheDB"); m_cacheDB.setHostName("localhost"); - m_cacheDB.setDatabaseName("C:\\Temp\\picturePrint.db"); + m_cacheDB.setDatabaseName(userDir() + "cache.db"); m_cacheDB.open(); if(!m_cacheDB.open()) @@ -58,6 +59,7 @@ cFileBrowser::cFileBrowser(QProgressBar* lpProgressBar, QList* lpIm " fileName TEXT, " " fileSize BIGINT, " " fileDate DATETIME, " + " cacheDate DATETIME, " " thumbnail BLOB " ");"); @@ -95,14 +97,12 @@ void cFileBrowser::onDirectoryChanged(const QItemSelection& selected, const QIte m_lpProgressBar->setRange(0, list.count()); - m_cacheDB.transaction(); for(int x = 0;x < list.count();x++) { addFile(list[x]); m_lpProgressBar->setValue(x); qApp->processEvents(); } - m_cacheDB.commit(); ui->m_lpDirectoryList->setEnabled(true); m_lpProgressBar->setVisible(false); diff --git a/common.cpp b/common.cpp index 133229f..b9d77c7 100644 --- a/common.cpp +++ b/common.cpp @@ -2,6 +2,7 @@ #include #include +#include QStringList generateReadList(const QList& imageFormats) @@ -57,3 +58,8 @@ QByteArray image2Blob(const QImage &image) return(ba); } + +QString userDir() +{ + return(QDir::homePath() + QDir::separator() + ".picturePrint" + QDir::separator()); +} diff --git a/common.h b/common.h index e056502..702dedb 100644 --- a/common.h +++ b/common.h @@ -38,5 +38,7 @@ QStringList generateWriteList(const QList& imageFormats); QImage blob2Image(const QByteArray& ba); QByteArray image2Blob(const QImage& image); +QString userDir(); + #endif // COMMON_H