Move check for exiftool to useExiftool function

Signed-off-by: Michael Rasmussen <[email protected]>
LycheeOrg · Feb 11, 2019 · 5d29972 · 5d29972
1 parent ceab99b
commit 5d29972
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/php/Modules/Photo.php b/php/Modules/Photo.php
@@ -1063,16 +1063,13 @@ public function getInfo($url) {
 			$exif = false;
 			if(Settings::useExiftool()) {
 				Log::notice(Database::get(), __METHOD__, __LINE__, 'Using exiftool');
-				system('which exiftool 2>&1 > /dev/null', $status);
-				if ($status == 0) {
-					$handle = @popen("exiftool -php -q $url 2>&1", 'r');
-					$exiftool = @fread($handle, 8192);
-					@pclose($handle);
-					if (false!==$exiftool && strlen($exiftool) > 0) {
-						$exiftool = @eval('return ' . "$exiftool");
-						if (is_array($exiftool) && is_array($exiftool[0])) {
-							$exif = $exiftool[0];
-						}
+				$handle = @popen("exiftool -php -q $url 2>&1", 'r');
+				$exiftool = @fread($handle, 8192);
+				@pclose($handle);
+				if (false!==$exiftool && strlen($exiftool) > 0) {
+					$exiftool = @eval('return ' . "$exiftool");
+					if (is_array($exiftool) && is_array($exiftool[0])) {
+						$exif = $exiftool[0];
 					}
 				}
 			}

diff --git a/php/Modules/Settings.php b/php/Modules/Settings.php
@@ -353,6 +353,8 @@ public static function setDefaultLicense($license) {
          * @return bool Returns the useExiftool setting.
          */
         public static function useExiftool() {
+                system('which exiftool 2>&1 > /dev/null', $status);
+                if ($status != 0) return false;
                 return (bool) (self::get()['useExiftool'] === '1');
         }