Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move more repositories to domain module

Browse Source
This commit is contained in:
Jobobby04 2023-02-09 15:10:37 -05:00
parent ab0995ab9f
commit dd62337ad6
71 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/data/exh/FavoriteEntry.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.data.exh package eu.kanade.data.exh
import exh.favorites.sql.models.FavoriteEntry import tachiyomi.domain.manga.model.FavoriteEntry
val favoriteEntryMapper: (Long, String, String, String, Long) -> FavoriteEntry = val favoriteEntryMapper: (Long, String, String, String, Long) -> FavoriteEntry =
{ id, title, gid, token, category -> { id, title, gid, token, category ->

2
app/src/main/java/eu/kanade/data/exh/FeedSavedSearch.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.data.exh package eu.kanade.data.exh
import exh.savedsearches.models.FeedSavedSearch import tachiyomi.domain.source.model.FeedSavedSearch
val feedSavedSearchMapper: (Long, Long, Long?, Boolean) -> FeedSavedSearch = val feedSavedSearchMapper: (Long, Long, Long?, Boolean) -> FeedSavedSearch =
{ id, source, savedSearch, global -> { id, source, savedSearch, global ->

2
app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.data.exh package eu.kanade.data.exh
import exh.merged.sql.models.MergedMangaReference import tachiyomi.domain.manga.model.MergedMangaReference
val mergedMangaReferenceMapper = val mergedMangaReferenceMapper =
{ id: Long, isInfoManga: Boolean, getChapterUpdates: Boolean, chapterSortMode: Long, chapterPriority: Long, downloadChapters: Boolean, mergeId: Long, mergeUrl: String, mangaId: Long?, mangaUrl: String, mangaSourceId: Long -> { id: Long, isInfoManga: Boolean, getChapterUpdates: Boolean, chapterSortMode: Long, chapterPriority: Long, downloadChapters: Boolean, mergeId: Long, mergeUrl: String, mangaId: Long?, mangaUrl: String, mangaSourceId: Long ->

2
app/src/main/java/eu/kanade/data/exh/SavedSearch.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.data.exh package eu.kanade.data.exh
import exh.savedsearches.models.SavedSearch import tachiyomi.domain.source.model.SavedSearch
val savedSearchMapper: (Long, Long, String, String?, String?) -> SavedSearch = val savedSearchMapper: (Long, Long, String, String?, String?) -> SavedSearch =
{ id, source, name, query, filtersJson -> { id, source, name, query, filtersJson ->

4
app/src/main/java/eu/kanade/data/manga/FavoritesEntryRepositoryImpl.kt
View File

@ -1,9 +1,9 @@
package eu.kanade.data.manga package eu.kanade.data.manga
import eu.kanade.data.exh.favoriteEntryMapper import eu.kanade.data.exh.favoriteEntryMapper
import eu.kanade.domain.manga.repository.FavoritesEntryRepository
import exh.favorites.sql.models.FavoriteEntry
import tachiyomi.data.DatabaseHandler import tachiyomi.data.DatabaseHandler
import tachiyomi.domain.manga.model.FavoriteEntry
import tachiyomi.domain.manga.repository.FavoritesEntryRepository
class FavoritesEntryRepositoryImpl( class FavoritesEntryRepositoryImpl(
private val handler: DatabaseHandler, private val handler: DatabaseHandler,

6
app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt
View File

@ -1,15 +1,15 @@
package eu.kanade.data.manga package eu.kanade.data.manga
import eu.kanade.data.exh.mergedMangaReferenceMapper import eu.kanade.data.exh.mergedMangaReferenceMapper
import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate
import eu.kanade.domain.manga.repository.MangaMergeRepository
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import eu.kanade.tachiyomi.util.system.toLong import eu.kanade.tachiyomi.util.system.toLong
import exh.merged.sql.models.MergedMangaReference
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.data.DatabaseHandler import tachiyomi.data.DatabaseHandler
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate
import tachiyomi.domain.manga.model.MergedMangaReference
import tachiyomi.domain.manga.repository.MangaMergeRepository
class MangaMergeRepositoryImpl( class MangaMergeRepositoryImpl(
private val handler: DatabaseHandler, private val handler: DatabaseHandler,

2
app/src/main/java/eu/kanade/data/manga/MangaMetadataRepositoryImpl.kt
View File

@ -3,7 +3,6 @@ package eu.kanade.data.manga
import eu.kanade.data.exh.searchMetadataMapper import eu.kanade.data.exh.searchMetadataMapper
import eu.kanade.data.exh.searchTagMapper import eu.kanade.data.exh.searchTagMapper
import eu.kanade.data.exh.searchTitleMapper import eu.kanade.data.exh.searchTitleMapper
import eu.kanade.domain.manga.repository.MangaMetadataRepository
import exh.metadata.metadata.base.FlatMetadata import exh.metadata.metadata.base.FlatMetadata
import exh.metadata.sql.models.SearchMetadata import exh.metadata.sql.models.SearchMetadata
import exh.metadata.sql.models.SearchTag import exh.metadata.sql.models.SearchTag
@ -13,6 +12,7 @@ import exh.source.EXH_SOURCE_ID
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import tachiyomi.data.DatabaseHandler import tachiyomi.data.DatabaseHandler
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.repository.MangaMetadataRepository
class MangaMetadataRepositoryImpl( class MangaMetadataRepositoryImpl(
private val handler: DatabaseHandler, private val handler: DatabaseHandler,

6
app/src/main/java/eu/kanade/data/source/FeedSavedSearchRepositoryImpl.kt
View File

@ -2,11 +2,11 @@ package eu.kanade.data.source
import eu.kanade.data.exh.feedSavedSearchMapper import eu.kanade.data.exh.feedSavedSearchMapper
import eu.kanade.data.exh.savedSearchMapper import eu.kanade.data.exh.savedSearchMapper
import eu.kanade.domain.source.repository.FeedSavedSearchRepository
import exh.savedsearches.models.FeedSavedSearch
import exh.savedsearches.models.SavedSearch
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import tachiyomi.data.DatabaseHandler import tachiyomi.data.DatabaseHandler
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.model.SavedSearch
import tachiyomi.domain.source.repository.FeedSavedSearchRepository
class FeedSavedSearchRepositoryImpl( class FeedSavedSearchRepositoryImpl(
private val handler: DatabaseHandler, private val handler: DatabaseHandler,

4
app/src/main/java/eu/kanade/data/source/SavedSearchRepositoryImpl.kt
View File

@ -1,10 +1,10 @@
package eu.kanade.data.source package eu.kanade.data.source
import eu.kanade.data.exh.savedSearchMapper import eu.kanade.data.exh.savedSearchMapper
import eu.kanade.domain.source.repository.SavedSearchRepository
import exh.savedsearches.models.SavedSearch
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import tachiyomi.data.DatabaseHandler import tachiyomi.data.DatabaseHandler
import tachiyomi.domain.source.model.SavedSearch
import tachiyomi.domain.source.repository.SavedSearchRepository
class SavedSearchRepositoryImpl( class SavedSearchRepositoryImpl(
private val handler: DatabaseHandler, private val handler: DatabaseHandler,

10
app/src/main/java/eu/kanade/domain/SYDomainModule.kt
View File

@ -38,9 +38,6 @@ import eu.kanade.domain.manga.interactor.InsertMergedReference
import eu.kanade.domain.manga.interactor.ReorderSortTag import eu.kanade.domain.manga.interactor.ReorderSortTag
import eu.kanade.domain.manga.interactor.SetMangaFilteredScanlators import eu.kanade.domain.manga.interactor.SetMangaFilteredScanlators
import eu.kanade.domain.manga.interactor.UpdateMergedSettings import eu.kanade.domain.manga.interactor.UpdateMergedSettings
import eu.kanade.domain.manga.repository.FavoritesEntryRepository
import eu.kanade.domain.manga.repository.MangaMergeRepository
import eu.kanade.domain.manga.repository.MangaMetadataRepository
import eu.kanade.domain.source.interactor.CountFeedSavedSearchBySourceId import eu.kanade.domain.source.interactor.CountFeedSavedSearchBySourceId
import eu.kanade.domain.source.interactor.CountFeedSavedSearchGlobal import eu.kanade.domain.source.interactor.CountFeedSavedSearchGlobal
import eu.kanade.domain.source.interactor.CreateSourceCategory import eu.kanade.domain.source.interactor.CreateSourceCategory
@ -64,14 +61,17 @@ import eu.kanade.domain.source.interactor.InsertSavedSearch
import eu.kanade.domain.source.interactor.RenameSourceCategory import eu.kanade.domain.source.interactor.RenameSourceCategory
import eu.kanade.domain.source.interactor.SetSourceCategories import eu.kanade.domain.source.interactor.SetSourceCategories
import eu.kanade.domain.source.interactor.ToggleExcludeFromDataSaver import eu.kanade.domain.source.interactor.ToggleExcludeFromDataSaver
import eu.kanade.domain.source.repository.FeedSavedSearchRepository
import eu.kanade.domain.source.repository.SavedSearchRepository
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import exh.search.SearchEngine import exh.search.SearchEngine
import tachiyomi.data.manga.CustomMangaRepositoryImpl import tachiyomi.data.manga.CustomMangaRepositoryImpl
import tachiyomi.domain.manga.interactor.GetCustomMangaInfo import tachiyomi.domain.manga.interactor.GetCustomMangaInfo
import tachiyomi.domain.manga.interactor.SetCustomMangaInfo import tachiyomi.domain.manga.interactor.SetCustomMangaInfo
import tachiyomi.domain.manga.repository.CustomMangaRepository import tachiyomi.domain.manga.repository.CustomMangaRepository
import tachiyomi.domain.manga.repository.FavoritesEntryRepository
import tachiyomi.domain.manga.repository.MangaMergeRepository
import tachiyomi.domain.manga.repository.MangaMetadataRepository
import tachiyomi.domain.source.repository.FeedSavedSearchRepository
import tachiyomi.domain.source.repository.SavedSearchRepository
import uy.kohesive.injekt.api.InjektModule import uy.kohesive.injekt.api.InjektModule
import uy.kohesive.injekt.api.InjektRegistrar import uy.kohesive.injekt.api.InjektRegistrar
import uy.kohesive.injekt.api.addFactory import uy.kohesive.injekt.api.addFactory

2
app/src/main/java/eu/kanade/domain/chapter/interactor/GetMergedChapterByMangaId.kt
View File

@ -2,7 +2,6 @@ package eu.kanade.domain.chapter.interactor
import eu.kanade.domain.manga.interactor.GetMergedReferencesById import eu.kanade.domain.manga.interactor.GetMergedReferencesById
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.merged.sql.models.MergedMangaReference
import exh.source.MERGED_SOURCE_ID import exh.source.MERGED_SOURCE_ID
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
@ -10,6 +9,7 @@ import kotlinx.coroutines.flow.flowOf
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.Chapter
import tachiyomi.domain.chapter.repository.ChapterRepository import tachiyomi.domain.chapter.repository.ChapterRepository
import tachiyomi.domain.manga.model.MergedMangaReference
class GetMergedChapterByMangaId( class GetMergedChapterByMangaId(
private val chapterRepository: ChapterRepository, private val chapterRepository: ChapterRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/DeleteByMergeId.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMergeRepository import tachiyomi.domain.manga.repository.MangaMergeRepository
class DeleteByMergeId( class DeleteByMergeId(
private val mangaMergeRepository: MangaMergeRepository, private val mangaMergeRepository: MangaMergeRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/DeleteFavoriteEntries.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.FavoritesEntryRepository import tachiyomi.domain.manga.repository.FavoritesEntryRepository
class DeleteFavoriteEntries( class DeleteFavoriteEntries(
private val favoriteEntryRepository: FavoritesEntryRepository, private val favoriteEntryRepository: FavoritesEntryRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/DeleteMergeById.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMergeRepository import tachiyomi.domain.manga.repository.MangaMergeRepository
class DeleteMergeById( class DeleteMergeById(
private val mangaMergeRepository: MangaMergeRepository, private val mangaMergeRepository: MangaMergeRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/GetExhFavoriteMangaWithMetadata.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMetadataRepository
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.repository.MangaMetadataRepository
class GetExhFavoriteMangaWithMetadata( class GetExhFavoriteMangaWithMetadata(
private val mangaMetadataRepository: MangaMetadataRepository, private val mangaMetadataRepository: MangaMetadataRepository,

4
app/src/main/java/eu/kanade/domain/manga/interactor/GetFavoriteEntries.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.FavoritesEntryRepository import tachiyomi.domain.manga.model.FavoriteEntry
import exh.favorites.sql.models.FavoriteEntry import tachiyomi.domain.manga.repository.FavoritesEntryRepository
class GetFavoriteEntries( class GetFavoriteEntries(
private val favoriteEntryRepository: FavoritesEntryRepository, private val favoriteEntryRepository: FavoritesEntryRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/GetFlatMetadataById.kt
View File

@ -1,12 +1,12 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMetadataRepository
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.metadata.metadata.base.FlatMetadata import exh.metadata.metadata.base.FlatMetadata
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.domain.manga.repository.MangaMetadataRepository
class GetFlatMetadataById( class GetFlatMetadataById(
private val mangaMetadataRepository: MangaMetadataRepository, private val mangaMetadataRepository: MangaMetadataRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/GetIdsOfFavoriteMangaWithMetadata.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMetadataRepository import tachiyomi.domain.manga.repository.MangaMetadataRepository
class GetIdsOfFavoriteMangaWithMetadata( class GetIdsOfFavoriteMangaWithMetadata(
private val mangaMetadataRepository: MangaMetadataRepository, private val mangaMetadataRepository: MangaMetadataRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedManga.kt
View File

@ -1,10 +1,10 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMergeRepository
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.repository.MangaMergeRepository
class GetMergedManga( class GetMergedManga(
private val mangaMergeRepository: MangaMergeRepository, private val mangaMergeRepository: MangaMergeRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaById.kt
View File

@ -1,10 +1,10 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMergeRepository
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.repository.MangaMergeRepository
class GetMergedMangaById( class GetMergedMangaById(
private val mangaMergeRepository: MangaMergeRepository, private val mangaMergeRepository: MangaMergeRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedMangaForDownloading.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMergeRepository
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.repository.MangaMergeRepository
class GetMergedMangaForDownloading( class GetMergedMangaForDownloading(
private val mangaMergeRepository: MangaMergeRepository, private val mangaMergeRepository: MangaMergeRepository,

4
app/src/main/java/eu/kanade/domain/manga/interactor/GetMergedReferencesById.kt
View File

@ -1,10 +1,10 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMergeRepository
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.merged.sql.models.MergedMangaReference
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.domain.manga.model.MergedMangaReference
import tachiyomi.domain.manga.repository.MangaMergeRepository
class GetMergedReferencesById( class GetMergedReferencesById(
private val mangaMergeRepository: MangaMergeRepository, private val mangaMergeRepository: MangaMergeRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchMetadata.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMetadataRepository
import exh.metadata.sql.models.SearchMetadata import exh.metadata.sql.models.SearchMetadata
import tachiyomi.domain.manga.repository.MangaMetadataRepository
class GetSearchMetadata( class GetSearchMetadata(
private val mangaMetadataRepository: MangaMetadataRepository, private val mangaMetadataRepository: MangaMetadataRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTags.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMetadataRepository
import exh.metadata.sql.models.SearchTag import exh.metadata.sql.models.SearchTag
import tachiyomi.domain.manga.repository.MangaMetadataRepository
class GetSearchTags( class GetSearchTags(
private val mangaMetadataRepository: MangaMetadataRepository, private val mangaMetadataRepository: MangaMetadataRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/GetSearchTitles.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMetadataRepository
import exh.metadata.sql.models.SearchTitle import exh.metadata.sql.models.SearchTitle
import tachiyomi.domain.manga.repository.MangaMetadataRepository
class GetSearchTitles( class GetSearchTitles(
private val mangaMetadataRepository: MangaMetadataRepository, private val mangaMetadataRepository: MangaMetadataRepository,

4
app/src/main/java/eu/kanade/domain/manga/interactor/InsertFavoriteEntries.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.FavoritesEntryRepository import tachiyomi.domain.manga.model.FavoriteEntry
import exh.favorites.sql.models.FavoriteEntry import tachiyomi.domain.manga.repository.FavoritesEntryRepository
class InsertFavoriteEntries( class InsertFavoriteEntries(
private val favoriteEntryRepository: FavoritesEntryRepository, private val favoriteEntryRepository: FavoritesEntryRepository,

2
app/src/main/java/eu/kanade/domain/manga/interactor/InsertFlatMetadata.kt
View File

@ -1,11 +1,11 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMetadataRepository
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.metadata.metadata.base.FlatMetadata import exh.metadata.metadata.base.FlatMetadata
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.domain.manga.repository.MangaMetadataRepository
class InsertFlatMetadata( class InsertFlatMetadata(
private val mangaMetadataRepository: MangaMetadataRepository, private val mangaMetadataRepository: MangaMetadataRepository,

4
app/src/main/java/eu/kanade/domain/manga/interactor/InsertMergedReference.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.repository.MangaMergeRepository import tachiyomi.domain.manga.model.MergedMangaReference
import exh.merged.sql.models.MergedMangaReference import tachiyomi.domain.manga.repository.MangaMergeRepository
class InsertMergedReference( class InsertMergedReference(
private val mangaMergedRepository: MangaMergeRepository, private val mangaMergedRepository: MangaMergeRepository,

4
app/src/main/java/eu/kanade/domain/manga/interactor/UpdateMergedSettings.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.manga.interactor package eu.kanade.domain.manga.interactor
import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate
import eu.kanade.domain.manga.repository.MangaMergeRepository import tachiyomi.domain.manga.repository.MangaMergeRepository
class UpdateMergedSettings( class UpdateMergedSettings(
private val mangaMergeRepository: MangaMergeRepository, private val mangaMergeRepository: MangaMergeRepository,

2
app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchBySourceId.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.FeedSavedSearchRepository import tachiyomi.domain.source.repository.FeedSavedSearchRepository
class CountFeedSavedSearchBySourceId( class CountFeedSavedSearchBySourceId(
private val feedSavedSearchRepository: FeedSavedSearchRepository, private val feedSavedSearchRepository: FeedSavedSearchRepository,

2
app/src/main/java/eu/kanade/domain/source/interactor/CountFeedSavedSearchGlobal.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.FeedSavedSearchRepository import tachiyomi.domain.source.repository.FeedSavedSearchRepository
class CountFeedSavedSearchGlobal( class CountFeedSavedSearchGlobal(
private val feedSavedSearchRepository: FeedSavedSearchRepository, private val feedSavedSearchRepository: FeedSavedSearchRepository,

2
app/src/main/java/eu/kanade/domain/source/interactor/DeleteFeedSavedSearchById.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.FeedSavedSearchRepository import tachiyomi.domain.source.repository.FeedSavedSearchRepository
class DeleteFeedSavedSearchById( class DeleteFeedSavedSearchById(
private val feedSavedSearchRepository: FeedSavedSearchRepository, private val feedSavedSearchRepository: FeedSavedSearchRepository,

2
app/src/main/java/eu/kanade/domain/source/interactor/DeleteSavedSearchById.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.SavedSearchRepository import tachiyomi.domain.source.repository.SavedSearchRepository
class DeleteSavedSearchById( class DeleteSavedSearchById(
private val savedSearchRepository: SavedSearchRepository, private val savedSearchRepository: SavedSearchRepository,

4
app/src/main/java/eu/kanade/domain/source/interactor/GetExhSavedSearch.kt
View File

@ -3,8 +3,6 @@ package eu.kanade.domain.source.interactor
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import exh.log.xLogE import exh.log.xLogE
import exh.savedsearches.EXHSavedSearch
import exh.savedsearches.models.SavedSearch
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
@ -12,6 +10,8 @@ import kotlinx.coroutines.flow.map
import kotlinx.serialization.decodeFromString import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.JsonArray
import tachiyomi.domain.source.model.EXHSavedSearch
import tachiyomi.domain.source.model.SavedSearch
import xyz.nulldev.ts.api.http.serializer.FilterSerializer import xyz.nulldev.ts.api.http.serializer.FilterSerializer
class GetExhSavedSearch( class GetExhSavedSearch(

4
app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchBySourceId.kt
View File

@ -1,8 +1,8 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.FeedSavedSearchRepository
import exh.savedsearches.models.FeedSavedSearch
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.repository.FeedSavedSearchRepository
class GetFeedSavedSearchBySourceId( class GetFeedSavedSearchBySourceId(
private val feedSavedSearchRepository: FeedSavedSearchRepository, private val feedSavedSearchRepository: FeedSavedSearchRepository,

4
app/src/main/java/eu/kanade/domain/source/interactor/GetFeedSavedSearchGlobal.kt
View File

@ -1,8 +1,8 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.FeedSavedSearchRepository
import exh.savedsearches.models.FeedSavedSearch
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.repository.FeedSavedSearchRepository
class GetFeedSavedSearchGlobal( class GetFeedSavedSearchGlobal(
private val feedSavedSearchRepository: FeedSavedSearchRepository, private val feedSavedSearchRepository: FeedSavedSearchRepository,

4
app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchById.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.SavedSearchRepository import tachiyomi.domain.source.model.SavedSearch
import exh.savedsearches.models.SavedSearch import tachiyomi.domain.source.repository.SavedSearchRepository
class GetSavedSearchById( class GetSavedSearchById(
private val savedSearchRepository: SavedSearchRepository, private val savedSearchRepository: SavedSearchRepository,

4
app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceId.kt
View File

@ -1,8 +1,8 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.SavedSearchRepository
import exh.savedsearches.models.SavedSearch
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.source.model.SavedSearch
import tachiyomi.domain.source.repository.SavedSearchRepository
class GetSavedSearchBySourceId( class GetSavedSearchBySourceId(
private val savedSearchRepository: SavedSearchRepository, private val savedSearchRepository: SavedSearchRepository,

4
app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchBySourceIdFeed.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.FeedSavedSearchRepository import tachiyomi.domain.source.model.SavedSearch
import exh.savedsearches.models.SavedSearch import tachiyomi.domain.source.repository.FeedSavedSearchRepository
class GetSavedSearchBySourceIdFeed( class GetSavedSearchBySourceIdFeed(
private val feedSavedSearchRepository: FeedSavedSearchRepository, private val feedSavedSearchRepository: FeedSavedSearchRepository,

4
app/src/main/java/eu/kanade/domain/source/interactor/GetSavedSearchGlobalFeed.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.FeedSavedSearchRepository import tachiyomi.domain.source.model.SavedSearch
import exh.savedsearches.models.SavedSearch import tachiyomi.domain.source.repository.FeedSavedSearchRepository
class GetSavedSearchGlobalFeed( class GetSavedSearchGlobalFeed(
private val feedSavedSearchRepository: FeedSavedSearchRepository, private val feedSavedSearchRepository: FeedSavedSearchRepository,

4
app/src/main/java/eu/kanade/domain/source/interactor/InsertFeedSavedSearch.kt
View File

@ -1,10 +1,10 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.FeedSavedSearchRepository
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.savedsearches.models.FeedSavedSearch
import logcat.LogPriority import logcat.LogPriority
import logcat.asLog import logcat.asLog
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.repository.FeedSavedSearchRepository
class InsertFeedSavedSearch( class InsertFeedSavedSearch(
private val feedSavedSearchRepository: FeedSavedSearchRepository, private val feedSavedSearchRepository: FeedSavedSearchRepository,

4
app/src/main/java/eu/kanade/domain/source/interactor/InsertSavedSearch.kt
View File

@ -1,10 +1,10 @@
package eu.kanade.domain.source.interactor package eu.kanade.domain.source.interactor
import eu.kanade.domain.source.repository.SavedSearchRepository
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.savedsearches.models.SavedSearch
import logcat.LogPriority import logcat.LogPriority
import logcat.asLog import logcat.asLog
import tachiyomi.domain.source.model.SavedSearch
import tachiyomi.domain.source.repository.SavedSearchRepository
class InsertSavedSearch( class InsertSavedSearch(
private val savedSearchRepository: SavedSearchRepository, private val savedSearchRepository: SavedSearchRepository,

4
app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt
View File

@ -42,10 +42,10 @@ import eu.kanade.presentation.util.topSmallPaddingValues
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.ui.browse.feed.FeedScreenState import eu.kanade.tachiyomi.ui.browse.feed.FeedScreenState
import exh.savedsearches.models.FeedSavedSearch
import exh.savedsearches.models.SavedSearch
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.model.SavedSearch
import kotlin.time.Duration.Companion.seconds import kotlin.time.Duration.Companion.seconds
data class FeedItemUI( data class FeedItemUI(

4
app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt
View File

@ -22,9 +22,9 @@ import eu.kanade.presentation.components.SearchToolbar
import eu.kanade.presentation.util.plus import eu.kanade.presentation.util.plus
import eu.kanade.presentation.util.topSmallPaddingValues import eu.kanade.presentation.util.topSmallPaddingValues
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import exh.savedsearches.models.FeedSavedSearch
import exh.savedsearches.models.SavedSearch
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.model.SavedSearch
sealed class SourceFeedUI { sealed class SourceFeedUI {
abstract val id: Long abstract val id: Long

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupMergedMangaReference.kt
View File

@ -1,8 +1,8 @@
package eu.kanade.tachiyomi.data.backup.models package eu.kanade.tachiyomi.data.backup.models
import exh.merged.sql.models.MergedMangaReference
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoNumber import kotlinx.serialization.protobuf.ProtoNumber
import tachiyomi.domain.manga.model.MergedMangaReference
/* /*
* SY merged manga backup class * SY merged manga backup class

2
app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt
View File

@ -19,7 +19,6 @@ import eu.kanade.tachiyomi.source.model.copy
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import eu.kanade.tachiyomi.util.shouldDownloadNewChapters import eu.kanade.tachiyomi.util.shouldDownloadNewChapters
import exh.merged.sql.models.MergedMangaReference
import exh.source.MERGED_SOURCE_ID import exh.source.MERGED_SOURCE_ID
import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.async import kotlinx.coroutines.async
@ -30,6 +29,7 @@ import kotlinx.coroutines.sync.withPermit
import okhttp3.Response import okhttp3.Response
import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.model.Chapter
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.MergedMangaReference
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
class MergedSource : HttpSource() { class MergedSource : HttpSource() {

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt
View File

@ -30,8 +30,6 @@ import eu.kanade.tachiyomi.util.lang.withIOContext
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.LocaleHelper import eu.kanade.tachiyomi.util.system.LocaleHelper
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.savedsearches.models.FeedSavedSearch
import exh.savedsearches.models.SavedSearch
import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll import kotlinx.coroutines.awaitAll
@ -49,6 +47,8 @@ import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.domain.manga.model.toMangaUpdate import tachiyomi.domain.manga.model.toMangaUpdate
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.model.SavedSearch
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import xyz.nulldev.ts.api.http.serializer.FilterSerializer import xyz.nulldev.ts.api.http.serializer.FilterSerializer

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
View File

@ -74,8 +74,6 @@ import eu.kanade.tachiyomi.util.removeCovers
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import exh.savedsearches.EXHSavedSearch
import exh.savedsearches.models.SavedSearch
import exh.source.getMainSource import exh.source.getMainSource
import exh.util.nullIfBlank import exh.util.nullIfBlank
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
@ -100,6 +98,8 @@ import logcat.LogPriority
import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.Category
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.toMangaUpdate import tachiyomi.domain.manga.model.toMangaUpdate
import tachiyomi.domain.source.model.EXHSavedSearch
import tachiyomi.domain.source.model.SavedSearch
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import xyz.nulldev.ts.api.http.serializer.FilterSerializer import xyz.nulldev.ts.api.http.serializer.FilterSerializer

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
View File

@ -17,8 +17,8 @@ import eu.kanade.tachiyomi.source.online.all.MangaDex
import eu.kanade.tachiyomi.widget.SimpleNavigationView import eu.kanade.tachiyomi.widget.SimpleNavigationView
import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog
import exh.md.MangaDexFabHeaderAdapter import exh.md.MangaDexFabHeaderAdapter
import exh.savedsearches.EXHSavedSearch
import exh.source.getMainSource import exh.source.getMainSource
import tachiyomi.domain.source.model.EXHSavedSearch
class SourceFilterSheet( class SourceFilterSheet(
context: Context, context: Context,

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreen.kt
View File

@ -26,12 +26,12 @@ import eu.kanade.tachiyomi.ui.browse.source.browse.SourceFilterSheet
import eu.kanade.tachiyomi.ui.manga.MangaScreen import eu.kanade.tachiyomi.ui.manga.MangaScreen
import eu.kanade.tachiyomi.util.lang.launchUI import eu.kanade.tachiyomi.util.lang.launchUI
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import exh.savedsearches.models.SavedSearch
import exh.util.nullIfBlank import exh.util.nullIfBlank
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.source.model.SavedSearch
import xyz.nulldev.ts.api.http.serializer.FilterSerializer import xyz.nulldev.ts.api.http.serializer.FilterSerializer
class SourceFeedScreen(val sourceId: Long) : Screen { class SourceFeedScreen(val sourceId: Long) : Screen {
@ -150,7 +150,7 @@ class SourceFeedScreen(val sourceId: Long) : Screen {
} }
if (search.filterList != null) { if (search.filterList != null) {
screenModel.setFilters(FilterList(search.filterList)) screenModel.setFilters(FilterList(search.filterList!!))
filterSheet?.setFilters(state.filterItems) filterSheet?.setFilters(state.filterItems)
} }
val allDefault = search.filterList != null && state.filters == screenModel.source.getFilterList() val allDefault = search.filterList != null && state.filters == screenModel.source.getFilterList()

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedScreenModel.kt
View File

@ -29,8 +29,6 @@ import eu.kanade.tachiyomi.util.lang.launchNonCancellable
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.savedsearches.models.FeedSavedSearch
import exh.savedsearches.models.SavedSearch
import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll import kotlinx.coroutines.awaitAll
@ -44,6 +42,8 @@ import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import logcat.LogPriority import logcat.LogPriority
import tachiyomi.domain.manga.model.toMangaUpdate import tachiyomi.domain.manga.model.toMangaUpdate
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.model.SavedSearch
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import xyz.nulldev.ts.api.http.serializer.FilterSerializer import xyz.nulldev.ts.api.http.serializer.FilterSerializer

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
View File

@ -38,7 +38,6 @@ import eu.kanade.domain.manga.interactor.SetMangaChapterFlags
import eu.kanade.domain.manga.interactor.SetMangaFilteredScanlators import eu.kanade.domain.manga.interactor.SetMangaFilteredScanlators
import eu.kanade.domain.manga.interactor.UpdateManga import eu.kanade.domain.manga.interactor.UpdateManga
import eu.kanade.domain.manga.interactor.UpdateMergedSettings import eu.kanade.domain.manga.interactor.UpdateMergedSettings
import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate
import eu.kanade.domain.manga.model.PagePreview import eu.kanade.domain.manga.model.PagePreview
import eu.kanade.domain.manga.model.copyFrom import eu.kanade.domain.manga.model.copyFrom
import eu.kanade.domain.manga.model.downloadedFilter import eu.kanade.domain.manga.model.downloadedFilter
@ -85,7 +84,6 @@ import exh.eh.EHentaiUpdateHelper
import exh.log.xLogD import exh.log.xLogD
import exh.md.utils.FollowStatus import exh.md.utils.FollowStatus
import exh.md.utils.MdUtil import exh.md.utils.MdUtil
import exh.merged.sql.models.MergedMangaReference
import exh.metadata.metadata.base.FlatMetadata import exh.metadata.metadata.base.FlatMetadata
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata
import exh.source.MERGED_SOURCE_ID import exh.source.MERGED_SOURCE_ID
@ -115,6 +113,8 @@ import tachiyomi.domain.manga.interactor.SetCustomMangaInfo
import tachiyomi.domain.manga.model.CustomMangaInfo import tachiyomi.domain.manga.model.CustomMangaInfo
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.MangaUpdate import tachiyomi.domain.manga.model.MangaUpdate
import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate
import tachiyomi.domain.manga.model.MergedMangaReference
import tachiyomi.domain.manga.model.TriStateFilter import tachiyomi.domain.manga.model.TriStateFilter
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaHolder.kt
View File

@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.databinding.EditMergedSettingsItemBinding
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.getResourceColor
import exh.merged.sql.models.MergedMangaReference import tachiyomi.domain.manga.model.MergedMangaReference
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedMangaItem.kt
View File

@ -7,8 +7,8 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import eu.davidea.flexibleadapter.items.IFlexible import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.EditMergedSettingsItemBinding import eu.kanade.tachiyomi.databinding.EditMergedSettingsItemBinding
import exh.merged.sql.models.MergedMangaReference
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.MergedMangaReference
class EditMergedMangaItem(val mergedManga: Manga?, val mergedMangaReference: MergedMangaReference) : AbstractFlexibleItem<EditMergedMangaHolder>() { class EditMergedMangaItem(val mergedManga: Manga?, val mergedMangaReference: MergedMangaReference) : AbstractFlexibleItem<EditMergedMangaHolder>() {

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt
View File

@ -27,9 +27,9 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.EditMergedSettingsDialogBinding import eu.kanade.tachiyomi.databinding.EditMergedSettingsDialogBinding
import eu.kanade.tachiyomi.ui.manga.MergedMangaData import eu.kanade.tachiyomi.ui.manga.MergedMangaData
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import exh.merged.sql.models.MergedMangaReference
import exh.source.MERGED_SOURCE_ID import exh.source.MERGED_SOURCE_ID
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.MergedMangaReference
@Stable @Stable
class EditMergedSettingsState( class EditMergedSettingsState(

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsHeaderAdapter.kt
View File

@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.EditMergedSettingsHeaderBinding import eu.kanade.tachiyomi.databinding.EditMergedSettingsHeaderBinding
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import exh.log.xLogD import exh.log.xLogD
import exh.merged.sql.models.MergedMangaReference import tachiyomi.domain.manga.model.MergedMangaReference
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
class EditMergedSettingsHeaderAdapter(private val state: EditMergedSettingsState, adapter: EditMergedMangaAdapter) : RecyclerView.Adapter<EditMergedSettingsHeaderAdapter.HeaderViewHolder>() { class EditMergedSettingsHeaderAdapter(private val state: EditMergedSettingsState, adapter: EditMergedMangaAdapter) : RecyclerView.Adapter<EditMergedSettingsHeaderAdapter.HeaderViewHolder>() {

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
View File

@ -14,8 +14,8 @@ import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter
import eu.kanade.tachiyomi.util.lang.withIOContext import eu.kanade.tachiyomi.util.lang.withIOContext
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.debug.DebugFunctions.readerPrefs import exh.debug.DebugFunctions.readerPrefs
import exh.merged.sql.models.MergedMangaReference
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.MergedMangaReference
/** /**
* Loader used to retrieve the [PageLoader] for a given chapter. * Loader used to retrieve the [PageLoader] for a given chapter.

6
app/src/main/java/exh/EXHMigrations.kt
View File

@ -42,9 +42,6 @@ import eu.kanade.tachiyomi.util.system.DeviceUtil
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import exh.eh.EHentaiUpdateWorker import exh.eh.EHentaiUpdateWorker
import exh.log.xLogE import exh.log.xLogE
import exh.merged.sql.models.MergedMangaReference
import exh.savedsearches.models.FeedSavedSearch
import exh.savedsearches.models.SavedSearch
import exh.source.BlacklistedSources import exh.source.BlacklistedSources
import exh.source.EH_SOURCE_ID import exh.source.EH_SOURCE_ID
import exh.source.HBROWSE_SOURCE_ID import exh.source.HBROWSE_SOURCE_ID
@ -66,6 +63,9 @@ import tachiyomi.data.DatabaseHandler
import tachiyomi.data.category.categoryMapper import tachiyomi.data.category.categoryMapper
import tachiyomi.domain.chapter.model.ChapterUpdate import tachiyomi.domain.chapter.model.ChapterUpdate
import tachiyomi.domain.manga.model.MangaUpdate import tachiyomi.domain.manga.model.MangaUpdate
import tachiyomi.domain.manga.model.MergedMangaReference
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.model.SavedSearch
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy

2
app/src/main/java/exh/favorites/FavoritesSyncHelper.kt
View File

@ -24,7 +24,6 @@ import exh.GalleryAddEvent
import exh.GalleryAdder import exh.GalleryAdder
import exh.eh.EHentaiThrottleManager import exh.eh.EHentaiThrottleManager
import exh.eh.EHentaiUpdateWorker import exh.eh.EHentaiUpdateWorker
import exh.favorites.sql.models.FavoriteEntry
import exh.log.xLog import exh.log.xLog
import exh.source.EH_SOURCE_ID import exh.source.EH_SOURCE_ID
import exh.source.EXH_SOURCE_ID import exh.source.EXH_SOURCE_ID
@ -39,6 +38,7 @@ import okhttp3.FormBody
import okhttp3.Request import okhttp3.Request
import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.Category
import tachiyomi.domain.category.model.CategoryUpdate import tachiyomi.domain.category.model.CategoryUpdate
import tachiyomi.domain.manga.model.FavoriteEntry
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get

2
app/src/main/java/exh/favorites/LocalFavoritesStorage.kt
View File

@ -7,7 +7,6 @@ import eu.kanade.domain.manga.interactor.GetFavorites
import eu.kanade.domain.manga.interactor.InsertFavoriteEntries import eu.kanade.domain.manga.interactor.InsertFavoriteEntries
import eu.kanade.domain.manga.model.toDomainManga import eu.kanade.domain.manga.model.toDomainManga
import eu.kanade.tachiyomi.source.online.all.EHentai import eu.kanade.tachiyomi.source.online.all.EHentai
import exh.favorites.sql.models.FavoriteEntry
import exh.metadata.metadata.EHentaiSearchMetadata import exh.metadata.metadata.EHentaiSearchMetadata
import exh.source.EXH_SOURCE_ID import exh.source.EXH_SOURCE_ID
import exh.source.isEhBasedManga import exh.source.isEhBasedManga
@ -18,6 +17,7 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.mapNotNull
import kotlinx.coroutines.flow.toList import kotlinx.coroutines.flow.toList
import tachiyomi.domain.category.model.Category import tachiyomi.domain.category.model.Category
import tachiyomi.domain.manga.model.FavoriteEntry
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy

2
app/src/main/java/exh/favorites/sql/models/FavoriteEntry.kt → domain/src/main/java/tachiyomi/domain/manga/model/FavoriteEntry.kt
View File

@ -1,4 +1,4 @@
package exh.favorites.sql.models package tachiyomi.domain.manga.model
import exh.metadata.metadata.EHentaiSearchMetadata import exh.metadata.metadata.EHentaiSearchMetadata

2
app/src/main/java/eu/kanade/domain/manga/model/MergeMangaSettingsUpdate.kt → domain/src/main/java/tachiyomi/domain/manga/model/MergeMangaSettingsUpdate.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.domain.manga.model package tachiyomi.domain.manga.model
data class MergeMangaSettingsUpdate( data class MergeMangaSettingsUpdate(
val id: Long, val id: Long,

2
app/src/main/java/exh/merged/sql/models/MergedMangaReference.kt → domain/src/main/java/tachiyomi/domain/manga/model/MergedMangaReference.kt
View File

@ -1,4 +1,4 @@
package exh.merged.sql.models package tachiyomi.domain.manga.model
data class MergedMangaReference( data class MergedMangaReference(
// Tag identifier, unique // Tag identifier, unique

4
app/src/main/java/eu/kanade/domain/manga/repository/FavoritesEntryRepository.kt → domain/src/main/java/tachiyomi/domain/manga/repository/FavoritesEntryRepository.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.domain.manga.repository package tachiyomi.domain.manga.repository
import exh.favorites.sql.models.FavoriteEntry import tachiyomi.domain.manga.model.FavoriteEntry
interface FavoritesEntryRepository { interface FavoritesEntryRepository {
suspend fun deleteAll() suspend fun deleteAll()

6
app/src/main/java/eu/kanade/domain/manga/repository/MangaMergeRepository.kt → domain/src/main/java/tachiyomi/domain/manga/repository/MangaMergeRepository.kt
View File

@ -1,9 +1,9 @@
package eu.kanade.domain.manga.repository package tachiyomi.domain.manga.repository
import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate
import exh.merged.sql.models.MergedMangaReference
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.manga.model.MergeMangaSettingsUpdate
import tachiyomi.domain.manga.model.MergedMangaReference
interface MangaMergeRepository { interface MangaMergeRepository {
suspend fun getMergedManga(): List<Manga> suspend fun getMergedManga(): List<Manga>

2
app/src/main/java/eu/kanade/domain/manga/repository/MangaMetadataRepository.kt → domain/src/main/java/tachiyomi/domain/manga/repository/MangaMetadataRepository.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.domain.manga.repository package tachiyomi.domain.manga.repository
import exh.metadata.metadata.base.FlatMetadata import exh.metadata.metadata.base.FlatMetadata
import exh.metadata.metadata.base.RaisedSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata

2
app/src/main/java/exh/savedsearches/EXHSavedSearch.kt → domain/src/main/java/tachiyomi/domain/source/model/EXHSavedSearch.kt
View File

@ -1,4 +1,4 @@
package exh.savedsearches package tachiyomi.domain.source.model
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList

2
app/src/main/java/exh/savedsearches/models/FeedSavedSearch.kt → domain/src/main/java/tachiyomi/domain/source/model/FeedSavedSearch.kt
View File

@ -1,4 +1,4 @@
package exh.savedsearches.models package tachiyomi.domain.source.model
data class FeedSavedSearch( data class FeedSavedSearch(
// Tag identifier, unique // Tag identifier, unique

2
app/src/main/java/exh/savedsearches/models/SavedSearch.kt → domain/src/main/java/tachiyomi/domain/source/model/SavedSearch.kt
View File

@ -1,4 +1,4 @@
package exh.savedsearches.models package tachiyomi.domain.source.model
data class SavedSearch( data class SavedSearch(
// Tag identifier, unique // Tag identifier, unique

6
app/src/main/java/eu/kanade/domain/source/repository/FeedSavedSearchRepository.kt → domain/src/main/java/tachiyomi/domain/source/repository/FeedSavedSearchRepository.kt
View File

@ -1,8 +1,8 @@
package eu.kanade.domain.source.repository package tachiyomi.domain.source.repository
import exh.savedsearches.models.FeedSavedSearch
import exh.savedsearches.models.SavedSearch
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.source.model.FeedSavedSearch
import tachiyomi.domain.source.model.SavedSearch
interface FeedSavedSearchRepository { interface FeedSavedSearchRepository {

4
app/src/main/java/eu/kanade/domain/source/repository/SavedSearchRepository.kt → domain/src/main/java/tachiyomi/domain/source/repository/SavedSearchRepository.kt
View File

@ -1,7 +1,7 @@
package eu.kanade.domain.source.repository package tachiyomi.domain.source.repository
import exh.savedsearches.models.SavedSearch
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import tachiyomi.domain.source.model.SavedSearch
interface SavedSearchRepository { interface SavedSearchRepository {