Hash images upon loading divelog file rather than when loading image

Up to now, we only computed hashes of images upon actually displaying the images.

With this patch we start to compute hashes once we load the xml or from git. This
happens in the background, so the user should note an increased CPU load only once
per divelog.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2015-09-17 16:56:58 +02:00 committed by Dirk Hohndel
parent 2d376de68d
commit d0145621a1
4 changed files with 20 additions and 0 deletions

View file

@ -1057,6 +1057,7 @@ void read_hashes()
if (hashfile.open(QIODevice::ReadOnly)) {
QDataStream stream(&hashfile);
stream >> localFilenameOf;
stream >> hashOf;
hashfile.close();
}
}
@ -1067,6 +1068,7 @@ void write_hashes()
if (hashfile.open(QIODevice::WriteOnly)) {
QDataStream stream(&hashfile);
stream << localFilenameOf;
stream << hashOf;
hashfile.commit();
} else {
qDebug() << "cannot open" << hashfile.fileName();
@ -1124,6 +1126,20 @@ void updateHash(struct picture *picture) {
free(old);
}
void hashPicture(struct picture *picture)
{
learnHash(picture, hashFile(QString(picture->filename)));
mark_divelist_changed((true));
}
extern "C" void cache_picture(struct picture *picture)
{
QString filename = picture->filename;
if (!hashOf.contains(filename))
QtConcurrent::run(hashPicture, picture);
}
void learnImages(const QDir dir, int max_recursions, bool recursed)
{
QDir current(dir);