Merge pull request #88 from readium/develop

1.1.5

Author: aferditamuriqi

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @aferditamuriqi

build.gradle

@@ -1,15 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
-    ext.r2branch = 'develop'
+    ext.kotlin_version = '1.3.61'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

r2-streamer/build.gradle

@@ -14,37 +14,23 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.readium'
 
 android {
-    flavorDimensions "testapp"
 
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    productFlavors {
-        intTestapp {
-            dimension "testapp"
-        }
-        intTestappWithLcp {
-            dimension "testapp"
-        }
-        devTestapp {
-            dimension "testapp"
-        }
-        devTestappWithLcp {
-            dimension "testapp"
-        }
-    }
-
-    // default build flavour
-    defaultPublishConfig "intTestappDebug"
 }
 
 dependencies {
@@ -54,7 +40,7 @@ dependencies {
     if (findProject(':r2-shared')) {
         implementation project(':r2-shared')
     } else {
-        implementation "com.github.readium:r2-shared-kotlin:1.0.10"
+        implementation "com.github.readium:r2-shared-kotlin:1.1.6"
     }
 
     //TODO conflicting support libraries, excluding these
@@ -65,20 +51,27 @@ dependencies {
     implementation('com.mcxiaoke.koi:async:0.5.5') {
         exclude module: 'support-v4'
     }
-    implementation "androidx.appcompat:appcompat:1.1.0-beta01"
-    implementation 'org.nanohttpd:nanohttpd:2.3.2-SNAPSHOT'
-    implementation 'org.nanohttpd:nanohttpd-nanolets:2.3.2-SNAPSHOT'
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation "androidx.appcompat:appcompat:1.2.0-alpha01"
+
+    implementation ('com.github.edrlab.nanohttpd:nanohttpd:2.3.2') {
+        exclude group: 'org.parboiled'
+    }
+    implementation ('com.github.edrlab.nanohttpd:nanohttpd-nanolets:2.3.2') {
+        exclude group: 'org.parboiled'
+    }
+
+    implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'commons-io:commons-io:2.4'
-    implementation 'org.zeroturnaround:zt-zip:1.12'
+    implementation 'org.zeroturnaround:zt-zip:1.13'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'nl.komponents.kovenant:kovenant:3.3.0'
 
     final JACKSON_VERSION = '2.8.6'
     implementation "com.fasterxml.jackson.core:jackson-core:$JACKSON_VERSION"
     implementation "com.fasterxml.jackson.core:jackson-annotations:$JACKSON_VERSION"
     implementation "com.fasterxml.jackson.core:jackson-databind:$JACKSON_VERSION"
-    implementation 'org.jsoup:jsoup:1.11.2'
+    //noinspection GradleDependency
+    implementation 'org.jsoup:jsoup:1.10.3'
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'

r2-streamer/r2-streamer.iml

@@ -9,6 +9,8 @@
 
 package org.readium.r2.streamer.container
 
+import org.readium.r2.shared.RootFile
+import org.readium.r2.shared.drm.DRM
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 import java.net.URI
@@ -23,13 +25,15 @@ import java.util.zip.ZipFile
  *
  */
 
-interface ZipArchiveContainer : Container {
-    var zipFile: ZipFile
 
-    override fun data(relativePath: String): ByteArray {
+open class ArchiveContainer(path: String, mimetype: String) : Container {
+    override var rootFile: RootFile = RootFile(rootPath = path, mimetype = mimetype)
+    override var drm: DRM? = null
+    val archive: ZipFile = ZipFile(path)
 
+    override fun data(relativePath: String): ByteArray {
         val zipEntry = getEntry(relativePath)// ?: return ByteArray(0)
-        val inputStream = zipFile.getInputStream(zipEntry)
+        val inputStream = archive.getInputStream(zipEntry)
         val outputStream = ByteArrayOutputStream()
         var readLength = 0
         val buffer = ByteArray(16384)
@@ -39,29 +43,30 @@ interface ZipArchiveContainer : Container {
 
         inputStream.close()
         return outputStream.toByteArray()
+
     }
 
     override fun dataLength(relativePath: String): Long {
-        return zipFile.size().toLong()
+        return archive.size().toLong()
     }
 
     override fun dataInputStream(relativePath: String): InputStream {
-        return zipFile.getInputStream(getEntry(relativePath))
+        return archive.getInputStream(getEntry(relativePath))
     }
-
-    fun getEntry(relativePath: String): ZipEntry? {
+    
+    private fun getEntry(relativePath: String): ZipEntry? {
 
         val path: String = try {
             URI(relativePath).path
         } catch (e: Exception) {
             relativePath
         }
 
-        var zipEntry = zipFile.getEntry(path)
+        var zipEntry = archive.getEntry(path)
         if (zipEntry != null)
             return zipEntry
 
-        val zipEntries = zipFile.entries()
+        val zipEntries = archive.entries()
         while (zipEntries.hasMoreElements()) {
             zipEntry = zipEntries.nextElement()
             if (path.equals(zipEntry.name, true))

r2-streamer/src/androidTest/AndroidManifest.xml

@@ -9,63 +9,39 @@
 
 package org.readium.r2.streamer.container
 
-import org.readium.r2.shared.Link
 import org.readium.r2.shared.RootFile
 import org.readium.r2.shared.drm.DRM
-import org.readium.r2.shared.parser.xml.XmlParser
 import java.io.InputStream
 
 /**
  * Container of a publication
  *
- * @var rootfile : a RootFile class containing the path the publication, the version
+ * @var rootFile : a RootFile class containing the path the publication, the version
  *                 and the mime type of it
  *
  * @var drm : contain the brand, scheme, profile and license of DRM if it exist
- *
- * @var successCreated : used to checked if the Container contains a publication
- *
+ **
  * @func data : return the ByteArray content of a file from the publication
  *
  * @func dataLength : return the length of content
  *
  * @func dataInputStream : return the InputStream of content
  */
-interface Container {
 
+interface Container {
     var rootFile: RootFile
-
     var drm: DRM?
-
-    var successCreated: Boolean
-
     fun data(relativePath: String): ByteArray
-
     fun dataLength(relativePath: String): Long
-
     fun dataInputStream(relativePath: String): InputStream
 }
 
-/**
- *  EpubContainer
- *
- *  @func xmlDocumentForFile : return the XmlParser of a file
- *
- *  @func xmlDocumentForResource : return the XmlParser of a link
- */
-interface EpubContainer : Container {
-
-    fun xmlDocumentForFile(relativePath: String): XmlParser
-    fun xmlDocumentForResource(link: Link?): XmlParser
-    fun xmlAsByteArray(link: Link?): ByteArray
-    fun scanForDrm(): DRM?
+sealed class ContainerError : Exception() {
+    object streamInitFailed : ContainerError()
+    object fileNotFound : ContainerError()
+    object fileError : ContainerError()
+    data class missingFile(val path: String) : ContainerError()
+    data class xmlParse(val underlyingError: Error) : ContainerError()
+    data class missingLink(val title: String?) : ContainerError()
 }
 
-/**
- * CbzContainer
- *
- * @func getFilesList : return the list of every files in a CBZ
- */
-interface CbzContainer : Container {
-    fun getFilesList(): List<String>
-}