Skip to content

Fix regression parsing RWPM #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2023
Merged

Fix regression parsing RWPM #357

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98f91fd
Fix regression parsing RWPM
mickael-menu Jun 14, 2023
9e9231f
Lint
mickael-menu Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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
)