From bc75156232e6211bb04817c4abf06f6d1f5a7c74 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sun, 2 Jun 2024 22:43:22 +0800 Subject: [PATCH] Simplify `ReadableTime.getFilenamableTime` --- app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt | 2 +- .../kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt | 3 +-- .../kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt | 6 +++--- app/src/main/kotlin/com/hippo/ehviewer/util/Crash.kt | 2 +- app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt | 3 ++- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt index ccee8954c..33f4ed4f4 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/EhEngine.kt @@ -86,7 +86,7 @@ private const val REQUEST_INTERVAL = 5000L fun Either.saveParseError(e: Throwable) { val dir = AppConfig.externalParseErrorDir ?: return - val file = File(dir, ReadableTime.getFilenamableTime(System.currentTimeMillis()) + ".txt") + val file = File(dir, ReadableTime.getFilenamableTime() + ".txt") file.sink().buffer().use { sink -> with(sink) { writeUtf8(e.message + "\n") diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt index 8dad8d604..b4ae03cfa 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt @@ -51,7 +51,6 @@ import eu.kanade.tachiyomi.util.lang.withUIContext import java.io.File import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.datetime.Clock import moe.tarsin.coroutines.runSuspendCatching private const val REPO_URL = "https://github.com/${BuildConfig.REPO_NAME}" @@ -154,7 +153,7 @@ suspend fun DialogState.showNewVersion(context: Context, release: Release) { } } if (Settings.backupBeforeUpdate) { - val time = ReadableTime.getFilenamableTime(Clock.System.now().toEpochMilliseconds()) + val time = ReadableTime.getFilenamableTime() downloadLocation.createFile("$time.db")?.let { EhDB.exportDB(context, it) } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt index a0a0247c5..b4a8005a1 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt @@ -108,7 +108,7 @@ fun AdvancedScreen(navigator: DestinationsNavigator) { title = stringResource(id = R.string.settings_advanced_dump_logcat), summary = stringResource(id = R.string.settings_advanced_dump_logcat_summary), contract = ActivityResultContracts.CreateDocument("application/zip"), - key = "log-" + ReadableTime.getFilenamableTime(System.currentTimeMillis()) + ".zip", + key = "log-" + ReadableTime.getFilenamableTime() + ".zip", ) { uri -> uri?.run { context.runCatching { @@ -124,7 +124,7 @@ fun AdvancedScreen(navigator: DestinationsNavigator) { zipOs.putNextEntry(entry) file.inputStream().use { it.copyTo(zipOs) } } - val logcatEntry = ZipEntry("logcat-" + ReadableTime.getFilenamableTime(System.currentTimeMillis()) + ".txt") + val logcatEntry = ZipEntry("logcat-" + ReadableTime.getFilenamableTime() + ".txt") zipOs.putNextEntry(logcatEntry) Crash.collectInfo(zipOs.writer()) Runtime.getRuntime().exec("logcat -d").inputStream.use { it.copyTo(zipOs) } @@ -180,7 +180,7 @@ fun AdvancedScreen(navigator: DestinationsNavigator) { } } val exportFailed = stringResource(id = R.string.settings_advanced_export_data_failed) - val now = ReadableTime.getFilenamableTime(System.currentTimeMillis()) + val now = ReadableTime.getFilenamableTime() LauncherPreference( title = stringResource(id = R.string.settings_advanced_export_data), summary = stringResource(id = R.string.settings_advanced_export_data_summary), diff --git a/app/src/main/kotlin/com/hippo/ehviewer/util/Crash.kt b/app/src/main/kotlin/com/hippo/ehviewer/util/Crash.kt index 55e146162..f503ca346 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/util/Crash.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/util/Crash.kt @@ -62,7 +62,7 @@ object Crash { fun saveCrashLog(t: Throwable) { val dir = AppConfig.externalCrashDir ?: return - val nowString = ReadableTime.getFilenamableTime(System.currentTimeMillis()) + val nowString = ReadableTime.getFilenamableTime() val fileName = "crash-$nowString.log" val file = File(dir, fileName) runCatching { diff --git a/app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt b/app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt index b09a1aa7a..6e5b98550 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/util/ReadableTime.kt @@ -18,6 +18,7 @@ package com.hippo.ehviewer.util import com.hippo.ehviewer.R import java.util.Locale import kotlinx.datetime.Clock +import kotlinx.datetime.Instant import kotlinx.datetime.LocalDate import kotlinx.datetime.LocalDateTime import kotlinx.datetime.TimeZone @@ -157,6 +158,6 @@ object ReadableTime { } } - fun getFilenamableTime(time: Long): String = + fun getFilenamableTime(time: Instant = Clock.System.now()): String = FILENAMABLE_DATE_FORMAT.format(time.toLocalDateTime(TimeZone.currentSystemDefault())) }