Scanner: do not decode whole images, just probe, ref #561

src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp

@@ -27,6 +27,7 @@
 #include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
 #include "image/Exception.hpp"
+#include "image/IRawImage.hpp"
 #include "image/Image.hpp"
 
 #include "IFileScanOperation.hpp"
@@ -55,29 +56,18 @@ namespace lms::scanner
             const MediaLibraryInfo _mediaLibrary;
             db::Db& _db;
 
-            struct ImageInfo
-            {
-                std::size_t height{};
-                std::size_t width{};
-            };
-            std::optional<ImageInfo> _parsedImageInfo;
+            std::optional<image::ImageProperties> _parsedImageProperties;
         };
 
         void ImageFileScanOperation::scan()
         {
             try
             {
-                std::unique_ptr<image::IRawImage> rawImage{ image::decodeImage(_file) };
-
-                ImageInfo imageInfo;
-                imageInfo.width = rawImage->getWidth();
-                imageInfo.height = rawImage->getHeight();
-
-                _parsedImageInfo = imageInfo;
+                _parsedImageProperties = image::probeImage(_file);
             }
             catch (const image::Exception& e)
             {
-                _parsedImageInfo.reset();
+                _parsedImageProperties.reset();
                 LMS_LOG(DBUPDATER, ERROR, "Cannot read image in file " << _file << ": " << e.what());
             }
         }
@@ -96,7 +86,7 @@ namespace lms::scanner
             db::Session& dbSession{ _db.getTLSSession() };
             db::Image::pointer image{ db::Image::find(dbSession, _file) };
 
-            if (!_parsedImageInfo)
+            if (!_parsedImageProperties)
             {
                 if (image)
                 {
@@ -114,8 +104,8 @@ namespace lms::scanner
 
             image.modify()->setLastWriteTime(fileInfo->lastWriteTime);
             image.modify()->setFileSize(fileInfo->fileSize);
-            image.modify()->setHeight(_parsedImageInfo->height);
-            image.modify()->setWidth(_parsedImageInfo->width);
+            image.modify()->setHeight(_parsedImageProperties->height);
+            image.modify()->setWidth(_parsedImageProperties->width);
             db::MediaLibrary::pointer mediaLibrary{ db::MediaLibrary::find(dbSession, _mediaLibrary.id) }; // may be null if settings are updated in // => next scan will correct this
             image.modify()->setDirectory(utils::getOrCreateDirectory(dbSession, _file.parent_path(), mediaLibrary));