Account for different MR package names; Fixes #12; Fixes #14

waicool20 · Jan 8, 2020 · 7286d8b · 7286d8b
1 parent b8c2f1b
commit 7286d8b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/main/kotlin/com/waicool20/mr2tachiyomi/MR2Tachiyomi.kt b/src/main/kotlin/com/waicool20/mr2tachiyomi/MR2Tachiyomi.kt
@@ -104,11 +104,12 @@ object MR2Tachiyomi {
         val buffer = ByteArray(512)
 
         ABUtils.ab2tar(input, tarFile)
+        val dbRegex = Regex("apps/com\\.notabasement\\.mangarock.+?/db/mangarock\\.db")
         Files.newInputStream(tarFile).use { inputStream ->
             while (inputStream.available() > 0) {
                 inputStream.read(buffer)
                 val name = buffer.sliceArray(TarHeaderOffsets.NAME_RANGE).toStringAndTrim()
-                if (name == "apps/com.notabasement.mangarock.android.lotus/db/mangarock.db") {
+                if (name.matches(dbRegex)) {
                     val size = buffer.sliceArray(TarHeaderOffsets.SIZE_RANGE).toStringAndTrim().toInt(8)
                     val blocks = if (size > 0) 1 + (size - 1) / 512 else 0
                     Files.newOutputStream(db).use { outputStream ->