Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/thumbnails.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<QString, QString> named, aliased;
QDirIterator it(directory, {"*.thumbnailer"}, QDir::Files);
while (it.hasNext()) {
// A tiny desktop-entry reader: QSettings would treat the
Expand All @@ -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);
}
}

Expand Down
28 changes: 28 additions & 0 deletions tests/folio_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6720,6 +6720,34 @@ 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;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")});

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("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());
}

void previewerPicksAViewerForEachType()
{
QCOMPARE(Previewer::viewerFor("image/png", false), QString("image"));
Expand Down
Loading