From 894f00bcc7e9a3c2bab250bd49106d3ab03dc780 Mon Sep 17 00:00:00 2001 From: GM Date: Wed, 11 Nov 2026 00:45:58 -0400 Subject: [PATCH 1/2] Find a thumbnailer through its type's aliases A thumbnailer that names a type only by an alias never matched the canonical name Folio asks with, so glycin's image/x-dds left a DDS file blank, and WAV audio missed the thumbnailer it had. The declared types are resolved to canonical names once, when the thumbnailers are read. Within one folder a .thumbnailer file that names the type itself still wins over one that names an alias of it. Co-Authored-By: Claude Opus 5.5 --- src/thumbnails.cpp | 14 ++++++++++++-- tests/folio_tests.cpp | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/thumbnails.cpp b/src/thumbnails.cpp index c0ae8b78..fd897551 100644 --- a/src/thumbnails.cpp +++ b/src/thumbnails.cpp @@ -98,7 +98,10 @@ Thumbnails::Thumbnails(const QString &cacheDirectory, const QStringList &thumbna for (const QString &base : data) directories << base + "/thumbnailers"; } + QMimeDatabase mimes; for (const QString &directory : directories) { + // A .thumbnailer file may name a type by an alias, as glycin names DDS pictures image/x-dds. + QHash named, aliased; QDirIterator it(directory, {"*.thumbnailer"}, QDir::Files); while (it.hasNext()) { // A tiny desktop-entry reader: QSettings would treat the @@ -119,9 +122,16 @@ Thumbnails::Thumbnails(const QString &cacheDirectory, const QStringList &thumbna const QString tryExec = fields.value("TryExec"); if (exec.isEmpty() || (!tryExec.isEmpty() && QStandardPaths::findExecutable(tryExec).isEmpty())) continue; - for (const QString &mime : fields.value("MimeType").split(';', Qt::SkipEmptyParts)) - m_thumbnailers.insert(mime.trimmed(), exec); + for (const QString &declared : fields.value("MimeType").split(';', Qt::SkipEmptyParts)) { + const QString mime = declared.trimmed(); + named.insert(mime, exec); + if (const QString type = mimes.mimeTypeForName(mime).name(); !type.isEmpty()) + aliased.insert(type, exec); + } } + // Within one directory the file that names a type itself wins over one that names an alias of it. + m_thumbnailers.insert(aliased); + m_thumbnailers.insert(named); } } diff --git a/tests/folio_tests.cpp b/tests/folio_tests.cpp index 6a0aeeb4..87bc8ced 100644 --- a/tests/folio_tests.cpp +++ b/tests/folio_tests.cpp @@ -6720,6 +6720,36 @@ private slots: QCOMPARE(FolderModel::typeByContent(pipe, unnamed), QString("inode/fifo")); } + void thumbnailsMatchATypeNamedByItsAlias() + { + QTemporaryDir dir; + QImage page(64, 96, QImage::Format_RGB32); + page.fill(Qt::green); + QVERIFY(page.save(dir.filePath("page.png"))); + QVERIFY(QDir(dir.path()).mkdir("system") && QDir(dir.path()).mkdir("user")); + // Like evince, the user's .thumbnailer file names comic books and icons only by an alias. + write(dir.filePath("user/comics.thumbnailer"), + "[Thumbnailer Entry]\nExec=/bin/cp \"" + dir.filePath("page.png").toUtf8() + "\" %o\n" + "MimeType=application/x-cbz;image/x-icon;application/x-nothing-here;video/x-matroska;audio/vnd.wave;\n"); + write(dir.filePath("user/media.thumbnailer"), "[Thumbnailer Entry]\nExec=/bin/true %i\nMimeType=video/matroska;audio/x-wav;\n"); + write(dir.filePath("system/icons.thumbnailer"), "[Thumbnailer Entry]\nExec=/bin/false %i\nMimeType=image/vnd.microsoft.icon;\n"); + Thumbnails thumbnails(dir.filePath("cache"), {dir.filePath("system"), dir.filePath("user")}); + + write(dir.filePath("issue.cbz"), "not really a zip"); + const QImage thumb = thumbnails.load(dir.filePath("issue.cbz"), "application/vnd.comicbook+zip", 128); + QCOMPARE(thumb.pixelColor(0, 0), QColor(Qt::green)); + // The later directory still wins when its file names the type by an alias. + QVERIFY(thumbnails.thumbnailerFor("image/vnd.microsoft.icon").startsWith("/bin/cp")); + // Within one directory the file that names the type itself wins, whichever file is read first. + QCOMPARE(QMimeDatabase().mimeTypeForName("video/x-matroska").name(), QString("video/matroska")); + QCOMPARE(QMimeDatabase().mimeTypeForName("audio/x-wav").name(), QString("audio/vnd.wave")); + QVERIFY(thumbnails.thumbnailerFor("video/matroska").startsWith("/bin/true")); + QVERIFY(thumbnails.thumbnailerFor("audio/vnd.wave").startsWith("/bin/cp")); + // A type the MIME database doesn't know is matched by the name the file gives, and by no other. + QVERIFY(thumbnails.thumbnailerFor("application/x-nothing-here").startsWith("/bin/cp")); + QVERIFY(thumbnails.thumbnailerFor("").isEmpty()); + } + void previewerPicksAViewerForEachType() { QCOMPARE(Previewer::viewerFor("image/png", false), QString("image")); From 3bca716f1e8515ccb76bf0168dfb39afa15b7e4a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 18 Nov 2026 16:08:04 +0100 Subject: [PATCH 2/2] Test aliases with names every MIME database agrees on The test took video/matroska and audio/vnd.wave to be the canonical names, which they are only in newer shared-mime-info; with 2.2 the x- names are, and the test failed with the code working. Which file wins within one folder is now checked with comic book RAR archives, whose canonical name and x-cbr alias have stood for years. Co-Authored-By: Claude Opus 5.5 --- tests/folio_tests.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/folio_tests.cpp b/tests/folio_tests.cpp index 87bc8ced..f72a6a30 100644 --- a/tests/folio_tests.cpp +++ b/tests/folio_tests.cpp @@ -6730,8 +6730,8 @@ private slots: // Like evince, the user's .thumbnailer file names comic books and icons only by an alias. write(dir.filePath("user/comics.thumbnailer"), "[Thumbnailer Entry]\nExec=/bin/cp \"" + dir.filePath("page.png").toUtf8() + "\" %o\n" - "MimeType=application/x-cbz;image/x-icon;application/x-nothing-here;video/x-matroska;audio/vnd.wave;\n"); - write(dir.filePath("user/media.thumbnailer"), "[Thumbnailer Entry]\nExec=/bin/true %i\nMimeType=video/matroska;audio/x-wav;\n"); + "MimeType=application/x-cbz;image/x-icon;application/x-nothing-here;application/x-cbr;\n"); + write(dir.filePath("user/rar.thumbnailer"), "[Thumbnailer Entry]\nExec=/bin/true %i\nMimeType=application/vnd.comicbook-rar;\n"); write(dir.filePath("system/icons.thumbnailer"), "[Thumbnailer Entry]\nExec=/bin/false %i\nMimeType=image/vnd.microsoft.icon;\n"); Thumbnails thumbnails(dir.filePath("cache"), {dir.filePath("system"), dir.filePath("user")}); @@ -6741,10 +6741,8 @@ private slots: // The later directory still wins when its file names the type by an alias. QVERIFY(thumbnails.thumbnailerFor("image/vnd.microsoft.icon").startsWith("/bin/cp")); // Within one directory the file that names the type itself wins, whichever file is read first. - QCOMPARE(QMimeDatabase().mimeTypeForName("video/x-matroska").name(), QString("video/matroska")); - QCOMPARE(QMimeDatabase().mimeTypeForName("audio/x-wav").name(), QString("audio/vnd.wave")); - QVERIFY(thumbnails.thumbnailerFor("video/matroska").startsWith("/bin/true")); - QVERIFY(thumbnails.thumbnailerFor("audio/vnd.wave").startsWith("/bin/cp")); + QCOMPARE(QMimeDatabase().mimeTypeForName("application/x-cbr").name(), QString("application/vnd.comicbook-rar")); + QVERIFY(thumbnails.thumbnailerFor("application/vnd.comicbook-rar").startsWith("/bin/true")); // A type the MIME database doesn't know is matched by the name the file gives, and by no other. QVERIFY(thumbnails.thumbnailerFor("application/x-nothing-here").startsWith("/bin/cp")); QVERIFY(thumbnails.thumbnailerFor("").isEmpty());