Dive pictures: Derive thumbnail file from picture filename

Since commit 6618c9ebfc6a7cebbef687fcb3aa74c70f504ff2, thumbnails
are saved in individual files. The filename was simply the picture-hash.
In a mailing-list discussion it turned out that in the future we might
not hash images or change the hash. Therefore, derive the thumbnail
filename from the image filename, using the SHA1 algorithm.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 0 insertions, 9 deletions

diff --git a/core/imagedownloader.cpp b/core/imagedownloader.cpp
index db2d81b99..1d82c50c5 100644
--- a/core/imagedownloader.cpp
+++ b/core/imagedownloader.cpp
@@ -148,7 +148,6 @@ Thumbnailer *Thumbnailer::instance()
 
 static QImage getThumbnailFromCache(const QString &picture_filename)
 {
-	// First, check if we know a hash for this filename
 	QString filename = thumbnailFileName(picture_filename);
 	if (filename.isEmpty())
 		return QImage();
@@ -173,14 +172,6 @@ static void addThumbnailToCache(const QImage &thumbnail, const QString &picture_
 		return;
 
 	QString filename = thumbnailFileName(picture_filename);
-
-	// If we got a thumbnail, we are guaranteed to have its hash and therefore
-	// thumbnailFileName() should return a filename.
-	if (filename.isEmpty()) {
-		qWarning() << "Internal error: can't get filename of recently created thumbnail";
-		return;
-	}
-
 	QSaveFile file(filename);
 	if (!file.open(QIODevice::WriteOnly))
 		return;