Merge pull request #82 from readium/fixes/relative-path-encoding

changed encoding to replacement
readium · Sep 9, 2019 · eb66e7b · eb66e7b
2 parents 62a8c1f + a93008a
commit eb66e7b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/r2-streamer/src/main/java/org/readium/r2/streamer/container/DirectoryContainer.kt b/r2-streamer/src/main/java/org/readium/r2/streamer/container/DirectoryContainer.kt
@@ -13,14 +13,12 @@ import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream
 import java.net.URI
-import java.net.URLEncoder
 
 interface DirectoryContainer : Container {
 
     override fun data(relativePath: String): ByteArray {
 
-        val encodedPath = URLEncoder.encode(relativePath, "UTF-8");
-        val decodedFilePath = rootFile.rootPath + "/" + getDecodedRelativePath(encodedPath)
+        val decodedFilePath = rootFile.rootPath + "/" + getDecodedRelativePath(relativePath)
         val file = File(decodedFilePath)
 
         if (!file.exists())
@@ -45,7 +43,9 @@ interface DirectoryContainer : Container {
             FileInputStream(File(rootFile.toString() + "/" + getDecodedRelativePath(relativePath)))
 
     fun getDecodedRelativePath(relativePath: String): String {
-        return URI(relativePath).path
+        //        val encodedPath = URLEncoder.encode(relativePath, "UTF-8");
+        val replacedPath = relativePath.replace(" ", "%20")
+        return URI(replacedPath).path
     }
 }