filter out unsupported images [CI SKIP]

src/appconfig.cpp

@@ -71,6 +71,19 @@ std::vector<std::string> ParseJSONStrings(QJsonObject jsonDoc, const char *key)
   return values;
 }
 
+std::vector<std::string> NormalizeExtensions(const std::vector<std::string> &values) {
+  std::vector<std::string> normalized;
+  for (const auto &value : values)
+  {
+    std::string s = value;
+    for (auto &c : s)
+      c = static_cast<char>(::tolower(c));
+    if (!s.empty())
+      normalized.push_back(s);
+  }
+  return normalized;
+}
+
 ImmichConfig ParseImmichConfigObject(QJsonObject immichJson) {
   ImmichConfig config;
 
@@ -81,6 +94,13 @@ ImmichConfig ParseImmichConfigObject(QJsonObject immichJson) {
   if(!apiKey.empty())
     config.apiKey = apiKey;
 
+  std::string userId = ParseJSONString(immichJson, "userId");
+  if(!userId.empty())
+    config.userId = userId;
+  std::string ownerId = ParseJSONString(immichJson, "ownerId");
+  if(!ownerId.empty() && config.userId.empty())
+    config.userId = ownerId;
+
   std::string size = ParseJSONString(immichJson, "size");
   if(!size.empty())
     config.size = size;
@@ -109,6 +129,12 @@ ImmichConfig ParseImmichConfigObject(QJsonObject immichJson) {
   if(personIds.size() > 0)
     config.personIds = personIds;
 
+  std::vector<std::string> allowedExtensions = ParseJSONStrings(immichJson, "extensions");
+  if(allowedExtensions.size() == 0)
+    allowedExtensions = ParseJSONStrings(immichJson, "allowedExtensions");
+  if(allowedExtensions.size() > 0)
+    config.allowedExtensions = NormalizeExtensions(allowedExtensions);
+
   SetJSONInt(config.pageSize, immichJson, "pageSize");
   SetJSONInt(config.maxAssets, immichJson, "maxAssets");
   SetJSONInt(config.cacheMaxMB, immichJson, "cacheMaxMB");
@@ -248,27 +274,35 @@ QString getAppConfigFilePath(const std::string &configPath) {
   std::string systemConfigFolder = "/etc/slide";
   QString baseConfigFilename("slide.options.json");
 
-  QDir directory(userConfigFolder.c_str());
-  QString jsonFile = "";
   if (!configPath.empty())
-  { 
-    directory.setPath(configPath.c_str());
-    jsonFile = directory.filePath(baseConfigFilename);    
-  }
-   if(!directory.exists(jsonFile))
-  { 
-    directory.setPath(userConfigFolder.c_str());
-    jsonFile = directory.filePath(baseConfigFilename);    
-  }
-  if(!directory.exists(jsonFile))
   {
-    directory.setPath(systemConfigFolder.c_str());
-    jsonFile = directory.filePath(baseConfigFilename);
+    QFileInfo configInfo(QString::fromStdString(configPath));
+    if (configInfo.exists() && configInfo.isFile())
+    {
+      return configInfo.absoluteFilePath();
+    }
+
+    QDir directory(configInfo.isDir() ? configInfo.absoluteFilePath()
+                                      : QString::fromStdString(configPath));
+    QString jsonFile = directory.filePath(baseConfigFilename);
+    if (directory.exists(jsonFile))
+    {
+      return jsonFile;
+    }
   }
 
-  if(directory.exists(jsonFile))
+  QDir userDir(userConfigFolder.c_str());
+  QString userFile = userDir.filePath(baseConfigFilename);
+  if (userDir.exists(userFile))
   {
-    return jsonFile;
+    return userFile;
+  }
+
+  QDir systemDir(systemConfigFolder.c_str());
+  QString systemFile = systemDir.filePath(baseConfigFilename);
+  if (systemDir.exists(systemFile))
+  {
+    return systemFile;
   }
 
   return "";

src/appconfig.h

@@ -10,8 +10,10 @@ struct ImmichConfig {
   bool enabled = false;
   std::string url = "";
   std::string apiKey = "";
+  std::string userId = "";
   std::vector<std::string> albumIds;
   std::vector<std::string> personIds;
+  std::vector<std::string> allowedExtensions;
   std::string size = "fullsize";
   std::string order = "desc";
   int pageSize = 200;
@@ -26,6 +28,8 @@ struct ImmichConfig {
       return false;
     if (url != b.url || apiKey != b.apiKey)
       return false;
+    if (userId != b.userId)
+      return false;
     if (size != b.size || order != b.order)
       return false;
     if (pageSize != b.pageSize || maxAssets != b.maxAssets)
@@ -48,6 +52,13 @@ struct ImmichConfig {
       if (personIds[i] != b.personIds[i])
         return false;
     }
+    if (allowedExtensions.size() != b.allowedExtensions.size())
+      return false;
+    for (size_t i = 0; i < allowedExtensions.size(); ++i)
+    {
+      if (allowedExtensions[i] != b.allowedExtensions[i])
+        return false;
+    }
     return true;
   }
 

src/immichclient.cpp

@@ -12,6 +12,7 @@
 #include <QSaveFile>
 #include <QTimer>
 #include <QUrlQuery>
+#include <QFileInfo>
 
 namespace {
 const int kMetadataTimeoutMs = 15000;
@@ -93,13 +94,27 @@ QByteArray ImmichClient::getBytes(const QUrl &url, QString *contentType, int tim
 
 QVector<ImmichAsset> ImmichClient::fetchAssets()
 {
-  QVector<ImmichAsset> assets;
   if (!config.enabled)
   {
     Log("Immich config is missing url or apiKey.");
-    return assets;
+    return QVector<ImmichAsset>();
   }
 
+  if (!config.userId.empty() && config.albumIds.empty() && config.personIds.empty())
+    return fetchAssetsByUser();
+
+  if (!config.userId.empty() && (!config.albumIds.empty() || !config.personIds.empty()))
+  {
+    Log("Immich userId is set but album/person filters are also set; ignoring userId for search filters.");
+  }
+
+  return fetchAssetsBySearch();
+}
+
+QVector<ImmichAsset> ImmichClient::fetchAssetsBySearch()
+{
+  QVector<ImmichAsset> assets;
+
   int pageSize = config.pageSize > 0 ? config.pageSize : 200;
   int maxAssets = config.maxAssets;
   bool triedZero = false;
@@ -110,7 +125,8 @@ QVector<ImmichAsset> ImmichClient::fetchAssets()
     Log("Immich search: size=", config.size, ", order=", config.order,
         ", pageSize=", pageSize, ", maxAssets=", maxAssets,
         ", albumIds=", config.albumIds.size(),
-        ", personIds=", config.personIds.size());
+        ", personIds=", config.personIds.size(),
+        ", allowedExtensions=", config.allowedExtensions.size());
   }
 
   while (true)
@@ -170,6 +186,11 @@ QVector<ImmichAsset> ImmichClient::fetchAssets()
       ImmichAsset asset;
       asset.id = id;
       asset.originalFileName = item["originalFileName"].toString();
+      if (!extensionAllowed(asset.originalFileName))
+      {
+        Log("Immich skip by extension: ", asset.originalFileName.toStdString());
+        continue;
+      }
       assets.append(asset);
       if (maxAssets > 0 && assets.size() >= maxAssets)
         return assets;
@@ -183,6 +204,88 @@ QVector<ImmichAsset> ImmichClient::fetchAssets()
   return assets;
 }
 
+QVector<ImmichAsset> ImmichClient::fetchAssetsByUser()
+{
+  QVector<ImmichAsset> assets;
+
+  int pageSize = config.pageSize > 0 ? config.pageSize : 200;
+  int maxAssets = config.maxAssets;
+  int skip = 0;
+
+  if (ShouldLog())
+  {
+    Log("Immich assets: userId=", config.userId,
+        ", pageSize=", pageSize,
+        ", maxAssets=", maxAssets,
+        ", includeArchived=", config.includeArchived);
+  }
+
+  while (true)
+  {
+    QUrl url = apiUrl("/assets");
+    QUrlQuery query;
+    query.addQueryItem("take", QString::number(pageSize));
+    query.addQueryItem("skip", QString::number(skip));
+    query.addQueryItem("userId", QString::fromStdString(config.userId));
+    if (!config.includeArchived)
+      query.addQueryItem("isArchived", "false");
+    url.setQuery(query);
+
+    QByteArray response = getBytes(url, nullptr, kMetadataTimeoutMs);
+    if (response.isEmpty())
+      break;
+
+    QJsonDocument doc = QJsonDocument::fromJson(response);
+    if (!doc.isArray())
+      break;
+
+    QJsonArray items = doc.array();
+    Log("Immich user assets skip ", skip, ": ", items.size(), " assets");
+    if (items.isEmpty())
+      break;
+
+    for (const auto &value : items)
+    {
+      QJsonObject item = value.toObject();
+      QString id = item["id"].toString();
+      if (id.isEmpty())
+        continue;
+      ImmichAsset asset;
+      asset.id = id;
+      asset.originalFileName = item["originalFileName"].toString();
+      if (!extensionAllowed(asset.originalFileName))
+      {
+        Log("Immich skip by extension: ", asset.originalFileName.toStdString());
+        continue;
+      }
+      assets.append(asset);
+      if (maxAssets > 0 && assets.size() >= maxAssets)
+        return assets;
+    }
+
+    if (items.size() < pageSize)
+      break;
+    skip += pageSize;
+  }
+
+  return assets;
+}
+
+bool ImmichClient::extensionAllowed(const QString &filename) const
+{
+  if (config.allowedExtensions.empty())
+    return true;
+  QString ext = QFileInfo(filename).suffix().toLower();
+  if (ext.isEmpty())
+    return false;
+  for (const auto &allowed : config.allowedExtensions)
+  {
+    if (ext == QString::fromStdString(allowed))
+      return true;
+  }
+  return false;
+}
+
 bool ImmichClient::downloadAsset(const QString &assetId, QByteArray &data, QString &contentType)
 {
   if (!config.enabled)

src/immichclient.h

@@ -23,6 +23,9 @@ class ImmichClient {
     bool downloadAsset(const QString &assetId, QByteArray &data, QString &contentType);
 
   private:
+    QVector<ImmichAsset> fetchAssetsBySearch();
+    QVector<ImmichAsset> fetchAssetsByUser();
+    bool extensionAllowed(const QString &filename) const;
     QUrl apiUrl(const QString &path) const;
     QNetworkRequest makeRequest(const QUrl &url) const;
     QByteArray postJson(const QUrl &url, const QJsonObject &body, QString *contentType, int timeoutMs);

src/main.cpp

@@ -292,6 +292,8 @@ static bool ApplyImmichPayload(ImmichConfig &config, const QString &payload)
     if (obj.contains("albumId") && obj["albumId"].isString())
     {
       config.albumIds = { obj["albumId"].toString().toStdString() };
+      config.userId.clear();
+      config.allowedExtensions.clear();
       changed = true;
     }
     if (obj.contains("albumIds") && obj["albumIds"].isArray())
@@ -303,11 +305,15 @@ static bool ApplyImmichPayload(ImmichConfig &config, const QString &payload)
         if (value.isString())
           config.albumIds.push_back(value.toString().toStdString());
       }
+      config.userId.clear();
+      config.allowedExtensions.clear();
       changed = true;
     }
     if (obj.contains("personId") && obj["personId"].isString())
     {
       config.personIds = { obj["personId"].toString().toStdString() };
+      config.userId.clear();
+      config.allowedExtensions.clear();
       changed = true;
     }
     if (obj.contains("personIds") && obj["personIds"].isArray())
@@ -319,6 +325,24 @@ static bool ApplyImmichPayload(ImmichConfig &config, const QString &payload)
         if (value.isString())
           config.personIds.push_back(value.toString().toStdString());
       }
+      config.userId.clear();
+      config.allowedExtensions.clear();
+      changed = true;
+    }
+    if (obj.contains("userId") && obj["userId"].isString())
+    {
+      config.userId = obj["userId"].toString().toStdString();
+      config.albumIds.clear();
+      config.personIds.clear();
+      config.allowedExtensions.clear();
+      changed = true;
+    }
+    if (obj.contains("ownerId") && obj["ownerId"].isString())
+    {
+      config.userId = obj["ownerId"].toString().toStdString();
+      config.albumIds.clear();
+      config.personIds.clear();
+      config.allowedExtensions.clear();
       changed = true;
     }
     if (obj.contains("order") && obj["order"].isString())
@@ -364,6 +388,30 @@ static bool ApplyImmichPayload(ImmichConfig &config, const QString &payload)
     {
       config.albumIds.clear();
       config.personIds.clear();
+      config.userId.clear();
+      config.allowedExtensions.clear();
+      changed = true;
+    }
+    if (obj.contains("extensions") && obj["extensions"].isArray())
+    {
+      config.allowedExtensions.clear();
+      QJsonArray arr = obj["extensions"].toArray();
+      for (const auto &value : arr)
+      {
+        if (value.isString())
+          config.allowedExtensions.push_back(value.toString().toLower().toStdString());
+      }
+      changed = true;
+    }
+    if (obj.contains("allowedExtensions") && obj["allowedExtensions"].isArray())
+    {
+      config.allowedExtensions.clear();
+      QJsonArray arr = obj["allowedExtensions"].toArray();
+      for (const auto &value : arr)
+      {
+        if (value.isString())
+          config.allowedExtensions.push_back(value.toString().toLower().toStdString());
+      }
       changed = true;
     }
     return changed;
@@ -391,26 +439,54 @@ static bool ApplyImmichPayload(ImmichConfig &config, const QString &payload)
   {
     config.albumIds.clear();
     config.personIds.clear();
+    config.userId.clear();
+    config.allowedExtensions.clear();
     return true;
   }
   if (key == "album" || key == "albumid")
   {
     config.albumIds = { value.toStdString() };
+    config.userId.clear();
+    config.allowedExtensions.clear();
     return true;
   }
   if (key == "albums" || key == "albumids")
   {
     config.albumIds = SplitCsv(value);
+    config.userId.clear();
+    config.allowedExtensions.clear();
     return true;
   }
   if (key == "person" || key == "personid")
   {
     config.personIds = { value.toStdString() };
+    config.userId.clear();
+    config.allowedExtensions.clear();
     return true;
   }
   if (key == "persons" || key == "personids")
   {
     config.personIds = SplitCsv(value);
+    config.userId.clear();
+    config.allowedExtensions.clear();
+    return true;
+  }
+  if (key == "user" || key == "userid" || key == "ownerid")
+  {
+    config.userId = value.toStdString();
+    config.albumIds.clear();
+    config.personIds.clear();
+    config.allowedExtensions.clear();
+    return true;
+  }
+  if (key == "extensions" || key == "allowedextensions")
+  {
+    config.allowedExtensions = SplitCsv(value);
+    for (auto &ext : config.allowedExtensions)
+    {
+      for (auto &c : ext)
+        c = static_cast<char>(::tolower(c));
+    }
     return true;
   }
   if (key == "order")

src/mainwindow.cpp

@@ -181,6 +181,16 @@ void MainWindow::updateImage()
 
     QPixmap p;
     p.load( currentImage.filename.c_str() );
+    if (p.isNull())
+    {
+      Log("Error: failed to load image: ", currentImage.filename);
+      warn("Failed to load image.");
+      if (switcher != nullptr)
+      {
+        switcher->scheduleImageUpdate();
+      }
+      return;
+    }
 
     Log("size:", p.width(), "x", p.height(), "(window:", width(), ",", height(), ")");