Merge branch 'master' into devel

2022-09-14 12:47:29 +03:00
parent 6e844e8c3b 46f0d3ef74
commit f35f40ed27
20 changed files with 62 additions and 57 deletions
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
@@ -62,7 +62,7 @@ class CbzMangaOutput(
 		index.addChapter(chapter)
 	}

-	suspend fun finalize() {
+	suspend fun finish() {
 		runInterruptible(Dispatchers.IO) {
 			output.put(ENTRY_NAME_INDEX, index.toString())
 			output.finish()
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/importer/DirMangaImporter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/importer/DirMangaImporter.kt
@@ -43,7 +43,7 @@ class DirMangaImporter(
 				)
 				it.sortChaptersByName()
 				it.mergeWithExisting()
-				it.finalize()
+				it.finish()
 				it.file
 			}
 			return localMangaRepository.getFromFile(dest)