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

If all else fails try loading images from cloud server

Browse source 
Of course, as of this writing, there are no images on the server.

In addition, this patch adds comments to explain the by now convoluted
image retrieval logic (local file, filename as URL, by hash, cloud server).

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 2016-01-09 16:29:49 +01:00 committed by Dirk Hohndel
parent 3ae6326847
commit 82c87204e4
2 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
subsurface-core/imagedownloader.cpp
View file

@ -7,13 +7,22 @@
#include <QtConcurrent>
QUrl cloudImageURL(const char *hash)
{
return QUrl::fromUserInput(QString("https://cloud.subsurface-divelog.org/images/").append(hash));
}
ImageDownloader::ImageDownloader(struct picture *pic)
{
picture = pic;
}
void ImageDownloader::load(){
QUrl url = QUrl::fromUserInput(QString(picture->filename));
void ImageDownloader::load(bool fromHash){
QUrl url;
if(fromHash)
url = cloudImageURL(picture->hash);
else
url = QUrl::fromUserInput(QString(picture->filename));
if (url.isValid()) {
QEventLoop loop;
QNetworkRequest request(url);
@ -52,10 +61,10 @@ void ImageDownloader::saveImage(QNetworkReply *reply)
reply->deleteLater();
}
void loadPicture(struct picture *picture)
void loadPicture(struct picture *picture, bool fromHash)
{
ImageDownloader download(picture);
download.load();
download.load(fromHash);
}
SHashedImage::SHashedImage(struct picture *picture) : QImage()
@ -64,16 +73,27 @@ SHashedImage::SHashedImage(struct picture *picture) : QImage()
if(url.isLocalFile())
load(url.toLocalFile());
if (isNull()) {
// Hash lookup.
load(fileFromHash(picture->hash));
if (!isNull()) {
QtConcurrent::run(updateHash, picture);
// 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 = fileFromHash(picture->hash);
if (filename.isNull()) {
// That didn't produce a local filename.
// Try the cloud server
QtConcurrent::run(loadPicture, picture, true);
} else {
QtConcurrent::run(loadPicture, picture);
// Load locally from translated file name
load(filename);
if (!isNull()) {
// Make sure the hash still matches the image file
QtConcurrent::run(updateHash, picture);
} else {
// Interpret filename as URL
QtConcurrent::run(loadPicture, picture, false);
}
}
} else {
QByteArray hash = hashFile(url.toLocalFile());
free(picture->hash);
picture->hash = strdup(hash.toHex().data());
// We loaded successfully. Now, make sure hash is up to date.
QtConcurrent::run(hashPicture, picture);
}
}

5
subsurface-core/imagedownloader.h
View file

@ -7,11 +7,14 @@
typedef QPair<QString, QByteArray> SHashedFilename;
extern QUrl cloudImageURL(const char *hash);
class ImageDownloader : public QObject {
Q_OBJECT;
public:
ImageDownloader(struct picture *picture);
void load();
void load(bool fromHash);
private:
struct picture *picture;