Move archive related code to :core:archive

core/archive/.gitignore

@@ -0,0 +1 @@
+/build

core/archive/build.gradle.kts

@@ -0,0 +1,15 @@
+plugins {
+    id("mihon.library")
+    kotlin("android")
+    kotlin("plugin.serialization")
+}
+
+android {
+    namespace = "mihon.core.archive"
+}
+
+dependencies {
+    implementation(libs.jsoup)
+    implementation(libs.libarchive)
+    implementation(libs.unifile)
+}

core/archive/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />

core/archive/src/main/kotlin/mihon/core/archive/ArchiveEntry.kt

@@ -1,4 +1,4 @@
-package mihon.core.common.archive
+package mihon.core.archive
 
 class ArchiveEntry(
     val name: String,

core/archive/src/main/kotlin/mihon/core/archive/ArchiveInputStream.kt

@@ -1,4 +1,4 @@
-package mihon.core.common.archive
+package mihon.core.archive
 
 import me.zhanghai.android.libarchive.Archive
 import me.zhanghai.android.libarchive.ArchiveEntry
@@ -7,7 +7,7 @@ import java.io.InputStream
 import java.nio.ByteBuffer
 import kotlin.concurrent.Volatile
 
-class ArchiveInputStream(buffer: Long, size: Long) : InputStream() {
+internal class ArchiveInputStream(buffer: Long, size: Long) : InputStream() {
     private val lock = Any()
 
     @Volatile

core/archive/src/main/kotlin/mihon/core/archive/ArchiveReader.kt

@@ -1,21 +1,19 @@
-package mihon.core.common.archive
+package mihon.core.archive
 
-import android.content.Context
 import android.os.ParcelFileDescriptor
 import android.system.Os
 import android.system.OsConstants
-import com.hippo.unifile.UniFile
 import me.zhanghai.android.libarchive.ArchiveException
-import tachiyomi.core.common.storage.openFileDescriptor
 import java.io.Closeable
 import java.io.InputStream
 
 class ArchiveReader(pfd: ParcelFileDescriptor) : Closeable {
-    val size = pfd.statSize
-    val address = Os.mmap(0, size, OsConstants.PROT_READ, OsConstants.MAP_PRIVATE, pfd.fileDescriptor, 0)
+    private val size = pfd.statSize
+    private val address = Os.mmap(0, size, OsConstants.PROT_READ, OsConstants.MAP_PRIVATE, pfd.fileDescriptor, 0)
 
-    inline fun <T> useEntries(block: (Sequence<ArchiveEntry>) -> T): T =
-        ArchiveInputStream(address, size).use { block(generateSequence { it.getNextEntry() }) }
+    fun <T> useEntries(block: (Sequence<ArchiveEntry>) -> T): T = ArchiveInputStream(address, size).use {
+        block(generateSequence { it.getNextEntry() })
+    }
 
     fun getInputStream(entryName: String): InputStream? {
         val archive = ArchiveInputStream(address, size)
@@ -38,5 +36,3 @@ class ArchiveReader(pfd: ParcelFileDescriptor) : Closeable {
         Os.munmap(address, size)
     }
 }
-
-fun UniFile.archiveReader(context: Context) = openFileDescriptor(context, "r").use { ArchiveReader(it) }

core/archive/src/main/kotlin/mihon/core/archive/EpubReader.kt

@@ -1,6 +1,5 @@
-package eu.kanade.tachiyomi.util.storage
+package mihon.core.archive
 
-import mihon.core.common.archive.ArchiveReader
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import java.io.Closeable
@@ -8,9 +7,9 @@ import java.io.File
 import java.io.InputStream
 
 /**
- * Wrapper over ZipFile to load files in epub format.
+ * Wrapper over ArchiveReader to load files in epub format.
  */
-class EpubFile(private val reader: ArchiveReader) : Closeable by reader {
+class EpubReader(private val reader: ArchiveReader) : Closeable by reader {
 
     /**
      * Path separator used by this epub.

core/archive/src/main/kotlin/mihon/core/archive/UniFileExtensions.kt

@@ -0,0 +1,12 @@
+package mihon.core.archive
+
+import android.content.Context
+import android.os.ParcelFileDescriptor
+import com.hippo.unifile.UniFile
+
+internal fun UniFile.openFileDescriptor(context: Context, mode: String): ParcelFileDescriptor =
+    context.contentResolver.openFileDescriptor(uri, mode) ?: error("Failed to open file descriptor: ${filePath ?: uri.toString()}")
+
+fun UniFile.archiveReader(context: Context) = openFileDescriptor(context, "r").use { ArchiveReader(it) }
+
+fun UniFile.epubReader(context: Context) = EpubReader(archiveReader(context))

core/archive/src/main/kotlin/mihon/core/archive/ZipWriter.kt

@@ -1,4 +1,4 @@
-package mihon.core.common.archive
+package mihon.core.archive
 
 import android.content.Context
 import android.system.Os
@@ -7,7 +7,6 @@ import com.hippo.unifile.UniFile
 import me.zhanghai.android.libarchive.Archive
 import me.zhanghai.android.libarchive.ArchiveEntry
 import me.zhanghai.android.libarchive.ArchiveException
-import tachiyomi.core.common.storage.openFileDescriptor
 import java.io.Closeable
 import java.nio.ByteBuffer
 
@@ -65,10 +64,10 @@ private fun StructStat.toArchiveStat() = ArchiveEntry.StructStat().apply {
     stSize = st_size
     stBlksize = st_blksize
     stBlocks = st_blocks
-    stAtim = timespec(st_atime)
-    stMtim = timespec(st_mtime)
-    stCtim = timespec(st_ctime)
+    stAtim = st_atime.toTimespec()
+    stMtim = st_mtime.toTimespec()
+    stCtim = st_ctime.toTimespec()
     stIno = st_ino
 }
 
-private fun timespec(tvSec: Long) = ArchiveEntry.StructTimespec().also { it.tvSec = tvSec }
+private fun Long.toTimespec() = ArchiveEntry.StructTimespec().also { it.tvSec = this }

core/common/src/main/kotlin/tachiyomi/core/common/storage/UniFileExtensions.kt

@@ -1,7 +1,5 @@
 package tachiyomi.core.common.storage
 
-import android.content.Context
-import android.os.ParcelFileDescriptor
 import com.hippo.unifile.UniFile
 
 val UniFile.extension: String?
@@ -12,6 +10,3 @@ val UniFile.nameWithoutExtension: String?
 
 val UniFile.displayablePath: String
     get() = filePath ?: uri.toString()
-
-fun UniFile.openFileDescriptor(context: Context, mode: String): ParcelFileDescriptor =
-    context.contentResolver.openFileDescriptor(uri, mode) ?: error("Failed to open file descriptor: $displayablePath")