From 98f91fd03d6601e30561593630ad824efd6ed40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mickae=CC=88l=20Menu?= Date: Wed, 14 Jun 2023 14:35:45 +0200 Subject: [PATCH 1/2] Fix regression parsing RWPM --- .../r2/streamer/parser/readium/ReadiumWebPubParser.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt b/readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt index e97725c407..61e8a4d8bd 100644 --- a/readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt +++ b/readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt @@ -29,7 +29,7 @@ class ReadiumWebPubParser( override suspend fun parse(asset: PublicationAsset, warnings: WarningLogger?): Publication.Builder? { val mediaType = asset.mediaType - if (!mediaType.isReadiumWebPublication) + if (!mediaType.isReadiumWebPubProfile) return null val manifestJson = @@ -68,7 +68,8 @@ class ReadiumWebPubParser( } /** Returns whether this media type is of a Readium Web Publication profile. */ -private val MediaType.isReadiumWebPublication: Boolean get() = matchesAny( - MediaType.READIUM_WEBPUB, MediaType.DIVINA, MediaType.LCP_PROTECTED_PDF, - MediaType.READIUM_AUDIOBOOK, MediaType.LCP_PROTECTED_AUDIOBOOK, -) +private val MediaType.isReadiumWebPubProfile: Boolean get() = matchesAny( + MediaType.READIUM_WEBPUB, MediaType.READIUM_WEBPUB_MANIFEST, + MediaType.READIUM_AUDIOBOOK, MediaType.READIUM_AUDIOBOOK_MANIFEST, MediaType.LCP_PROTECTED_AUDIOBOOK, + MediaType.DIVINA, MediaType.DIVINA_MANIFEST, MediaType.LCP_PROTECTED_PDF +) \ No newline at end of file From 9e9231f2467b6b8c1bcfaf749e7ed6abb3bb6678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mickae=CC=88l=20Menu?= Date: Wed, 14 Jun 2023 14:47:49 +0200 Subject: [PATCH 2/2] Lint --- .../readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt b/readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt index 61e8a4d8bd..c8f851d5f5 100644 --- a/readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt +++ b/readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt @@ -72,4 +72,4 @@ private val MediaType.isReadiumWebPubProfile: Boolean get() = matchesAny( MediaType.READIUM_WEBPUB, MediaType.READIUM_WEBPUB_MANIFEST, MediaType.READIUM_AUDIOBOOK, MediaType.READIUM_AUDIOBOOK_MANIFEST, MediaType.LCP_PROTECTED_AUDIOBOOK, MediaType.DIVINA, MediaType.DIVINA_MANIFEST, MediaType.LCP_PROTECTED_PDF -) \ No newline at end of file +)