Restrict line length with ktlint

(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
@@ -122,7 +122,9 @@ class ChapterRepositoryImpl(
}
override suspend fun getMergedChapterByMangaIdAsFlow(mangaId: Long): Flow<List<Chapter>> {
return handler.subscribeToList { chaptersQueries.getMergedChaptersByMangaId(mangaId, ChapterMapper::mapChapter) }
return handler.subscribeToList {
chaptersQueries.getMergedChaptersByMangaId(mangaId, ChapterMapper::mapChapter)
}
}
// SY <--
}
@@ -5,7 +5,6 @@ import tachiyomi.domain.library.model.LibraryManga
import tachiyomi.domain.manga.model.Manga
import tachiyomi.view.LibraryView
object MangaMapper {
fun mapManga(
id: Long,
@@ -58,7 +58,9 @@ class MangaMetadataRepositoryImpl(
}
override suspend fun getExhFavoriteMangaWithMetadata(): List<Manga> {
return handler.awaitList { mangasQueries.getEhMangaWithMetadata(EH_SOURCE_ID, EXH_SOURCE_ID, MangaMapper::mapManga) }
return handler.awaitList {
mangasQueries.getEhMangaWithMetadata(EH_SOURCE_ID, EXH_SOURCE_ID, MangaMapper::mapManga)
}
}
override suspend fun getIdsOfFavoriteMangaWithMetadata(): List<Long> {
@@ -74,7 +76,7 @@ class MangaMetadataRepositoryImpl(
uploader: String?,
extra: String,
indexedExtra: String?,
extraVersion: Long
extraVersion: Long,
): SearchMetadata {
return SearchMetadata(
mangaId = mangaId,
@@ -51,7 +51,9 @@ class MangaRepositoryImpl(
}
override suspend fun getLibraryManga(): List<LibraryManga> {
return handler.awaitListExecutable { (handler as AndroidDatabaseHandler).getLibraryQuery() }.map(MangaMapper::mapLibraryView)
return handler.awaitListExecutable {
(handler as AndroidDatabaseHandler).getLibraryQuery()
}.map(MangaMapper::mapLibraryView)
// return handler.awaitList { libraryViewQueries.library(MangaMapper::mapLibraryManga) }
}
@@ -25,7 +25,11 @@ abstract class EHentaiPagingSource(override val source: CatalogueSource) : Sourc
}
}
class EHentaiSearchPagingSource(source: CatalogueSource, val query: String, val filters: FilterList) : EHentaiPagingSource(source) {
class EHentaiSearchPagingSource(
source: CatalogueSource,
val query: String,
val filters: FilterList,
) : EHentaiPagingSource(source) {
override suspend fun requestNextPage(currentPage: Int): MangasPage {
return source.getSearchManga(currentPage, query, filters)
}
@@ -7,7 +7,7 @@ object FeedSavedSearchMapper {
id: Long,
source: Long,
savedSearch: Long?,
global: Boolean
global: Boolean,
): FeedSavedSearch {
return FeedSavedSearch(
id = id,
@@ -35,7 +35,9 @@ class FeedSavedSearchRepositoryImpl(
}
override suspend fun getBySourceIdFeedSavedSearch(sourceId: Long): List<SavedSearch> {
return handler.awaitList { feed_saved_searchQueries.selectSourceFeedSavedSearch(sourceId, SavedSearchMapper::map) }
return handler.awaitList {
feed_saved_searchQueries.selectSourceFeedSavedSearch(sourceId, SavedSearchMapper::map)
}
}
override suspend fun countBySourceId(sourceId: Long): Long {
@@ -8,7 +8,7 @@ object SavedSearchMapper {
source: Long,
name: String,
query: String?,
filtersJson: String?
filtersJson: String?,
): SavedSearch {
return SavedSearch(
id = id,
@@ -10,9 +10,8 @@ import exh.metadata.metadata.RaisedSearchMetadata
import tachiyomi.core.util.lang.withIOContext
import tachiyomi.domain.source.repository.SourcePagingSourceType
class SourceSearchPagingSource(source: CatalogueSource, val query: String, val filters: FilterList) : SourcePagingSource(
source,
) {
class SourceSearchPagingSource(source: CatalogueSource, val query: String, val filters: FilterList) :
SourcePagingSource(source) {
override suspend fun requestNextPage(currentPage: Int): MangasPage {
return source.getSearchManga(currentPage, query, filters)
}
@@ -36,7 +35,9 @@ abstract class SourcePagingSource(
abstract suspend fun requestNextPage(currentPage: Int): MangasPage
override suspend fun load(params: LoadParams<Long>): LoadResult<Long, /*SY --> */ Pair<SManga, RaisedSearchMetadata?>/*SY <-- */> {
override suspend fun load(
params: LoadParams<Long>,
): LoadResult<Long, /*SY --> */ Pair<SManga, RaisedSearchMetadata?>/*SY <-- */> {
val page = params.key ?: 1
val mangasPage = try {
@@ -55,7 +56,10 @@ abstract class SourcePagingSource(
}
// SY -->
open fun getPageLoadResult(params: LoadParams<Long>, mangasPage: MangasPage): LoadResult.Page<Long, /*SY --> */ Pair<SManga, RaisedSearchMetadata?>/*SY <-- */> {
open fun getPageLoadResult(
params: LoadParams<Long>,
mangasPage: MangasPage,
): LoadResult.Page<Long, /*SY --> */ Pair<SManga, RaisedSearchMetadata?>/*SY <-- */> {
val page = params.key ?: 1
// SY -->
@@ -77,7 +81,9 @@ abstract class SourcePagingSource(
}
// SY <--
override fun getRefreshKey(state: PagingState<Long, /*SY --> */ Pair<SManga, RaisedSearchMetadata?>/*SY <-- */>): Long? {
override fun getRefreshKey(
state: PagingState<Long, /*SY --> */ Pair<SManga, RaisedSearchMetadata?>/*SY <-- */>,
): Long? {
return state.anchorPosition?.let { anchorPosition ->
val anchorPage = state.closestPageToPosition(anchorPosition)
anchorPage?.prevKey ?: anchorPage?.nextKey
@@ -32,7 +32,9 @@ class UpdatesRepositoryImpl(
return databaseHandler.subscribeToList {
updatesViewQueries.getRecentUpdates(after, limit, ::mapUpdatesWithRelations)
}.map {
databaseHandler.awaitListExecutable { (databaseHandler as AndroidDatabaseHandler).getUpdatesQuery(after, limit) }
databaseHandler.awaitListExecutable {
(databaseHandler as AndroidDatabaseHandler).getUpdatesQuery(after, limit)
}
.map(::mapUpdatesView)
}
}