From aed5dfaff6c24544cd2e97f8c23ab47bac0c181c Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Fri, 27 Mar 2020 21:48:02 +0100 Subject: [PATCH] Fix mimetype extractors --- .../main/scala/docspell/convert/Conversion.scala | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/convert/src/main/scala/docspell/convert/Conversion.scala b/modules/convert/src/main/scala/docspell/convert/Conversion.scala index 66029e35..85e30c78 100644 --- a/modules/convert/src/main/scala/docspell/convert/Conversion.scala +++ b/modules/convert/src/main/scala/docspell/convert/Conversion.scala @@ -99,7 +99,7 @@ object Conversion { val all = Set(MimeType.jpeg, MimeType.png, MimeType.tiff) def unapply(m: MimeType): Option[MimeType] = - Some(m).filter(all.contains) + Some(m).map(_.baseType).filter(all.contains) } object Texts { @@ -148,15 +148,14 @@ object Conversion { ) def unapply(m: MimeType): Option[MimeType] = - Some(m).filter(all.contains) + Some(m).map(_.baseType).filter(all.contains) } def unapply(mt: MimeType): Option[MimeType] = mt match { - case Office(_) => Some(mt) - case Texts(_) => Some(mt) - case Images(_) => Some(mt) - case MimeType.html => Some(mt) - case _ => None + case Office(_) => Some(mt) + case Texts(_) => Some(mt) + case Images(_) => Some(mt) + case _ => None } }