admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restrict line length with ktlint

Browse Source 
(cherry picked from commit 1d144e67678a99ec7198e5efcb1410b5da4bc42e)

# Conflicts:
#	.editorconfig
#	app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
#	app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
This commit is contained in:
arkon
2023-11-04 23:28:41 -04:00
committed by Jobobby04
parent 0a9f15d74c
commit d9a6a7be50
123 changed files with 1366 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
domain/src/main/java/tachiyomi/domain/UnsortedPreferences.kt
+8 -2
View File
@@ -70,7 +70,10 @@ class UnsortedPreferences(
fun exhSettingsLanguages() = preferenceStore.getString(
"eh_settings_languages",
"false*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false",
"false*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\n" +
"false*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\n" +
"false*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\nfalse*false*false\n" +
"false*false*false\nfalse*false*false",
)
fun exhEnabledCategories() = preferenceStore.getString(
@@ -82,7 +85,10 @@ class UnsortedPreferences(
fun preferredMangaDexId() = preferenceStore.getString("preferred_mangaDex_id", "0")
fun mangadexSyncToLibraryIndexes() = preferenceStore.getStringSet("pref_mangadex_sync_to_library_indexes", emptySet())
fun mangadexSyncToLibraryIndexes() = preferenceStore.getStringSet(
"pref_mangadex_sync_to_library_indexes",
emptySet(),
)
fun allowLocalSourceHiddenFolders() = preferenceStore.getBoolean("allow_local_source_hidden_folders", false)
domain/src/main/java/tachiyomi/domain/chapter/interactor/GetMergedChaptersByMangaId.kt
+17 -5
View File
@@ -41,11 +41,18 @@ class GetMergedChaptersByMangaId(
}
}
fun transformMergedChapters(mangaReferences: List<MergedMangaReference>, chapterList: List<Chapter>, dedupe: Boolean): List<Chapter> {
fun transformMergedChapters(
mangaReferences: List<MergedMangaReference>,
chapterList: List<Chapter>,
dedupe: Boolean,
): List<Chapter> {
return if (dedupe) dedupeChapterList(mangaReferences, chapterList) else chapterList
}
private fun dedupeChapterList(mangaReferences: List<MergedMangaReference>, chapterList: List<Chapter>): List<Chapter> {
private fun dedupeChapterList(
mangaReferences: List<MergedMangaReference>,
chapterList: List<Chapter>,
): List<Chapter> {
return when (mangaReferences.firstOrNull { it.mangaSourceId == MERGED_SOURCE_ID }?.chapterSortMode) {
MergedMangaReference.CHAPTER_SORT_NO_DEDUPE, MergedMangaReference.CHAPTER_SORT_NONE -> chapterList
MergedMangaReference.CHAPTER_SORT_PRIORITY -> dedupeByPriority(mangaReferences, chapterList)
@@ -71,7 +78,10 @@ class GetMergedChaptersByMangaId(
return chapterList.maxByOrNull { it.chapterNumber }?.mangaId
}
private fun dedupeByPriority(mangaReferences: List<MergedMangaReference>, chapterList: List<Chapter>): List<Chapter> {
private fun dedupeByPriority(
mangaReferences: List<MergedMangaReference>,
chapterList: List<Chapter>,
): List<Chapter> {
val sortedChapterList = mutableListOf<Chapter>()
var existingChapterIndex: Int
@@ -86,8 +96,10 @@ class GetMergedChaptersByMangaId(
val oldChapterIndex = existingChapterIndex
if (chapter.isRecognizedNumber) {
existingChapterIndex = sortedChapterList.indexOfFirst {
it.isRecognizedNumber && it.chapterNumber == chapter.chapterNumber && // check if the chapter is not already there
it.mangaId != chapter.mangaId // allow multiple chapters of the same number from the same source
// check if the chapter is not already there
it.isRecognizedNumber && it.chapterNumber == chapter.chapterNumber &&
// allow multiple chapters of the same number from the same source
it.mangaId != chapter.mangaId
}
if (existingChapterIndex == -1) {
sortedChapterList.add(oldChapterIndex + 1, chapter)
domain/src/main/java/tachiyomi/domain/chapter/model/ChapterUpdate.kt
+14 -1
View File
@@ -16,5 +16,18 @@ data class ChapterUpdate(
)
fun Chapter.toChapterUpdate(): ChapterUpdate {
return ChapterUpdate(id, mangaId, read, bookmark, lastPageRead, dateFetch, sourceOrder, url, name, dateUpload, chapterNumber, scanlator)
return ChapterUpdate(
id,
mangaId,
read,
bookmark,
lastPageRead,
dateFetch,
sourceOrder,
url,
name,
dateUpload,
chapterNumber,
scanlator,
)
}
domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt
+8 -2
View File
@@ -33,7 +33,8 @@ class GetApplicationRelease(
// Check if latest version is different from current version
// SY -->
val isNewVersion = isNewVersion(arguments.isPreview, arguments.syDebugVersion, arguments.versionName, release.version)
val isNewVersion =
isNewVersion(arguments.isPreview, arguments.syDebugVersion, arguments.versionName, release.version)
// SY <--
return when {
isNewVersion && arguments.isThirdParty -> Result.ThirdPartyInstallation
@@ -43,7 +44,12 @@ class GetApplicationRelease(
}
// SY -->
private fun isNewVersion(isPreview: Boolean, syDebugVersion: String, versionName: String, versionTag: String): Boolean {
private fun isNewVersion(
isPreview: Boolean,
syDebugVersion: String,
versionName: String,
versionTag: String,
): Boolean {
// Removes prefixes like "r" or "v"
val newVersion = versionTag.replace("[^\\d.]".toRegex(), "")
return if (isPreview) {