Move custom definition login into method

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

Author: kesselb

lib/private/Files/Type/Detection.php

@@ -121,6 +121,17 @@ public function registerTypeArray($types) {
 		}
 	}
 
+	private function loadCustomDefinitions(string $fileName, array &$definitions): void {
+		if (file_exists($this->customConfigDir . '/' . $fileName)) {
+			$custom = json_decode(file_get_contents($this->customConfigDir . '/' . $fileName), true);
+			if (json_last_error() === JSON_ERROR_NONE) {
+				$definitions = array_merge($definitions, $custom);
+			} else {
+				$this->logger->warning('Failed to parse ' . $fileName . ': ' . json_last_error_msg());
+			}
+		}
+	}
+
 	/**
 	 * Add the mimetype aliases if they are not yet present
 	 */
@@ -130,15 +141,7 @@ private function loadAliases() {
 		}
 
 		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
-
-		if (file_exists($this->customConfigDir . '/' . self::CUSTOM_MIMETYPEALIASES)) {
-			$custom = json_decode(file_get_contents($this->customConfigDir . '/' . self::CUSTOM_MIMETYPEALIASES), true);
-			if (json_last_error() === JSON_ERROR_NONE) {
-				$this->mimeTypeAlias = array_merge($this->mimeTypeAlias, $custom);
-			} else {
-				$this->logger->warning('Failed to parse ' . self::CUSTOM_MIMETYPEALIASES . ': ' . json_last_error_msg());
-			}
-		}
+		$this->loadCustomDefinitions(self::CUSTOM_MIMETYPEALIASES, $this->mimeTypeAlias);
 	}
 
 	/**
@@ -164,16 +167,7 @@ private function loadMappings() {
 		}
 
 		$mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypemapping.dist.json'), true);
-
-		//Check if need to load custom mappings
-		if (file_exists($this->customConfigDir . '/' . self::CUSTOM_MIMETYPEMAPPING)) {
-			$custom = json_decode(file_get_contents($this->customConfigDir . '/' . self::CUSTOM_MIMETYPEMAPPING), true);
-			if (json_last_error() === JSON_ERROR_NONE) {
-				$mimetypeMapping = array_merge($mimetypeMapping, $custom);
-			} else {
-				$this->logger->warning('Failed to parse ' . self::CUSTOM_MIMETYPEMAPPING . ': ' . json_last_error_msg());
-			}
-		}
+		$this->loadCustomDefinitions(self::CUSTOM_MIMETYPEMAPPING, $mimetypeMapping);
 
 		$this->registerTypeArray($mimetypeMapping);
 	}