mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix picture hashing logic for pictures on the web.

Browse source 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2016-12-15 14:31:20 +01:00
parent ca1349241b
commit 10b8bda662
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/imagedownloader.cpp
View file

@ -100,6 +100,8 @@ SHashedImage::SHashedImage(struct picture *picture) : QImage()
// This did not load anything. Let's try to get the image from other sources // 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 // Let's try to load it locally via its hash
QString filename = fileFromHash(picture->hash); QString filename = fileFromHash(picture->hash);
if (filename.isNull())
filename = QString(picture->filename);
if (filename.isNull()) { if (filename.isNull()) {
// That didn't produce a local filename. // That didn't produce a local filename.
// Try the cloud server // Try the cloud server

6
core/qthelper.cpp
View file

@ -1075,6 +1075,8 @@ QByteArray hashFile(const QString filename)
void learnHash(struct picture *picture, QByteArray hash) void learnHash(struct picture *picture, QByteArray hash)
{ {
if (hash.isNull())
return;
if (picture->hash) if (picture->hash)
free(picture->hash); free(picture->hash);
QMutexLocker locker(&hashOfMutex); QMutexLocker locker(&hashOfMutex);
@ -1100,6 +1102,8 @@ QString localFilePath(const QString originalFilename)
QString fileFromHash(char *hash) QString fileFromHash(char *hash)
{ {
if (!hash || !*hash)
return "";
QMutexLocker locker(&hashOfMutex); QMutexLocker locker(&hashOfMutex);
return localFilenameOf[QByteArray::fromHex(hash)]; return localFilenameOf[QByteArray::fromHex(hash)];
@ -1120,7 +1124,7 @@ void hashPicture(struct picture *picture)
if (!picture) if (!picture)
return; return;
char *oldHash = copy_string(picture->hash); char *oldHash = copy_string(picture->hash);
learnHash(picture, hashFile(QString(picture->filename))); learnHash(picture, hashFile(localFilePath(picture->filename)));
if (!same_string(picture->hash, "") && !same_string(picture->hash, oldHash)) if (!same_string(picture->hash, "") && !same_string(picture->hash, oldHash))
mark_divelist_changed((true)); mark_divelist_changed((true));
free(oldHash); free(oldHash);