mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive pictures: Convert thumbnailHash to individual files

Browse source 
On startup, convert an old-style thumbnailHash to individual
thumbnail files. Show a modal progress bar while doing so.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-04-29 23:10:32 +02:00 committed by Dirk Hohndel
parent 6618c9ebfc
commit e811c7306d
1 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
core/qthelper.cpp
View file

@ -9,6 +9,7 @@
#include "divecomputer.h" #include "divecomputer.h"
#include "time.h" #include "time.h"
#include "gettextfromc.h" #include "gettextfromc.h"
#include "metadata.h"
#include <sys/time.h> #include <sys/time.h>
#include "prefs-macros.h" #include "prefs-macros.h"
#include <QFile> #include <QFile>
@ -28,6 +29,7 @@
#include <QFont> #include <QFont>
#include <QApplication> #include <QApplication>
#include <QTextDocument> #include <QTextDocument>
#include <QProgressDialog> // TODO: remove with convertThumbnails()
#include <cstdarg> #include <cstdarg>
#include <cstdint> #include <cstdint>
@ -1094,18 +1096,60 @@ extern "C" char *hashfile_name_string()
return copy_qstring(hashfile_name()); return copy_qstring(hashfile_name());
} }
// During a transition period, convert old thumbnail-hashes to individual files
// TODO: remove this code in due course
static void convertThumbnails(const QHash <QString, QImage> &thumbnails)
{
if (thumbnails.empty())
return;
// This is a singular occurrence, therefore translating the strings seems not worth it
QProgressDialog progress("Convert thumbnails...", "Abort", 0, thumbnails.size());
progress.setWindowModality(Qt::WindowModal);
int count = 0;
for (const QString &name: thumbnails.keys()) {
const QImage thumbnail = thumbnails[name];
if (thumbnail.isNull())
continue;
// This is duplicate code (see qt-models/divepicturemodel.cpp)
// Not a problem, since this routine will be removed in due course.
QString filename = thumbnailFileName(name);
if (filename.isEmpty())
continue;
QSaveFile file(filename);
if (!file.open(QIODevice::WriteOnly))
return;
QDataStream stream(&file);
quint32 type = MEDIATYPE_PICTURE;
stream << type;
stream << thumbnail;
file.commit();
progress.setValue(++count);
if (progress.wasCanceled())
break;
}
}
void read_hashes() void read_hashes()
{ {
QFile hashfile(hashfile_name()); QFile hashfile(hashfile_name());
QMutexLocker locker(&hashOfMutex);
if (hashfile.open(QIODevice::ReadOnly)) { if (hashfile.open(QIODevice::ReadOnly)) {
QDataStream stream(&hashfile); QDataStream stream(&hashfile);
stream >> localFilenameOf; stream >> localFilenameOf;
QMutexLocker locker(&hashOfMutex);
stream >> hashOf; stream >> hashOf;
locker.unlock();
QHash <QString, QImage> thumbnailCache; QHash <QString, QImage> thumbnailCache;
stream >> thumbnailCache; // For backwards compatibility stream >> thumbnailCache; // For backwards compatibility
hashfile.close(); hashfile.close();
convertThumbnails(thumbnailCache);
} }
QMutexLocker locker(&hashOfMutex);
localFilenameOf.remove(""); localFilenameOf.remove("");
QMutableHashIterator<QString, QByteArray> iter(hashOf); QMutableHashIterator<QString, QByteArray> iter(hashOf);
while (iter.hasNext()) { while (iter.hasNext()) {