Detect chapters in cbz if index missing

app/build.gradle

@@ -64,11 +64,11 @@ dependencies {
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6'
 
 	implementation 'androidx.core:core-ktx:1.3.0-rc01'
-	implementation 'androidx.appcompat:appcompat:1.2.0-beta01'
+	implementation 'androidx.appcompat:appcompat:1.2.0-rc01'
 	implementation 'androidx.activity:activity-ktx:1.2.0-alpha04'
 	implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha04'
 	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha02'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta5'
+	implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
 	implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha03'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
@@ -86,7 +86,7 @@ dependencies {
 	implementation 'com.github.moxy-community:moxy-ktx:2.1.2'
 	kapt 'com.github.moxy-community:moxy-compiler:2.1.2'
 
-	implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+	implementation 'com.squareup.okhttp3:okhttp:4.7.2'
 	implementation 'com.squareup.okio:okio:2.6.0'
 	implementation 'org.jsoup:jsoup:1.13.1'
 

app/src/main/java/org/koitharu/kotatsu/core/parser/LocalMangaRepository.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.parser
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import androidx.core.net.toFile
@@ -41,21 +42,31 @@ class LocalMangaRepository : MangaRepository, KoinComponent {
 
 	@Suppress("BlockingMethodInNonBlockingContext")
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val file = Uri.parse(chapter.url).toFile()
+		val uri = Uri.parse(chapter.url)
+		val file = uri.toFile()
 		val zip = ZipFile(file)
-		val pattern = zip.getEntry(MangaZip.INDEX_ENTRY)?.let(zip::readText)?.let(::MangaIndex)
+		val index = zip.getEntry(MangaZip.INDEX_ENTRY)?.let(zip::readText)?.let(::MangaIndex)
-			?.getChapterNamesPattern(chapter)
+		var entries = zip.entries().asSequence()
-		val entries = if (pattern != null) {
+		entries = if (index != null) {
-			zip.entries().asSequence()
+			val pattern = index.getChapterNamesPattern(chapter)
-				.filter { x -> !x.isDirectory && x.name.substringBefore('.').matches(pattern) }
+			entries.filter { x -> !x.isDirectory && x.name.substringBefore('.').matches(pattern) }
 		} else {
-			zip.entries().asSequence().filter { x -> !x.isDirectory }
+			val parent = uri.fragment.orEmpty()
-		}.toList().sortedWith(compareBy(AlphanumComparator()) { x -> x.name })
+			entries.filter { x ->
-		return entries.map { x ->
+				!x.isDirectory && x.name.substringBeforeLast(
-			val uri = zipUri(file, x.name)
+					File.separatorChar,
+					""
+				) == parent
+			}
+		}
+		return entries
+			.toList()
+			.sortedWith(compareBy(AlphanumComparator()) { x -> x.name })
+			.map { x ->
+				val entryUri = zipUri(file, x.name)
 				MangaPage(
-				id = uri.longHashCode(),
+					id = entryUri.longHashCode(),
-				url = uri,
+					url = entryUri,
 					source = MangaSource.LOCAL
 				)
 			}
@@ -67,43 +78,50 @@ class LocalMangaRepository : MangaRepository, KoinComponent {
 		return file.delete()
 	}
 
+	@SuppressLint("DefaultLocale")
 	fun getFromFile(file: File): Manga {
 		val zip = ZipFile(file)
 		val fileUri = file.toUri().toString()
 		val entry = zip.getEntry(MangaZip.INDEX_ENTRY)
 		val index = entry?.let(zip::readText)?.let(::MangaIndex)
-		return index?.let {
+		val info = index?.getMangaInfo()
-			it.getMangaInfo()?.let { x ->
+		if (index != null && info != null) {
-				x.copy(
+			return info.copy(
 				source = MangaSource.LOCAL,
 				url = fileUri,
 				coverUrl = zipUri(
 					file,
-						entryName = it.getCoverEntry()
+					entryName = index.getCoverEntry()
 						?: findFirstEntry(zip.entries())?.name.orEmpty()
 				),
-					chapters = x.chapters?.map { c -> c.copy(url = fileUri) }
+				chapters = info.chapters?.map { c -> c.copy(url = fileUri) }
 			)
 		}
-		} ?: run {
+		// fallback
 		val title = file.nameWithoutExtension.replace("_", " ").capitalize()
-			Manga(
+		val chapters = HashSet<String>()
+		for (x in zip.entries()) {
+			if (!x.isDirectory) {
+				chapters += x.name.substringBeforeLast(File.separatorChar, "")
+			}
+		}
+		val uriBuilder = file.toUri().buildUpon()
+		return Manga(
 			id = file.absolutePath.longHashCode(),
 			title = title,
 			url = fileUri,
 			source = MangaSource.LOCAL,
 			coverUrl = zipUri(file, findFirstEntry(zip.entries())?.name.orEmpty()),
-				chapters = listOf(
+			chapters = chapters.sortedWith(AlphanumComparator()).mapIndexed { i, s ->
 				MangaChapter(
-						id = file.absolutePath.longHashCode(),
+					id = "$i$s".longHashCode(),
-						url = fileUri,
+					name = if (s.isEmpty()) title else s,
-						number = 1,
+					number = i + 1,
 					source = MangaSource.LOCAL,
-						name = title
+					url = uriBuilder.fragment(s).build().toString()
-					)
-				)
 				)
 			}
+		)
 	}
 
 	fun getRemoteManga(localManga: Manga): Manga? {