mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
bdc470a80e
The hash field in the picture-structure was in principle non-operational. It was set on loading, but never actually changed. The authoritative hash comes from the filename->hash map. Therefore, make this explicit by removing the hash field from the picture structure. Instead of filling the picture structure on loading, add the hash directly to the filename->hash map. This is done in the register_hash() function, which does not overwrite old entries. I.e. the local hash has priority over the save-file. This policy might be refined in the future. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
133 lines
3.7 KiB
C++
133 lines
3.7 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include "dive.h"
|
|
#include "metrics.h"
|
|
#include "divelist.h"
|
|
#include "qthelper.h"
|
|
#include "imagedownloader.h"
|
|
#include <unistd.h>
|
|
#include <QString>
|
|
|
|
#include <QtConcurrent>
|
|
|
|
static QUrl cloudImageURL(const char *filename)
|
|
{
|
|
QString hash = hashString(filename);
|
|
return QUrl::fromUserInput(QString("https://cloud.subsurface-divelog.org/images/").append(hash));
|
|
}
|
|
|
|
ImageDownloader::ImageDownloader(struct picture *pic)
|
|
{
|
|
picture = pic;
|
|
}
|
|
|
|
ImageDownloader::~ImageDownloader()
|
|
{
|
|
picture_free(picture);
|
|
}
|
|
|
|
void ImageDownloader::load(bool fromHash)
|
|
{
|
|
if (fromHash && loadFromUrl(cloudImageURL(picture->filename)))
|
|
return;
|
|
|
|
// If loading from hash failed, try to load from filename
|
|
loadFromUrl(QUrl::fromUserInput(QString(picture->filename)));
|
|
}
|
|
|
|
bool ImageDownloader::loadFromUrl(const QUrl &url)
|
|
{
|
|
bool success = false;
|
|
if (url.isValid()) {
|
|
QEventLoop loop;
|
|
QNetworkAccessManager manager;
|
|
QNetworkRequest request(url);
|
|
connect(&manager, &QNetworkAccessManager::finished, this,
|
|
[this,&success] (QNetworkReply *reply) { saveImage(reply, success); });
|
|
connect(&manager, &QNetworkAccessManager::finished, &loop, &QEventLoop::quit);
|
|
QNetworkReply *reply = manager.get(request);
|
|
loop.exec();
|
|
delete reply;
|
|
}
|
|
return success;
|
|
}
|
|
|
|
void ImageDownloader::saveImage(QNetworkReply *reply, bool &success)
|
|
{
|
|
success = false;
|
|
QByteArray imageData = reply->readAll();
|
|
QImage image;
|
|
image.loadFromData(imageData);
|
|
if (image.isNull())
|
|
return;
|
|
success = true;
|
|
QCryptographicHash hash(QCryptographicHash::Sha1);
|
|
hash.addData(imageData);
|
|
QString path = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first();
|
|
QDir dir(path);
|
|
if (!dir.exists())
|
|
dir.mkpath(path);
|
|
QFile imageFile(path.append("/").append(hash.result().toHex()));
|
|
if (imageFile.open(QIODevice::WriteOnly)) {
|
|
QDataStream stream(&imageFile);
|
|
stream.writeRawData(imageData.data(), imageData.length());
|
|
imageFile.waitForBytesWritten(-1);
|
|
imageFile.close();
|
|
learnHash(QString(picture->filename), imageFile.fileName(), hash.result());
|
|
}
|
|
// This should be called to make the picture actually show.
|
|
// Problem is DivePictureModel is not in core.
|
|
// Nevertheless, the image shows when the dive is selected the next time.
|
|
// DivePictureModel::instance()->updateDivePictures();
|
|
|
|
}
|
|
|
|
static void loadPicture(struct picture *picture, bool fromHash)
|
|
{
|
|
static QSet<QString> queuedPictures;
|
|
static QMutex pictureQueueMutex;
|
|
|
|
if (!picture)
|
|
return;
|
|
QMutexLocker locker(&pictureQueueMutex);
|
|
if (queuedPictures.contains(QString(picture->filename))) {
|
|
picture_free(picture);
|
|
return;
|
|
}
|
|
queuedPictures.insert(QString(picture->filename));
|
|
locker.unlock();
|
|
|
|
ImageDownloader download(picture);
|
|
download.load(fromHash);
|
|
}
|
|
|
|
SHashedImage::SHashedImage(struct picture *picture) : QImage()
|
|
{
|
|
QUrl url = QUrl::fromUserInput(localFilePath(QString(picture->filename)));
|
|
if(url.isLocalFile())
|
|
load(url.toLocalFile());
|
|
if (isNull()) {
|
|
// This did not load anything. Let's try to get the image from other sources
|
|
// Let's try to load it locally via its hash
|
|
QString filename = localFilePath(picture->filename);
|
|
if (filename.isNull()) {
|
|
// That didn't produce a local filename.
|
|
// Try the cloud server
|
|
// TODO: This is dead code at the moment.
|
|
QtConcurrent::run(loadPicture, clone_picture(picture), true);
|
|
} else {
|
|
// Load locally from translated file name
|
|
load(filename);
|
|
if (!isNull()) {
|
|
// Make sure the hash still matches the image file
|
|
QtConcurrent::run(hashPicture, clone_picture(picture));
|
|
} else {
|
|
// Interpret filename as URL
|
|
QtConcurrent::run(loadPicture, clone_picture(picture), false);
|
|
}
|
|
}
|
|
} else {
|
|
// We loaded successfully. Now, make sure hash is up to date.
|
|
QtConcurrent::run(hashPicture, clone_picture(picture));
|
|
}
|
|
}
|
|
|