Add an Audiobook navigator based on MediaSession (#145)

Author: mickael-menu

readium/streamer/r2-streamer/src/main/java/org/readium/r2/streamer/container/PublicationContainer.kt

@@ -43,15 +43,8 @@ internal class PublicationContainer(
         }
     }
 
-    override fun dataInputStream(relativePath: String): InputStream = runBlocking {
-        publication.get(relativePath).stream()
-    }
+    override fun dataInputStream(relativePath: String): InputStream =
+        ResourceInputStream(publication.get(relativePath)).buffered()
 
     private fun Publication.get(href: String) = get(Link(href))
 }
-
-
-/**
- * Creates an [InputStream] to read the content.
- */
-fun Resource.stream(): InputStream = ResourceInputStream(resource = this)

readium/streamer/r2-streamer/src/main/java/org/readium/r2/streamer/server/handler/PublicationResourceHandler.kt

@@ -117,7 +117,8 @@ class PublicationResourceHandler : RouterNanoHTTPD.DefaultHandler() {
                     }
 
             } else {
-                createResponse(Status.PARTIAL_CONTENT, mimeType, ResourceInputStream(resource, startFrom..endAt), dataLength)
+                val responseStream = ResourceInputStream(resource, range = startFrom..endAt)
+                createResponse(Status.PARTIAL_CONTENT, mimeType, responseStream, dataLength)
                     .apply {
                         addHeader("Content-Range", "bytes $startFrom-$endAt/$dataLength")
                         addHeader("ETag", etag)
@@ -165,10 +166,10 @@ class PublicationResourceHandler : RouterNanoHTTPD.DefaultHandler() {
     }
 
     private fun responseFromFailure(error: Resource.Exception): Response {
-        val status = when(error) {
+        val status = when (error) {
             is Resource.Exception.NotFound -> Status.NOT_FOUND
             is Resource.Exception.Forbidden -> Status.FORBIDDEN
-            is Resource.Exception.Unavailable -> Status.SERVICE_UNAVAILABLE
+            is Resource.Exception.Unavailable, is Resource.Exception.Offline -> Status.SERVICE_UNAVAILABLE
             is Resource.Exception.BadRequest -> Status.BAD_REQUEST
             is Resource.Exception.Cancelled, is Resource.Exception.OutOfMemory, is Resource.Exception.Other -> Status.INTERNAL_ERROR
         }