prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Koitharu
2024-11-02 14:53:12 +02:00
parent 6e20cee972
commit e4fda86bf1
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
View File

@@ -9,8 +9,8 @@ import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
import org.koitharu.kotatsu.core.zip.ZipOutput import org.koitharu.kotatsu.core.zip.ZipOutput
import java.io.File import java.io.File
import java.text.ParseException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.time.format.DateTimeParseException
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale
import java.util.zip.Deflater import java.util.zip.Deflater
@@ -46,7 +46,7 @@ class BackupZipOutput(val file: File) : Closeable {
fun parseBackupDateTime(fileName: String): Date? = try { fun parseBackupDateTime(fileName: String): Date? = try {
dateTimeFormat.parse(fileName.substringAfterLast('_').substringBefore('.')) dateTimeFormat.parse(fileName.substringAfterLast('_').substringBefore('.'))
} catch (e: DateTimeParseException) { } catch (e: ParseException) {
e.printStackTraceDebug() e.printStackTraceDebug()
null null
} }

10
app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/chapters/ChaptersSelectionCallback.kt
View File

@@ -62,10 +62,12 @@ class ChaptersSelectionCallback(
R.id.action_save -> { R.id.action_save -> {
val snapshot = controller.snapshot() val snapshot = controller.snapshot()
mode?.finish() mode?.finish()
commonAlertDialogs.askForDownloadOverMeteredNetwork( if (snapshot.isNotEmpty()) {
context = recyclerView.context, commonAlertDialogs.askForDownloadOverMeteredNetwork(
onConfirmed = { viewModel.download(snapshot, it) }, context = recyclerView.context,
) onConfirmed = { viewModel.download(snapshot, it) },
)
}
true true
} }

3
app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt
View File

@@ -25,7 +25,6 @@ import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.model.formatNumber import org.koitharu.kotatsu.core.model.formatNumber
import org.koitharu.kotatsu.core.parser.MangaDataRepository import org.koitharu.kotatsu.core.parser.MangaDataRepository
import org.koitharu.kotatsu.core.parser.MangaRepository import org.koitharu.kotatsu.core.parser.MangaRepository
import org.koitharu.kotatsu.core.parser.ParserMangaRepository
import org.koitharu.kotatsu.core.ui.BaseViewModel import org.koitharu.kotatsu.core.ui.BaseViewModel
import org.koitharu.kotatsu.core.ui.model.DateTimeAgo import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
import org.koitharu.kotatsu.core.ui.util.ReversibleAction import org.koitharu.kotatsu.core.ui.util.ReversibleAction
@@ -327,6 +326,6 @@ class DownloadsViewModel @Inject constructor(
}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null) }.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
private suspend fun tryLoad(manga: Manga) = runCatchingCancellable { private suspend fun tryLoad(manga: Manga) = runCatchingCancellable {
(mangaRepositoryFactory.create(manga.source) as ParserMangaRepository).getDetails(manga) mangaRepositoryFactory.create(manga.source).getDetails(manga)
}.getOrNull() }.getOrNull()
} }