Start: Add extensions to ignore for thumbnails

Author: chennes

src/Mod/Start/App/DisplayedFilesModel.cpp

@@ -228,11 +228,21 @@ void DisplayedFilesModel::addFile(const QString& filePath)
     }
 
     _fileInfoCache.emplace_back(getFileInfo(filePath.toStdString()));
-    if (qfi.suffix().toLower() == QLatin1String("fcstd")) {
+    const auto lowercaseExtension = qfi.suffix().toLower();
+    const QStringList ignoredExtensions {QLatin1String("fcmacro"),
+                                         QLatin1String("py"),
+                                         QLatin1String("pyi"),
+                                         QLatin1String("csv"),
+                                         QLatin1String("txt")};
+    if (lowercaseExtension == QLatin1String("fcstd")) {
         if (const auto thumbnail = loadFCStdThumbnail(filePath); !thumbnail.isEmpty()) {
             _imageCache.insert(filePath, thumbnail);
         }
     }
+    else if (ignoredExtensions.contains(lowercaseExtension)) {
+        // Don't try to generate a thumbnail for things like this: FreeCAD can read them, but
+        // there's not much point in showing anything besides a generic icon
+    }
     else {
         const auto runner = new ThumbnailSource(filePath);
         connect(runner->signals(),

src/Mod/Start/App/FileUtilities.cpp

@@ -24,6 +24,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 #include <QCryptographicHash>
+#include <QDateTime>
 #include <QDir>
 #include <QFileInfo>
 #include <QStandardPaths>

src/Mod/Start/App/ThumbnailSource.cpp

@@ -76,19 +76,22 @@ void ThumbnailSource::run()
         args << QLatin1String("--output=") + thumbnailPath << _file;
 
         _process = std::make_unique<QProcess>();
+        Base::Console().Log("Creating thumbnail for %s...\n", _file.toStdString());
         _process->start(f3d, args);
-
-        // Since this is running on a non-GUI thread, poll for an interruption request while running
-        // so that external code can kill the process if necessary.
         constexpr int checkEveryMs {50};
-        while (_process->waitForFinished(checkEveryMs)) {
+        while (!_process->waitForFinished(checkEveryMs)) {
             if (QThread::currentThread()->isInterruptionRequested()) {
                 _process->kill();
+                break;
             }
         }
         if (_process->exitCode() != 0) {
+            Base::Console().Log("Creating thumbnail for %s failed\n", _file.toStdString());
             return;
         }
+        Base::Console().Log("Creating thumbnail for %s succeeded, wrote to %s\n",
+                            _file.toStdString(),
+                            thumbnailPath.toStdString());
     }
 
     if (QFile thumbnailFile(thumbnailPath); thumbnailFile.exists()) {
@@ -132,7 +135,7 @@ QStringList getF3DOptions(const QString& f3d)
         QStringLiteral("--load-plugins=occt"),
         QStringLiteral("--config=thumbnail"),
         QStringLiteral("--verbose=quiet"),
-        QStringLiteral("--resolution=128,128"),
+        QStringLiteral("--resolution=256,256"),
         QStringLiteral("--filename=0"),
         QStringLiteral("--grid=0"),
         QStringLiteral("--no-background"),

src/Mod/Start/App/ThumbnailSource.h

@@ -57,13 +57,6 @@ class ThumbnailSource: public QRunnable
     ThumbnailSource operator=(const ThumbnailSource&) = delete;
     ThumbnailSource operator=(ThumbnailSource&&) = delete;
 
-    // Don't make copies of a ThumbnailSource (it's probably running a process, what would it mean
-    // to copy it?):
-    ThumbnailSource(ThumbnailSource&) = delete;
-    ThumbnailSource(ThumbnailSource&&) = delete;
-    ThumbnailSource operator=(const ThumbnailSource&) = delete;
-    ThumbnailSource operator=(ThumbnailSource&&) = delete;
-
     void run() override;
 
     ThumbnailSourceSignals* signals();

src/Mod/Start/Gui/FileCardDelegate.cpp

@@ -208,6 +208,8 @@ QPixmap FileCardDelegate::generateThumbnail(const QString& path) const
     auto thumbnailSize =
         static_cast<int>(_parameterGroup->GetInt("FileThumbnailIconsSize", 128));  // NOLINT
     if (path.endsWith(QLatin1String(".fcstd"), Qt::CaseSensitivity::CaseInsensitive)) {
+        // This is a fallback, the model will have pulled the thumbnail out of the FCStd file if it
+        // existed.
         QImageReader reader(QLatin1String(":/icons/freecad-doc.svg"));
         reader.setScaledSize({thumbnailSize, thumbnailSize});
         return QPixmap::fromImage(reader.read());