From 15ca197c4ed560af6d1561e43dafe6465d3c638e Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Thu, 10 Oct 2024 09:32:47 +0700 Subject: [PATCH] chore: Don't use generic log message --- .../eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt | 2 +- .../main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt | 2 +- .../eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt | 4 ++-- .../kanade/tachiyomi/data/track/DelayedTrackingUpdateJob.kt | 2 +- .../java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt | 4 ++-- .../java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt | 2 +- .../main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt | 2 +- .../kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt | 2 +- .../eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt | 2 +- .../java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt | 2 +- .../kanade/tachiyomi/extension/util/ExtensionInstaller.kt | 2 +- app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt | 4 ++-- .../ui/migration/manga/process/MigrationListController.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt | 4 ++-- .../tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt | 2 +- .../ui/setting/controllers/SettingsAdvancedController.kt | 2 +- .../tachiyomi/ui/source/browse/BrowseSourcePresenter.kt | 6 +++--- .../eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt | 2 +- .../eu/kanade/tachiyomi/util/system/ContextExtensions.kt | 2 +- .../main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt | 2 +- .../presentation/settings/screen/SettingsDataScreen.kt | 2 +- .../kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt index 5e2ea126e9..ecdc171454 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt @@ -107,7 +107,7 @@ class BackupCreator( return fileUri.toString() } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { if (file == null) "Unable to retrieve backup destination" else "Invalid backup destination" } file?.delete() throw e } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt index 286ed77e21..4aff7b1fd0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.kt @@ -145,7 +145,7 @@ class CoverCache(val context: Context) { } } } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to delete unused cover cache" } } lastClean = System.currentTimeMillis() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt index 9115ecec58..05d6f03079 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -190,7 +190,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet finishUpdates(true) Result.success() } else { - Logger.e(e) + Logger.e(e) { "Failed to update library" } Result.failure() } } finally { @@ -231,7 +231,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet try { requestSemaphore.withPermit { updateMangaInSource(source) } } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to update manga" } false } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/DelayedTrackingUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/DelayedTrackingUpdateJob.kt index 8649d0499d..5c788b9d2c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/DelayedTrackingUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/DelayedTrackingUpdateJob.kt @@ -52,7 +52,7 @@ class DelayedTrackingUpdateJob(context: Context, workerParams: WorkerParameters) service.update(track, true) db.insertTrack(track).executeAsBlocking() } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to update tracker [tracker id ${track.sync_id}]" } } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt index 612e86538a..423a8438c1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt @@ -227,7 +227,7 @@ class Anilist(private val context: Context, id: Long) : TrackService(id) { scorePreference.set(scoreType) true to null } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Failed to update scoring" } false to e } } @@ -246,7 +246,7 @@ class Anilist(private val context: Context, id: Long) : TrackService(id) { return try { json.decodeFromString(trackPreferences.trackToken(this).get()) } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to load token" } null } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt index 924377dcf3..ff89694027 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt @@ -125,7 +125,7 @@ class Bangumi(private val context: Context, id: Long) : TrackService(id) { saveCredentials(oauth.userId.toString(), oauth.accessToken) return true } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to login" } logout() } return false diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt index 3c282d8c8d..c32c98981e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt @@ -142,7 +142,7 @@ class Kitsu(private val context: Context, id: Long) : TrackService(id) { saveCredentials(username, userId) true } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to login" } false } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt index 13daa72e0e..88d3bafa3a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt @@ -133,7 +133,7 @@ class MyAnimeList(private val context: Context, id: Long) : TrackService(id) { saveCredentials(username, oauth.accessToken) true } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to login" } logout() false } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt index 71d7720b62..d52600ee06 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt @@ -125,7 +125,7 @@ class Shikimori(private val context: Context, id: Long) : TrackService(id) { saveCredentials(user.toString(), oauth.accessToken) true } catch (e: java.lang.Exception) { - Logger.e(e) + Logger.e(e) { "Unable to login" } logout() false } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt index 13ec85c2dd..484bd52248 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt @@ -24,7 +24,7 @@ class AppUpdateJob(private val context: Context, workerParams: WorkerParameters) AppUpdateChecker().checkForUpdate(context) Result.success() } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to check for update" } Result.failure() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt index bcd4fc8278..981d973c41 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstaller.kt @@ -157,7 +157,7 @@ internal class ExtensionInstaller(private val context: Context) { } .flowOn(Dispatchers.IO) .catch { e -> - Logger.e(e) + Logger.e(e) { "Extension installation failed" } emit(InstallStep.Error to null) } .onCompletion { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt index d507df7d41..75475b707d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt @@ -221,7 +221,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour return@withIOContext rt } } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Something went wrong while trying to load manga details" } } return@withIOContext manga @@ -315,7 +315,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour try { updateCover(chapter, manga) } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to update cover" } } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt index 3fe462cdca..b2e01887af 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt @@ -233,7 +233,7 @@ class MigrationListController(bundle: Bundle? = null) : val chapters: List = try { source.getChapterList(localManga) } catch (e: java.lang.Exception) { - Logger.e(e) + Logger.e(e) { "Something went wrong while trying to retrieve chapter list" } emptyList() } withContext(Dispatchers.IO) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index 318622de72..260553177e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -388,7 +388,7 @@ class ReaderViewModel( if (e is CancellationException) { throw e } - Logger.e(e) + Logger.e(e) { "Unable to load new chapter" } } } } @@ -440,7 +440,7 @@ class ReaderViewModel( if (e is CancellationException) { throw e } - Logger.e(e) + Logger.e(e) { "Unable to load adjacent chapter" } lastPage = null } finally { mutableState.update { it.copy(isLoadingAdjacentChapter = false) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt index cdacfe370a..26516ce795 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt @@ -203,7 +203,7 @@ class WebtoonPageHolder( removeErrorLayout() } } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to load page" } withUIContext { setError() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt index bc3fc40300..721ba889e2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt @@ -494,7 +494,7 @@ class SettingsAdvancedController : SettingsLegacyController() { activity?.applicationInfo?.dataDir?.let { File("$it/app_webview/").deleteRecursively() } activity?.toast(MR.strings.webview_data_deleted) } catch (e: Throwable) { - Logger.e(e) + Logger.e(e) { "Unable to delete WebView data" } activity?.toast(MR.strings.cache_delete_error) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt index 7f75937849..111d12a403 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt @@ -188,7 +188,7 @@ open class BrowseSourcePresenter( this@BrowseSourcePresenter.items.addAll(items) withUIContext { view?.onAddPage(page, items) } } catch (error: Exception) { - Logger.e(error) + Logger.e(error) { "Unable to prepare a page" } } }.collect() } @@ -259,7 +259,7 @@ open class BrowseSourcePresenter( .onEach { withUIContext { view?.onMangaInitialized(it) } } - .catch { e -> Logger.e(e) } + .catch { e -> Logger.e(e) { "Unable to initialize manga" } } .collect() } } @@ -277,7 +277,7 @@ open class BrowseSourcePresenter( manga.initialized = true db.insertManga(manga).executeAsBlocking() } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Something went wrong while trying to initialize manga" } } return manga } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt index 434a59401b..cff59008dc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt @@ -113,7 +113,7 @@ suspend fun updateTrackChapterRead( service.update(track, true) db.insertTrack(track).executeAsBlocking() } catch (e: Exception) { - Logger.e(e) + Logger.e(e) { "Unable to update tracker [tracker id ${track.sync_id}]" } failures.add(service to e.localizedMessage) if (retryWhenOnline) { delayTrackingUpdate(preferences, mangaId, newChapterRead, track) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt index 8a0243a710..7d9ede8229 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt @@ -445,6 +445,6 @@ suspend fun withNonCancellableContext(block: suspend CoroutineScope.() -> T) fun Context.tryTakePersistableUriPermission(uri: Uri, flags: Int) = try { contentResolver.takePersistableUriPermission(uri, flags) } catch (e: SecurityException) { - Logger.e(e) + Logger.e(e) { "Persists URI permission is not supported in this device" } toast(MR.strings.file_picker_uri_permission_unsupported) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt index 52c7ca30ab..da44c1b65c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt @@ -583,7 +583,7 @@ object ImageUtil { splitDataList .map { splitImageName(fileName, it.index) } .forEach { tmpDir.findFile(it)?.delete() } - Logger.e(e) + Logger.e(e) { "Unable to save split image" } false } finally { bitmapRegionDecoder.recycle() diff --git a/app/src/main/java/yokai/presentation/settings/screen/SettingsDataScreen.kt b/app/src/main/java/yokai/presentation/settings/screen/SettingsDataScreen.kt index 730f9119ca..0ac654961a 100644 --- a/app/src/main/java/yokai/presentation/settings/screen/SettingsDataScreen.kt +++ b/app/src/main/java/yokai/presentation/settings/screen/SettingsDataScreen.kt @@ -279,7 +279,7 @@ object SettingsDataScreen : ComposableSettings { cacheReadableSizeSema++ } } catch (e: Throwable) { - Logger.e(e) + Logger.e(e) { "Unable to clear cache" } withUIContext { context.toast(MR.strings.cache_delete_error) } } } diff --git a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt b/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt index 9b580a4638..bb1d5d4aa0 100644 --- a/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt +++ b/core/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/WebViewUtil.kt @@ -17,7 +17,7 @@ object WebViewUtil { // is not installed CookieManager.getInstance() } catch (e: Throwable) { - Logger.e(e) + Logger.e(e) { "Unable to manage cookie for WebView" } return false }