From 79f8fa7f71ea3c5d978af475bcb5e59f5871edf1 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Sun, 15 Nov 2020 10:56:00 +0900 Subject: [PATCH] restored metadata-extractor tiff detection false positive workaround --- .../deckers/thibault/aves/channel/calls/MetadataHandler.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt index 21e275e5e..446649bdb 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt @@ -222,11 +222,14 @@ class MetadataHandler(private val context: Context) : MethodCallHandler { // * file extension is unreliable // In the end, `metadata-extractor` is the most reliable, except for `tiff` (false positives, false negatives), // in which case we trust the file extension + // cf https://github.com/drewnoakes/metadata-extractor/issues/296 if (path?.matches(tiffExtensionPattern) == true) { metadataMap[KEY_MIME_TYPE] = MimeTypes.TIFF } else { dir.getSafeString(FileTypeDirectory.TAG_DETECTED_FILE_MIME_TYPE) { - metadataMap[KEY_MIME_TYPE] = it + if (it != MimeTypes.TIFF) { + metadataMap[KEY_MIME_TYPE] = it + } } } }