Add support for paths in php-exif (#2490)

LycheeOrg · Jul 2, 2024 · 9065072 · 9065072
1 parent dcf54f0
commit 9065072
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 99 deletions.
diff --git a/app/Metadata/Extractor.php b/app/Metadata/Extractor.php
@@ -78,8 +78,8 @@ public static function createFromFile(NativeLocalFile $file, int $fileLastModifi
 			//  3. Imagick (not for videos, i.e. for supported photos and accepted raw files only)
 			//  4. Native PHP exif reader (last resort)
 			$reader = match (true) {
-				(Configs::hasFFmpeg() && $isSupportedVideo) => Reader::factory(ReaderType::FFPROBE),
-				Configs::hasExiftool() => Reader::factory(ReaderType::EXIFTOOL),
+				(Configs::hasFFmpeg() && $isSupportedVideo) => Reader::factory(ReaderType::FFPROBE, Configs::getValueAsString('ffprobe_path')),
+				Configs::hasExiftool() => Reader::factory(ReaderType::EXIFTOOL, Configs::getValueAsString('exiftool_path')),
 				(Configs::hasImagick() && !$isSupportedVideo) => Reader::factory(ReaderType::IMAGICK),
 				default => Reader::factory(ReaderType::NATIVE),
 			};

diff --git a/composer.json b/composer.json
@@ -57,7 +57,7 @@
         "laravel/socialite": "^5.11",
         "livewire/livewire": "^3.0",
         "lychee-org/nestedset": "^9.0",
-        "lychee-org/php-exif": "^1.0.0",
+        "lychee-org/php-exif": "^1.0.4",
         "maennchen/zipstream-php": "^3.1",
         "opcodesio/log-viewer": "dev-lycheeOrg",
         "php-ffmpeg/php-ffmpeg": "^1.0",