Add advanced Library setting to allow library manga's titles to update from source

This commit is contained in:
FlaminSarge 2024-08-29 02:54:44 -07:00
parent 48166b9b52
commit f77f9b1f94
7 changed files with 61 additions and 7 deletions

View file

@ -2,7 +2,10 @@ package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.model.hasCustomCover import eu.kanade.domain.manga.model.hasCustomCover
import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.cache.CoverCache
import eu.kanade.tachiyomi.data.download.DownloadManager
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import tachiyomi.domain.library.service.LibraryPreferences
import tachiyomi.domain.manga.interactor.FetchInterval import tachiyomi.domain.manga.interactor.FetchInterval
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.MangaUpdate import tachiyomi.domain.manga.model.MangaUpdate
@ -27,10 +30,13 @@ class UpdateManga(
} }
suspend fun awaitUpdateFromSource( suspend fun awaitUpdateFromSource(
source: Source,
localManga: Manga, localManga: Manga,
remoteManga: SManga, remoteManga: SManga,
manualFetch: Boolean, manualFetch: Boolean,
coverCache: CoverCache = Injekt.get(), coverCache: CoverCache = Injekt.get(),
libraryPreferences: LibraryPreferences = Injekt.get(),
downloadManager: DownloadManager = Injekt.get()
): Boolean { ): Boolean {
val remoteTitle = try { val remoteTitle = try {
remoteManga.title remoteManga.title
@ -38,8 +44,12 @@ class UpdateManga(
"" ""
} }
// if the manga isn't a favorite, set its title from source and update in db // if the manga isn't a favorite (or 'update titles' preference is enabled), set its title from source and update in db
val title = if (remoteTitle.isEmpty() || localManga.favorite) null else remoteTitle val title =
if (remoteTitle.isNotEmpty() && (!localManga.favorite || libraryPreferences.updateMangaTitles().get()))
remoteTitle
else
null
val coverLastModified = val coverLastModified =
when { when {
@ -59,7 +69,7 @@ class UpdateManga(
val thumbnailUrl = remoteManga.thumbnail_url?.takeIf { it.isNotEmpty() } val thumbnailUrl = remoteManga.thumbnail_url?.takeIf { it.isNotEmpty() }
return mangaRepository.update( val success = mangaRepository.update(
MangaUpdate( MangaUpdate(
id = localManga.id, id = localManga.id,
title = title, title = title,
@ -74,6 +84,10 @@ class UpdateManga(
initialized = true, initialized = true,
), ),
) )
if (success && title != null) {
downloadManager.renameManga(source, localManga, title)
}
return success;
} }
suspend fun awaitUpdateFetchInterval( suspend fun awaitUpdateFetchInterval(

View file

@ -62,6 +62,7 @@ import okhttp3.Headers
import tachiyomi.core.common.util.lang.launchNonCancellable import tachiyomi.core.common.util.lang.launchNonCancellable
import tachiyomi.core.common.util.lang.withUIContext import tachiyomi.core.common.util.lang.withUIContext
import tachiyomi.core.common.util.system.logcat import tachiyomi.core.common.util.system.logcat
import tachiyomi.domain.library.service.LibraryPreferences
import tachiyomi.domain.manga.interactor.ResetViewerFlags import tachiyomi.domain.manga.interactor.ResetViewerFlags
import tachiyomi.i18n.MR import tachiyomi.i18n.MR
import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.i18n.stringResource
@ -84,6 +85,7 @@ object SettingsAdvancedScreen : SearchableSettings {
val basePreferences = remember { Injekt.get<BasePreferences>() } val basePreferences = remember { Injekt.get<BasePreferences>() }
val networkPreferences = remember { Injekt.get<NetworkPreferences>() } val networkPreferences = remember { Injekt.get<NetworkPreferences>() }
val libraryPreferences = remember { Injekt.get<LibraryPreferences>() }
return listOf( return listOf(
Preference.PreferenceItem.TextPreference( Preference.PreferenceItem.TextPreference(
@ -124,7 +126,7 @@ object SettingsAdvancedScreen : SearchableSettings {
getBackgroundActivityGroup(), getBackgroundActivityGroup(),
getDataGroup(), getDataGroup(),
getNetworkGroup(networkPreferences = networkPreferences), getNetworkGroup(networkPreferences = networkPreferences),
getLibraryGroup(), getLibraryGroup(libraryPreferences = libraryPreferences),
getReaderGroup(basePreferences = basePreferences), getReaderGroup(basePreferences = basePreferences),
getExtensionsGroup(basePreferences = basePreferences), getExtensionsGroup(basePreferences = basePreferences),
) )
@ -285,7 +287,9 @@ object SettingsAdvancedScreen : SearchableSettings {
} }
@Composable @Composable
private fun getLibraryGroup(): Preference.PreferenceGroup { private fun getLibraryGroup(
libraryPreferences: LibraryPreferences
): Preference.PreferenceGroup {
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
val context = LocalContext.current val context = LocalContext.current
@ -313,6 +317,11 @@ object SettingsAdvancedScreen : SearchableSettings {
} }
}, },
), ),
Preference.PreferenceItem.SwitchPreference(
pref = libraryPreferences.updateMangaTitles(),
title = stringResource(MR.strings.pref_update_library_manga_titles),
subtitle = stringResource(MR.strings.pref_update_library_manga_titles_summary),
),
), ),
) )
} }

View file

@ -327,6 +327,33 @@ class DownloadManager(
} }
} }
/**
* Renames manga download folder
*
* @param source the source of the manga.
* @param manga the manga to rename
* @param newTitle the new manga title.
*/
fun renameManga(source: Source, manga: Manga, newTitle: String) {
val oldFolder = provider.findMangaDir(manga.title, source) ?: return
val newName = provider.getMangaDirName(newTitle)
if (oldFolder.name == newName) return
val capitalizationChanged = oldFolder.name.equals(newName, ignoreCase = true)
if (capitalizationChanged) {
val tempName = newName + Downloader.TMP_DIR_SUFFIX
if (!oldFolder.renameTo(tempName)) {
logcat(LogPriority.ERROR) { "Failed to rename manga download folder: ${oldFolder.name}" }
return
}
}
if (!oldFolder.renameTo(newName)) {
logcat(LogPriority.ERROR) { "Failed to rename manga download folder: ${oldFolder.name}" }
}
}
/** /**
* Renames an already downloaded chapter * Renames an already downloaded chapter
* *

View file

@ -336,7 +336,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet
// Update manga metadata if needed // Update manga metadata if needed
if (libraryPreferences.autoUpdateMetadata().get()) { if (libraryPreferences.autoUpdateMetadata().get()) {
val networkManga = source.getMangaDetails(manga.toSManga()) val networkManga = source.getMangaDetails(manga.toSManga())
updateManga.awaitUpdateFromSource(manga, networkManga, manualFetch = false, coverCache) updateManga.awaitUpdateFromSource(source, manga, networkManga, manualFetch = false, coverCache)
} }
val chapters = source.getChapterList(manga.toSManga()) val chapters = source.getChapterList(manga.toSManga())

View file

@ -265,7 +265,7 @@ class MangaScreenModel(
try { try {
withIOContext { withIOContext {
val networkManga = state.source.getMangaDetails(state.manga.toSManga()) val networkManga = state.source.getMangaDetails(state.manga.toSManga())
updateManga.awaitUpdateFromSource(state.manga, networkManga, manualFetch) updateManga.awaitUpdateFromSource(state.source, state.manga, networkManga, manualFetch)
} }
} catch (e: Throwable) { } catch (e: Throwable) {
// Ignore early hints "errors" that aren't handled by OkHttp // Ignore early hints "errors" that aren't handled by OkHttp

View file

@ -188,6 +188,8 @@ class LibraryPreferences(
ChapterSwipeAction.ToggleRead, ChapterSwipeAction.ToggleRead,
) )
fun updateMangaTitles() = preferenceStore.getBoolean("pref_update_library_manga_titles", false)
// endregion // endregion
enum class ChapterSwipeAction { enum class ChapterSwipeAction {

View file

@ -610,6 +610,8 @@
<string name="pref_verbose_logging">Verbose logging</string> <string name="pref_verbose_logging">Verbose logging</string>
<string name="pref_verbose_logging_summary">Print verbose logs to system log (reduces app performance)</string> <string name="pref_verbose_logging_summary">Print verbose logs to system log (reduces app performance)</string>
<string name="pref_debug_info">Debug info</string> <string name="pref_debug_info">Debug info</string>
<string name="pref_update_library_manga_titles">Allow title changes for library entries</string>
<string name="pref_update_library_manga_titles_summary">If a source has a different title for an entry than the one stored in the library, update it to match the source\'s title.</string>
<!-- About section --> <!-- About section -->
<string name="website">Website</string> <string name="website">Website</string>