From dec2ed795944d8101965a02a4dff535b9577d720 Mon Sep 17 00:00:00 2001 From: Rishvaish <68911202+rishabpuranika@users.noreply.github.com> Date: Wed, 23 Apr 2025 14:58:42 +0530 Subject: [PATCH] hope for the best * Update README.md * To install multiple mangas users can enter the value required to install as there is an EditText field instead of the Text View * Issues 1)Installation of many mangas at same time now made to one to increase the installation efficiency 2)Installation order from the latest progresses chapter to the limit index 3)Tried to resolve the app crash bug * Issues 1)Installation of many mangas at same time now made to one to increase the installation efficiency 2)Installation order from the latest progresses chapter to the limit index 3)Tried to resolve the app crash bug --------- Co-authored-by: rebel onion <87634197+rebelonion@users.noreply.github.com> --- .../ani/dantotsu/media/manga/MangaCache.kt | 13 ++++- .../dantotsu/media/manga/MangaReadFragment.kt | 47 ++++++++++++------- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaCache.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaCache.kt index 359c64a5..f47f416f 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/MangaCache.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/MangaCache.kt @@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File +import java.io.FileNotFoundException import java.io.FileOutputStream data class ImageData( @@ -76,7 +77,7 @@ fun saveImage( uri?.let { contentResolver.openOutputStream(it)?.use { os -> bitmap.compress(format, quality, os) - } + } ?: throw FileNotFoundException("Failed to open output stream for URI: $uri") } } else { val directory = @@ -86,12 +87,20 @@ fun saveImage( } val file = File(directory, filename) + + // Check if the file already exists + if (file.exists()) { + println("File already exists: ${file.absolutePath}") + return + } + FileOutputStream(file).use { outputStream -> bitmap.compress(format, quality, outputStream) } } + } catch (e: FileNotFoundException) { + println("File not found: ${e.message}") } catch (e: Exception) { - // Handle exception here println("Exception while saving image: ${e.message}") } } diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt index 63ef7408..2ad28a75 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt @@ -66,6 +66,7 @@ import eu.kanade.tachiyomi.extension.manga.model.MangaExtension import eu.kanade.tachiyomi.source.ConfigurableSource import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import uy.kohesive.injekt.Injekt @@ -232,25 +233,35 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener { } fun multiDownload(n: Int) { - // Get last viewed chapter - val selected = media.userProgress - val chapters = media.manga?.chapters?.values?.toList() - // Filter by selected language - val progressChapterIndex = (chapters?.indexOfFirst { - MediaNameAdapter.findChapterNumber(it.number)?.toInt() == selected - } ?: 0) + 1 - - if (progressChapterIndex < 0 || n < 1 || chapters == null) return - - // Calculate the end index - val endIndex = minOf(progressChapterIndex + n, chapters.size) - - // Make sure there are enough chapters - val chaptersToDownload = chapters.subList(progressChapterIndex, endIndex) - - - for (chapter in chaptersToDownload) { + lifecycleScope.launch { + // Get the last viewed chapter + val selected = media.userProgress ?: 0 + val chapters = media.manga?.chapters?.values?.toList() + // Ensure chapters are available in the extensions + if (chapters.isNullOrEmpty() || n < 1) return@launch + // Find the index of the last viewed chapter + val progressChapterIndex = (chapters.indexOfFirst { + MediaNameAdapter.findChapterNumber(it.number)?.toInt() == selected + } + 1).coerceAtLeast(0) + // Calculate the end value for the range of chapters to download + val endIndex = (progressChapterIndex + n).coerceAtMost(chapters.size) + // Get the list of chapters to download + val chaptersToDownload = chapters.subList(progressChapterIndex, endIndex) + // Trigger the download for each chapter sequentially + for (chapter in chaptersToDownload) { + try { + downloadChapterSequentially(chapter) + } catch (e: Exception) { + Toast.makeText(requireContext(), "Failed to download chapter: ${chapter.title}", Toast.LENGTH_SHORT).show() + } + } + Toast.makeText(requireContext(), "All downloads completed!", Toast.LENGTH_SHORT).show() + } + } + private suspend fun downloadChapterSequentially(chapter: MangaChapter) { + withContext(Dispatchers.IO) { onMangaChapterDownloadClick(chapter) + delay(2000) // A 2-second download } }