5 files changed, 81 insertions, 35 deletions

diff --git a/core/qthelper.cpp b/core/qthelper.cpp
index 7ca80a96e..1d77dbad6 100644
--- a/core/qthelper.cpp
+++ b/core/qthelper.cpp
@@ -1277,37 +1277,95 @@ QStringList imageExtensionFilters() {
 	return filters;
 }
 
-// This works on a copy of the string, because it runs in asynchronous context
-static void learnImage(QString filename)
+// Compare two full paths and return the number of matching levels, starting from the filename.
+// String comparison is case-insensitive.
+static int matchFilename(const QString &path1, const QString &path2)
+{
+	QFileInfo f1(path1);
+	QFileInfo f2(path2);
+
+	int score = 0;
+	for (;;) {
+		QString fn1 = f1.fileName();
+		QString fn2 = f2.fileName();
+		if (fn1.isEmpty() || fn2.isEmpty())
+			break;
+		if (fn1 == ".") {
+			f1 = QFileInfo(f1.path());
+			continue;
+		}
+		if (fn2 == ".") {
+			f2 = QFileInfo(f2.path());
+			continue;
+		}
+		if (QString::compare(fn1, fn2, Qt::CaseInsensitive) != 0)
+			break;
+		f1 = QFileInfo(f1.path());
+		f2 = QFileInfo(f2.path());
+		++score;
+	}
+	return score;
+}
+
+struct ImageMatch {
+	QString localFilename;
+	int score;
+};
+
+static void learnImage(const QString &filename, QMap<QString, ImageMatch> &matches)
 {
+	// Find the original filenames with the highest match-score
+	QStringList newMatches;
 	QByteArray hash = hashFile(filename);
-	// TODO: This is inefficient: we search the hash map by value. But firstly,
-	// this is running in asynchronously, so it doesn't block the UI. Secondly,
-	// we might not want to learn pictures by hash anyway (the user might have
-	// edited the picture, which changes the hash.
+	int bestScore = 1;
 	for (auto it = hashOf.cbegin(); it != hashOf.cend(); ++it) {
-		if (it.value() == hash)
-			learnPictureFilename(it.key(), filename);
+		int score = matchFilename(filename, it.key());
+		if (score < bestScore)
+			continue;
+		if (score > bestScore)
+			newMatches.clear();
+		newMatches.append(it.key());
+		bestScore = score;
+	}
+
+	// Add the new original filenames to the list of matches, if the score is higher than previously
+	for (const QString &originalFilename: newMatches) {
+		auto it = matches.find(originalFilename);
+		if (it == matches.end())
+			matches.insert(originalFilename, { filename, bestScore });
+		else if (it->score < bestScore)
+			*it = { filename, bestScore };
 	}
 }
 
-void learnImages(const QDir dir, int max_recursions)
+void learnImages(const QStringList &dirNames, int max_recursions)
 {
-	QStringList files;
 	QStringList filters = imageExtensionFilters();
-
-	if (max_recursions) {
-		foreach (QString dirname, dir.entryList(QStringList(), QDir::NoDotAndDotDot | QDir::Dirs)) {
-			learnImages(QDir(dir.filePath(dirname)), max_recursions - 1);
+	QMap<QString, ImageMatch> matches;
+
+	QVector<QStringList> stack; // Use a stack to recurse into directories
+	stack.reserve(max_recursions + 1);
+	stack.append(dirNames);
+	while (!stack.isEmpty()) {
+		if (stack.last().isEmpty()) {
+			stack.removeLast();
+			continue;
+		}
+		QDir dir(stack.last().takeLast());
+
+		for (const QString &file: dir.entryList(filters, QDir::Files))
+			learnImage(dir.absoluteFilePath(file), matches);
+		if (stack.size() <= max_recursions) {
+			stack.append(QStringList());
+			for (const QString &dirname: dir.entryList(QStringList(), QDir::NoDotAndDotDot | QDir::Dirs))
+				stack.last().append(dir.filePath(dirname));
 		}
 	}
 
+	for (auto it = matches.begin(); it != matches.end(); ++it)
+		learnPictureFilename(it.key(), it->localFilename);
 
-	foreach (QString file, dir.entryList(filters, QDir::Files)) {
-		files.append(dir.absoluteFilePath(file));
-	}
-
-	QtConcurrent::blockingMap(files, learnImage);
+	write_hashes();
 }
 
 extern "C" const char *local_file_path(struct picture *picture)
diff --git a/core/qthelper.h b/core/qthelper.h
index 65a818262..0594bf7df 100644
--- a/core/qthelper.h
+++ b/core/qthelper.h
@@ -31,7 +31,7 @@ void updateHash(struct picture *picture);
 QByteArray hashFile(const QString &filename);
 QString hashString(const char *filename);
 QString thumbnailFileName(const QString &filename);
-void learnImages(const QDir dir, int max_recursions);
+void learnImages(const QStringList &dirNames, int max_recursions);
 void learnPictureFilename(const QString &originalName, const QString &localName);
 void hashPicture(QString filename);
 extern "C" char *hashstring(const char *filename);
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index b22b7e265..c0c79b00d 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -701,13 +701,10 @@ void MainWindow::on_actionCloudOnline_triggered()
 	updateCloudOnlineStatus();
 }
 
-void learnImageDirs(QStringList dirnames)
+static void learnImageDirs(QStringList dirnames)
 {
-	QList<QFuture<void> > futures;
-	foreach (QString dir, dirnames) {
-		futures << QtConcurrent::run(learnImages, QDir(dir), 10);
-	}
-	DivePictureModel::instance()->updateDivePicturesWhenDone(futures);
+	learnImages(dirnames, 10);
+	DivePictureModel::instance()->updateDivePictures();
 }
 
 void MainWindow::on_actionHash_images_triggered()
diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp
index f84146168..5948f426c 100644
--- a/qt-models/divepicturemodel.cpp
+++ b/qt-models/divepicturemodel.cpp
@@ -23,14 +23,6 @@ DivePictureModel::DivePictureModel() : rowDDStart(0),
 		this, &DivePictureModel::updateThumbnail, Qt::QueuedConnection);
 }
 
-void DivePictureModel::updateDivePicturesWhenDone(QList<QFuture<void>> futures)
-{
-	Q_FOREACH (QFuture<void> f, futures) {
-		f.waitForFinished();
-	}
-	updateDivePictures();
-}
-
 void DivePictureModel::setZoomLevel(int level)
 {
 	zoomLevel = level / 10.0;
diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h
index a7a3d7180..dd2f9cbd0 100644
--- a/qt-models/divepicturemodel.h
+++ b/qt-models/divepicturemodel.h
@@ -21,7 +21,6 @@ public:
 	virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
 	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
 	virtual void updateDivePictures();
-	void updateDivePicturesWhenDone(QList<QFuture<void>>);
 	void removePictures(const QVector<QString> &fileUrls);
 	int rowDDStart, rowDDEnd;
 	void updateDivePictureOffset(const QString &filename, int offsetSeconds);