rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ok an actual fix this time

Browse source
This commit is contained in:
Finnley Somdahl 2024-01-13 00:24:14 -06:00
parent 310f068e79
commit ad1979505e
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt
View file

@ -41,6 +41,8 @@ import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Semaphore
import kotlinx.coroutines.sync.withPermit
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import okhttp3.Request import okhttp3.Request
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
@ -315,7 +317,6 @@ class DynamicMangaParser(extension: MangaExtension.Installed) : MangaParser() {
} }
return ret return ret
} }
suspend fun imageList(chapterLink: String, sChapter: SChapter): List<ImageData> { suspend fun imageList(chapterLink: String, sChapter: SChapter): List<ImageData> {
val source = try { val source = try {
extension.sources[sourceLanguage] extension.sources[sourceLanguage]
@ -323,29 +324,29 @@ class DynamicMangaParser(extension: MangaExtension.Installed) : MangaParser() {
sourceLanguage = 0 sourceLanguage = 0
extension.sources[sourceLanguage] extension.sources[sourceLanguage]
} as? HttpSource ?: return emptyList() } as? HttpSource ?: return emptyList()
var imageDataList: List<ImageData> = listOf()
coroutineScope { return coroutineScope {
try { try {
println("source.name " + source.name) println("source.name " + source.name)
val res = source.getPageList(sChapter) val res = source.getPageList(sChapter)
val reIndexedPages = val reIndexedPages = res.mapIndexed { index, page -> Page(index, page.url, page.imageUrl, page.uri) }
res.mapIndexed { index, page -> Page(index, page.url, page.imageUrl, page.uri) }
val semaphore = Semaphore(5)
val deferreds = reIndexedPages.map { page -> val deferreds = reIndexedPages.map { page ->
async(Dispatchers.IO) { async(Dispatchers.IO) {
imageDataList += ImageData(page, source) semaphore.withPermit {
ImageData(page, source)
}
} }
} }
deferreds.awaitAll() deferreds.awaitAll()
} catch (e: Exception) { } catch (e: Exception) {
logger("loadImages Exception: $e") logger("loadImages Exception: $e")
snackString("Failed to load images: $e") snackString("Failed to load images: $e")
emptyList() emptyList()
} }
} }
return imageDataList
} }
suspend fun fetchAndProcessImage( suspend fun fetchAndProcessImage(