From ba68718627e2e95e5b128fb2ab613c0240b08e06 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Sun, 31 Mar 2024 01:08:22 -0400 Subject: [PATCH] Add Old naming to REST interactions --- .../ca/gosyer/jui/data/DataComponent.kt | 40 +++++++++---------- .../backup/interactor/ExportBackupFile.kt | 6 +-- .../backup/interactor/ImportBackupFile.kt | 6 +-- .../backup/interactor/ValidateBackupFile.kt | 6 +-- ...upRepository.kt => BackupRepositoryOld.kt} | 2 +- .../category/interactor/AddMangaToCategory.kt | 8 ++-- .../category/interactor/CreateCategory.kt | 6 +-- .../category/interactor/DeleteCategory.kt | 8 ++-- .../category/interactor/GetCategories.kt | 6 +-- .../category/interactor/GetMangaCategories.kt | 8 ++-- .../interactor/GetMangaListFromCategory.kt | 8 ++-- .../category/interactor/ModifyCategory.kt | 8 ++-- .../interactor/RemoveMangaFromCategory.kt | 8 ++-- .../category/interactor/ReorderCategory.kt | 6 +-- .../category/interactor/UpdateCategoryMeta.kt | 6 +-- ...Repository.kt => CategoryRepositoryOld.kt} | 2 +- .../chapter/interactor/BatchUpdateChapter.kt | 8 ++-- .../interactor/DeleteChapterDownload.kt | 10 ++--- .../domain/chapter/interactor/GetChapter.kt | 10 ++--- .../chapter/interactor/GetChapterPage.kt | 10 ++--- .../domain/chapter/interactor/GetChapters.kt | 8 ++-- .../chapter/interactor/RefreshChapters.kt | 8 ++-- .../interactor/UpdateChapterBookmarked.kt | 10 ++--- .../interactor/UpdateChapterLastPageRead.kt | 10 ++--- .../UpdateChapterMarkPreviousRead.kt | 10 ++--- .../chapter/interactor/UpdateChapterMeta.kt | 6 +-- .../chapter/interactor/UpdateChapterRead.kt | 10 ++--- ...rRepository.kt => ChapterRepositoryOld.kt} | 2 +- .../interactor/BatchChapterDownload.kt | 8 ++-- .../download/interactor/ClearDownloadQueue.kt | 6 +-- .../interactor/QueueChapterDownload.kt | 10 ++--- .../interactor/ReorderChapterDownload.kt | 10 ++--- .../download/interactor/StartDownloading.kt | 6 +-- .../interactor/StopChapterDownload.kt | 10 ++--- .../download/interactor/StopDownloading.kt | 6 +-- ...Repository.kt => DownloadRepositoryOld.kt} | 2 +- .../extension/interactor/GetExtensionList.kt | 6 +-- .../extension/interactor/InstallExtension.kt | 6 +-- .../interactor/InstallExtensionFile.kt | 6 +-- .../interactor/UninstallExtension.kt | 6 +-- .../extension/interactor/UpdateExtension.kt | 6 +-- ...epository.kt => ExtensionRepositoryOld.kt} | 2 +- .../domain/global/interactor/GetGlobalMeta.kt | 6 +-- .../global/interactor/UpdateGlobalMeta.kt | 6 +-- ...alRepository.kt => GlobalRepositoryOld.kt} | 2 +- .../library/interactor/AddMangaToLibrary.kt | 8 ++-- .../interactor/RemoveMangaFromLibrary.kt | 8 ++-- ...yRepository.kt => LibraryRepositoryOld.kt} | 2 +- .../jui/domain/manga/interactor/GetManga.kt | 8 ++-- .../domain/manga/interactor/GetMangaFull.kt | 8 ++-- .../domain/manga/interactor/RefreshManga.kt | 8 ++-- .../manga/interactor/RefreshMangaFull.kt | 8 ++-- .../manga/interactor/UpdateMangaMeta.kt | 6 +-- ...ngaRepository.kt => MangaRepositoryOld.kt} | 2 +- .../domain/source/interactor/GetFilterList.kt | 8 ++-- .../source/interactor/GetLatestManga.kt | 8 ++-- .../source/interactor/GetPopularManga.kt | 8 ++-- .../source/interactor/GetQuickSearchManga.kt | 8 ++-- .../source/interactor/GetSearchManga.kt | 8 ++-- .../domain/source/interactor/GetSourceList.kt | 6 +-- .../source/interactor/GetSourceSettings.kt | 8 ++-- .../source/interactor/SetSourceFilter.kt | 12 +++--- .../source/interactor/SetSourceSetting.kt | 8 ++-- ...ceRepository.kt => SourceRepositoryOld.kt} | 2 +- .../updates/interactor/GetRecentUpdates.kt | 6 +-- .../updates/interactor/UpdateCategory.kt | 8 ++-- .../updates/interactor/UpdateLibrary.kt | 6 +-- ...sRepository.kt => UpdatesRepositoryOld.kt} | 2 +- 68 files changed, 248 insertions(+), 248 deletions(-) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/service/{BackupRepository.kt => BackupRepositoryOld.kt} (98%) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/service/{CategoryRepository.kt => CategoryRepositoryOld.kt} (98%) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/{ChapterRepository.kt => ChapterRepositoryOld.kt} (98%) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/service/{DownloadRepository.kt => DownloadRepositoryOld.kt} (98%) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/service/{ExtensionRepository.kt => ExtensionRepositoryOld.kt} (98%) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/service/{GlobalRepository.kt => GlobalRepositoryOld.kt} (96%) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/{LibraryRepository.kt => LibraryRepositoryOld.kt} (95%) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/service/{MangaRepository.kt => MangaRepositoryOld.kt} (98%) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/service/{SourceRepository.kt => SourceRepositoryOld.kt} (99%) rename domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/service/{UpdatesRepository.kt => UpdatesRepositoryOld.kt} (96%) diff --git a/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt index a91df047..cc5cd9fa 100644 --- a/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt +++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt @@ -8,20 +8,20 @@ package ca.gosyer.jui.data import ca.gosyer.jui.core.lang.addSuffix import ca.gosyer.jui.data.settings.SettingsRepositoryImpl -import ca.gosyer.jui.domain.backup.service.BackupRepository -import ca.gosyer.jui.domain.category.service.CategoryRepository -import ca.gosyer.jui.domain.chapter.service.ChapterRepository -import ca.gosyer.jui.domain.download.service.DownloadRepository -import ca.gosyer.jui.domain.extension.service.ExtensionRepository -import ca.gosyer.jui.domain.global.service.GlobalRepository -import ca.gosyer.jui.domain.library.service.LibraryRepository -import ca.gosyer.jui.domain.manga.service.MangaRepository +import ca.gosyer.jui.domain.backup.service.BackupRepositoryOld +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld +import ca.gosyer.jui.domain.download.service.DownloadRepositoryOld +import ca.gosyer.jui.domain.extension.service.ExtensionRepositoryOld +import ca.gosyer.jui.domain.global.service.GlobalRepositoryOld +import ca.gosyer.jui.domain.library.service.LibraryRepositoryOld +import ca.gosyer.jui.domain.manga.service.MangaRepositoryOld import ca.gosyer.jui.domain.server.Http import ca.gosyer.jui.domain.server.service.ServerPreferences import ca.gosyer.jui.domain.settings.service.SettingsRepository import ca.gosyer.jui.domain.settings.service.SettingsRepositoryOld -import ca.gosyer.jui.domain.source.service.SourceRepository -import ca.gosyer.jui.domain.updates.service.UpdatesRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld +import ca.gosyer.jui.domain.updates.service.UpdatesRepositoryOld import com.apollographql.apollo3.ApolloClient import com.apollographql.apollo3.annotations.ApolloExperimental import com.apollographql.apollo3.network.ktorClient @@ -57,37 +57,37 @@ interface DataComponent { .build() @Provides - fun backupRepository(ktorfit: Ktorfit) = ktorfit.create() + fun backupRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides - fun categoryRepository(ktorfit: Ktorfit) = ktorfit.create() + fun categoryRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides - fun chapterRepository(ktorfit: Ktorfit) = ktorfit.create() + fun chapterRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides - fun downloadRepository(ktorfit: Ktorfit) = ktorfit.create() + fun downloadRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides - fun extensionRepository(ktorfit: Ktorfit) = ktorfit.create() + fun extensionRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides - fun globalRepository(ktorfit: Ktorfit) = ktorfit.create() + fun globalRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides - fun libraryRepository(ktorfit: Ktorfit) = ktorfit.create() + fun libraryRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides - fun mangaRepository(ktorfit: Ktorfit) = ktorfit.create() + fun mangaRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides fun settingsRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides - fun sourceRepository(ktorfit: Ktorfit) = ktorfit.create() + fun sourceRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides - fun updatesRepository(ktorfit: Ktorfit) = ktorfit.create() + fun updatesRepositoryOld(ktorfit: Ktorfit) = ktorfit.create() @Provides fun settingsRepository(apolloClient: ApolloClient): SettingsRepository = SettingsRepositoryImpl(apolloClient) diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ExportBackupFile.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ExportBackupFile.kt index f8948197..68dc9bf2 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ExportBackupFile.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ExportBackupFile.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.backup.interactor -import ca.gosyer.jui.domain.backup.service.BackupRepository +import ca.gosyer.jui.domain.backup.service.BackupRepositoryOld import io.ktor.client.request.HttpRequestBuilder import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class ExportBackupFile @Inject constructor( - private val backupRepository: BackupRepository, + private val backupRepositoryOld: BackupRepositoryOld, ) { suspend fun await( block: HttpRequestBuilder.() -> Unit = {}, @@ -28,7 +28,7 @@ class ExportBackupFile } .singleOrNull() - fun asFlow(block: HttpRequestBuilder.() -> Unit = {}) = backupRepository.exportBackupFile(block) + fun asFlow(block: HttpRequestBuilder.() -> Unit = {}) = backupRepositoryOld.exportBackupFile(block) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ImportBackupFile.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ImportBackupFile.kt index 96843b6f..64982282 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ImportBackupFile.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ImportBackupFile.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.backup.interactor -import ca.gosyer.jui.domain.backup.service.BackupRepository +import ca.gosyer.jui.domain.backup.service.BackupRepositoryOld import io.ktor.client.request.HttpRequestBuilder import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull @@ -17,7 +17,7 @@ import org.lighthousegames.logging.logging class ImportBackupFile @Inject constructor( - private val backupRepository: BackupRepository, + private val backupRepositoryOld: BackupRepositoryOld, ) { suspend fun await( file: Path, @@ -33,7 +33,7 @@ class ImportBackupFile fun asFlow( file: Path, block: HttpRequestBuilder.() -> Unit = {}, - ) = backupRepository.importBackupFile(BackupRepository.buildBackupFormData(file), block) + ) = backupRepositoryOld.importBackupFile(BackupRepositoryOld.buildBackupFormData(file), block) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ValidateBackupFile.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ValidateBackupFile.kt index dbe0f8a0..e5eac143 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ValidateBackupFile.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/interactor/ValidateBackupFile.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.backup.interactor -import ca.gosyer.jui.domain.backup.service.BackupRepository +import ca.gosyer.jui.domain.backup.service.BackupRepositoryOld import io.ktor.client.request.HttpRequestBuilder import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull @@ -17,7 +17,7 @@ import org.lighthousegames.logging.logging class ValidateBackupFile @Inject constructor( - private val backupRepository: BackupRepository, + private val backupRepositoryOld: BackupRepositoryOld, ) { suspend fun await( file: Path, @@ -33,7 +33,7 @@ class ValidateBackupFile fun asFlow( file: Path, block: HttpRequestBuilder.() -> Unit = {}, - ) = backupRepository.validateBackupFile(BackupRepository.buildBackupFormData(file), block) + ) = backupRepositoryOld.validateBackupFile(BackupRepositoryOld.buildBackupFormData(file), block) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/service/BackupRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/service/BackupRepositoryOld.kt similarity index 98% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/service/BackupRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/service/BackupRepositoryOld.kt index 7e98de74..af1c076c 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/service/BackupRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/backup/service/BackupRepositoryOld.kt @@ -25,7 +25,7 @@ import okio.FileSystem import okio.Path import okio.buffer -interface BackupRepository { +interface BackupRepositoryOld { @Multipart @POST("api/v1/backup/import/file") fun importBackupFile( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/AddMangaToCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/AddMangaToCategory.kt index 78bd23bc..ff1903e0 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/AddMangaToCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/AddMangaToCategory.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.category.model.Category -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -20,7 +20,7 @@ import org.lighthousegames.logging.logging class AddMangaToCategory @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -49,7 +49,7 @@ class AddMangaToCategory mangaId: Long, categoryId: Long, ) = if (categoryId != 0L) { - categoryRepository.addMangaToCategory(mangaId, categoryId) + categoryRepositoryOld.addMangaToCategory(mangaId, categoryId) .map { serverListeners.updateCategoryManga(categoryId) } } else { flow { @@ -62,7 +62,7 @@ class AddMangaToCategory manga: Manga, category: Category, ) = if (category.id != 0L) { - categoryRepository.addMangaToCategory(manga.id, category.id) + categoryRepositoryOld.addMangaToCategory(manga.id, category.id) .map { serverListeners.updateCategoryManga(category.id) } } else { flow { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/CreateCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/CreateCategory.kt index 80c36d7a..66d49fb6 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/CreateCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/CreateCategory.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.category.interactor -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class CreateCategory @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, ) { suspend fun await( name: String, @@ -27,7 +27,7 @@ class CreateCategory } .collect() - fun asFlow(name: String) = categoryRepository.createCategory(name) + fun asFlow(name: String) = categoryRepositoryOld.createCategory(name) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/DeleteCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/DeleteCategory.kt index 0704cc75..faefe450 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/DeleteCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/DeleteCategory.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.model.Category -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class DeleteCategory @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, ) { suspend fun await( categoryId: Long, @@ -38,9 +38,9 @@ class DeleteCategory } .collect() - fun asFlow(categoryId: Long) = categoryRepository.deleteCategory(categoryId) + fun asFlow(categoryId: Long) = categoryRepositoryOld.deleteCategory(categoryId) - fun asFlow(category: Category) = categoryRepository.deleteCategory(category.id) + fun asFlow(category: Category) = categoryRepositoryOld.deleteCategory(category.id) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetCategories.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetCategories.kt index 7841d13a..822ca8b1 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetCategories.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetCategories.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.category.interactor -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.singleOrNull @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class GetCategories @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, ) { suspend fun await( dropDefault: Boolean = false, @@ -29,7 +29,7 @@ class GetCategories .singleOrNull() fun asFlow(dropDefault: Boolean = false) = - categoryRepository.getCategories() + categoryRepositoryOld.getCategories() .map { categories -> if (dropDefault) { categories.filterNot { it.name.equals("default", true) } diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaCategories.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaCategories.kt index 1ed44476..3a873764 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaCategories.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaCategories.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.category.interactor -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class GetMangaCategories @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, ) { suspend fun await( mangaId: Long, @@ -38,9 +38,9 @@ class GetMangaCategories } .singleOrNull() - fun asFlow(mangaId: Long) = categoryRepository.getMangaCategories(mangaId) + fun asFlow(mangaId: Long) = categoryRepositoryOld.getMangaCategories(mangaId) - fun asFlow(manga: Manga) = categoryRepository.getMangaCategories(manga.id) + fun asFlow(manga: Manga) = categoryRepositoryOld.getMangaCategories(manga.id) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaListFromCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaListFromCategory.kt index 2f8d0559..04e80a2f 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaListFromCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/GetMangaListFromCategory.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.category.model.Category -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import kotlinx.coroutines.flow.take @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class GetMangaListFromCategory @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -45,12 +45,12 @@ class GetMangaListFromCategory fun asFlow(categoryId: Long) = serverListeners.combineCategoryManga( - categoryRepository.getMangaFromCategory(categoryId), + categoryRepositoryOld.getMangaFromCategory(categoryId), ) { categoryId == it } fun asFlow(category: Category) = serverListeners.combineCategoryManga( - categoryRepository.getMangaFromCategory(category.id), + categoryRepositoryOld.getMangaFromCategory(category.id), ) { category.id == it } companion object { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ModifyCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ModifyCategory.kt index 7864b9c1..6c574efa 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ModifyCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ModifyCategory.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.model.Category -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class ModifyCategory @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, ) { suspend fun await( categoryId: Long, @@ -45,7 +45,7 @@ class ModifyCategory fun asFlow( categoryId: Long, name: String, - ) = categoryRepository.modifyCategory( + ) = categoryRepositoryOld.modifyCategory( categoryId = categoryId, name = name, ) @@ -53,7 +53,7 @@ class ModifyCategory fun asFlow( category: Category, name: String? = null, - ) = categoryRepository.modifyCategory( + ) = categoryRepositoryOld.modifyCategory( categoryId = category.id, name = name ?: category.name, ) diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/RemoveMangaFromCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/RemoveMangaFromCategory.kt index e69fa7b0..b4a32b9b 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/RemoveMangaFromCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/RemoveMangaFromCategory.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.category.model.Category -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -20,7 +20,7 @@ import org.lighthousegames.logging.logging class RemoveMangaFromCategory @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -49,7 +49,7 @@ class RemoveMangaFromCategory mangaId: Long, categoryId: Long, ) = if (categoryId != 0L) { - categoryRepository.removeMangaFromCategory(mangaId, categoryId) + categoryRepositoryOld.removeMangaFromCategory(mangaId, categoryId) .map { serverListeners.updateCategoryManga(categoryId) } } else { flow { @@ -62,7 +62,7 @@ class RemoveMangaFromCategory manga: Manga, category: Category, ) = if (category.id != 0L) { - categoryRepository.removeMangaFromCategory(manga.id, category.id) + categoryRepositoryOld.removeMangaFromCategory(manga.id, category.id) .map { serverListeners.updateCategoryManga(category.id) } } else { flow { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ReorderCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ReorderCategory.kt index 9f3ceeec..617b60eb 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ReorderCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/ReorderCategory.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.category.interactor -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class ReorderCategory @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, ) { suspend fun await( to: Int, @@ -31,7 +31,7 @@ class ReorderCategory fun asFlow( to: Int, from: Int, - ) = categoryRepository.reorderCategory(to, from) + ) = categoryRepositoryOld.reorderCategory(to, from) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/UpdateCategoryMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/UpdateCategoryMeta.kt index 21f91de9..d38833a6 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/UpdateCategoryMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/interactor/UpdateCategoryMeta.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.category.interactor import ca.gosyer.jui.domain.category.model.Category -import ca.gosyer.jui.domain.category.service.CategoryRepository +import ca.gosyer.jui.domain.category.service.CategoryRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow @@ -17,7 +17,7 @@ import org.lighthousegames.logging.logging class UpdateCategoryMeta @Inject constructor( - private val categoryRepository: CategoryRepository, + private val categoryRepositoryOld: CategoryRepositoryOld, ) { suspend fun await( category: Category, @@ -35,7 +35,7 @@ class UpdateCategoryMeta example: Int = category.meta.example, ) = flow { if (example != category.meta.example) { - categoryRepository.updateCategoryMeta( + categoryRepositoryOld.updateCategoryMeta( category.id, "example", example.toString(), diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/service/CategoryRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/service/CategoryRepositoryOld.kt similarity index 98% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/service/CategoryRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/service/CategoryRepositoryOld.kt index 6c05b119..e822372a 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/service/CategoryRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/category/service/CategoryRepositoryOld.kt @@ -18,7 +18,7 @@ import de.jensklingenberg.ktorfit.http.Path import io.ktor.client.statement.HttpResponse import kotlinx.coroutines.flow.Flow -interface CategoryRepository { +interface CategoryRepositoryOld { @GET("api/v1/manga/{mangaId}/category/") fun getMangaCategories( @Path("mangaId") mangaId: Long, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/BatchUpdateChapter.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/BatchUpdateChapter.kt index e0e5b019..0528e3aa 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/BatchUpdateChapter.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/BatchUpdateChapter.kt @@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.chapter.model.Chapter import ca.gosyer.jui.domain.chapter.model.ChapterBatchEditInput import ca.gosyer.jui.domain.chapter.model.ChapterChange import ca.gosyer.jui.domain.chapter.model.MangaChapterBatchEditInput -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -23,7 +23,7 @@ import kotlin.jvm.JvmName class BatchUpdateChapter @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { @JvmName("awaitChapters") @@ -222,7 +222,7 @@ class BatchUpdateChapter lastPageRead: Int? = null, delete: Boolean? = null, ) = if (mangaId != null) { - chapterRepository.batchUpdateChapter( + chapterRepositoryOld.batchUpdateChapter( mangaId, MangaChapterBatchEditInput( chapterIds = chapterIds, @@ -235,7 +235,7 @@ class BatchUpdateChapter ), ) } else { - chapterRepository.batchUpdateChapter( + chapterRepositoryOld.batchUpdateChapter( ChapterBatchEditInput( chapterIds = chapterIds, change = ChapterChange( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/DeleteChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/DeleteChapterDownload.kt index a56841e2..0bfdf0bd 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/DeleteChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/DeleteChapterDownload.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -19,7 +19,7 @@ import org.lighthousegames.logging.logging class DeleteChapterDownload @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -57,17 +57,17 @@ class DeleteChapterDownload fun asFlow( mangaId: Long, index: Int, - ) = chapterRepository.deleteChapterDownload(mangaId, index) + ) = chapterRepositoryOld.deleteChapterDownload(mangaId, index) .onEach { serverListeners.updateChapters(mangaId, index) } fun asFlow( manga: Manga, index: Int, - ) = chapterRepository.deleteChapterDownload(manga.id, index) + ) = chapterRepositoryOld.deleteChapterDownload(manga.id, index) .onEach { serverListeners.updateChapters(manga.id, index) } fun asFlow(chapter: Chapter) = - chapterRepository.deleteChapterDownload(chapter.mangaId, chapter.index) + chapterRepositoryOld.deleteChapterDownload(chapter.mangaId, chapter.index) .onEach { serverListeners.updateChapters(chapter.mangaId, chapter.index) } companion object { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapter.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapter.kt index 9ec587fc..217d8c3a 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapter.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapter.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull @@ -19,7 +19,7 @@ import org.lighthousegames.logging.logging class GetChapter @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -61,7 +61,7 @@ class GetChapter mangaId: Long, index: Int, ) = serverListeners.combineChapters( - chapterRepository.getChapter(mangaId, index), + chapterRepositoryOld.getChapter(mangaId, index), indexPredate = { id, chapterIndexes -> id == mangaId && (chapterIndexes == null || index in chapterIndexes) }, @@ -72,7 +72,7 @@ class GetChapter manga: Manga, index: Int, ) = serverListeners.combineChapters( - chapterRepository.getChapter(manga.id, index), + chapterRepositoryOld.getChapter(manga.id, index), indexPredate = { id, chapterIndexes -> id == manga.id && (chapterIndexes == null || index in chapterIndexes) }, @@ -81,7 +81,7 @@ class GetChapter fun asFlow(chapter: Chapter) = serverListeners.combineChapters( - chapterRepository.getChapter(chapter.mangaId, chapter.index), + chapterRepositoryOld.getChapter(chapter.mangaId, chapter.index), indexPredate = { id, chapterIndexes -> id == chapter.mangaId && (chapterIndexes == null || chapter.index in chapterIndexes) }, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapterPage.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapterPage.kt index de2958d0..db982cb9 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapterPage.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapterPage.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import io.ktor.client.request.HttpRequestBuilder import kotlinx.coroutines.flow.catch @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class GetChapterPage @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, ) { suspend fun await( mangaId: Long, @@ -63,20 +63,20 @@ class GetChapterPage index: Int, pageNum: Int, block: HttpRequestBuilder.() -> Unit, - ) = chapterRepository.getPage(mangaId, index, pageNum, block) + ) = chapterRepositoryOld.getPage(mangaId, index, pageNum, block) fun asFlow( manga: Manga, index: Int, pageNum: Int, block: HttpRequestBuilder.() -> Unit, - ) = chapterRepository.getPage(manga.id, index, pageNum, block) + ) = chapterRepositoryOld.getPage(manga.id, index, pageNum, block) fun asFlow( chapter: Chapter, pageNum: Int, block: HttpRequestBuilder.() -> Unit, - ) = chapterRepository.getPage(chapter.mangaId, chapter.index, pageNum, block) + ) = chapterRepositoryOld.getPage(chapter.mangaId, chapter.index, pageNum, block) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapters.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapters.kt index f9995e21..b91fc9c3 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapters.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/GetChapters.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class GetChapters @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -45,14 +45,14 @@ class GetChapters fun asFlow(mangaId: Long) = serverListeners.combineChapters( - chapterRepository.getChapters(mangaId), + chapterRepositoryOld.getChapters(mangaId), indexPredate = { id, _ -> id == mangaId }, idPredate = { id, _ -> id == mangaId }, ) fun asFlow(manga: Manga) = serverListeners.combineChapters( - chapterRepository.getChapters(manga.id), + chapterRepositoryOld.getChapters(manga.id), indexPredate = { id, _ -> id == manga.id }, idPredate = { id, _ -> id == manga.id }, ) diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/RefreshChapters.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/RefreshChapters.kt index c5e3d15a..3aaaf90a 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/RefreshChapters.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/RefreshChapters.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class RefreshChapters @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -42,11 +42,11 @@ class RefreshChapters .singleOrNull() fun asFlow(mangaId: Long) = - chapterRepository.getChapters(mangaId, true) + chapterRepositoryOld.getChapters(mangaId, true) .onEach { serverListeners.updateChapters(mangaId) } fun asFlow(manga: Manga) = - chapterRepository.getChapters(manga.id, true) + chapterRepositoryOld.getChapters(manga.id, true) .onEach { serverListeners.updateChapters(manga.id) } companion object { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterBookmarked.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterBookmarked.kt index 4d9cffa7..e507ecd1 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterBookmarked.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterBookmarked.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -19,7 +19,7 @@ import org.lighthousegames.logging.logging class UpdateChapterBookmarked @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -61,7 +61,7 @@ class UpdateChapterBookmarked mangaId: Long, index: Int, bookmarked: Boolean, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = mangaId, chapterIndex = index, bookmarked = bookmarked, @@ -71,7 +71,7 @@ class UpdateChapterBookmarked manga: Manga, index: Int, bookmarked: Boolean, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = manga.id, chapterIndex = index, bookmarked = bookmarked, @@ -80,7 +80,7 @@ class UpdateChapterBookmarked fun asFlow( chapter: Chapter, bookmarked: Boolean, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = chapter.mangaId, chapterIndex = chapter.index, bookmarked = bookmarked, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterLastPageRead.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterLastPageRead.kt index 0bf93e75..26976ace 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterLastPageRead.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterLastPageRead.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -19,7 +19,7 @@ import org.lighthousegames.logging.logging class UpdateChapterLastPageRead @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -61,7 +61,7 @@ class UpdateChapterLastPageRead mangaId: Long, index: Int, lastPageRead: Int, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = mangaId, chapterIndex = index, lastPageRead = lastPageRead, @@ -71,7 +71,7 @@ class UpdateChapterLastPageRead manga: Manga, index: Int, lastPageRead: Int, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = manga.id, chapterIndex = index, lastPageRead = lastPageRead, @@ -80,7 +80,7 @@ class UpdateChapterLastPageRead fun asFlow( chapter: Chapter, lastPageRead: Int, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = chapter.mangaId, chapterIndex = chapter.index, lastPageRead = lastPageRead, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMarkPreviousRead.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMarkPreviousRead.kt index 5626011c..358de164 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMarkPreviousRead.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMarkPreviousRead.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -19,7 +19,7 @@ import org.lighthousegames.logging.logging class UpdateChapterMarkPreviousRead @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -57,7 +57,7 @@ class UpdateChapterMarkPreviousRead fun asFlow( mangaId: Long, index: Int, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = mangaId, chapterIndex = index, markPreviousRead = true, @@ -66,14 +66,14 @@ class UpdateChapterMarkPreviousRead fun asFlow( manga: Manga, index: Int, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = manga.id, chapterIndex = index, markPreviousRead = true, ).onEach { serverListeners.updateChapters(manga.id, index) } fun asFlow(chapter: Chapter) = - chapterRepository.updateChapter( + chapterRepositoryOld.updateChapter( mangaId = chapter.mangaId, chapterIndex = chapter.index, markPreviousRead = true, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMeta.kt index 60cbe962..a68bce03 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterMeta.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class UpdateChapterMeta @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -37,7 +37,7 @@ class UpdateChapterMeta pageOffset: Int = chapter.meta.juiPageOffset, ) = flow { if (pageOffset != chapter.meta.juiPageOffset) { - chapterRepository.updateChapterMeta( + chapterRepositoryOld.updateChapterMeta( chapter.mangaId, chapter.index, "juiPageOffset", diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterRead.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterRead.kt index 46c12af2..705fe91f 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterRead.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/interactor/UpdateChapterRead.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.chapter.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.chapter.service.ChapterRepository +import ca.gosyer.jui.domain.chapter.service.ChapterRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -19,7 +19,7 @@ import org.lighthousegames.logging.logging class UpdateChapterRead @Inject constructor( - private val chapterRepository: ChapterRepository, + private val chapterRepositoryOld: ChapterRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -61,7 +61,7 @@ class UpdateChapterRead mangaId: Long, index: Int, read: Boolean, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = mangaId, chapterIndex = index, read = read, @@ -71,7 +71,7 @@ class UpdateChapterRead manga: Manga, index: Int, read: Boolean, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = manga.id, chapterIndex = index, read = read, @@ -80,7 +80,7 @@ class UpdateChapterRead fun asFlow( chapter: Chapter, read: Boolean, - ) = chapterRepository.updateChapter( + ) = chapterRepositoryOld.updateChapter( mangaId = chapter.mangaId, chapterIndex = chapter.index, read = read, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepositoryOld.kt similarity index 98% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepositoryOld.kt index 940537b3..ed6a2ff0 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/chapter/service/ChapterRepositoryOld.kt @@ -24,7 +24,7 @@ import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.statement.HttpResponse import kotlinx.coroutines.flow.Flow -interface ChapterRepository { +interface ChapterRepositoryOld { @GET("api/v1/manga/{mangaId}/chapters") fun getChapters( @Path("mangaId") mangaId: Long, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt index 78299023..7f4b3424 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/BatchChapterDownload.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.download.model.DownloadEnqueue -import ca.gosyer.jui.domain.download.service.DownloadRepository +import ca.gosyer.jui.domain.download.service.DownloadRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class BatchChapterDownload @Inject constructor( - private val downloadRepository: DownloadRepository, + private val downloadRepositoryOld: DownloadRepositoryOld, ) { suspend fun await( chapterIds: List, @@ -38,9 +38,9 @@ class BatchChapterDownload } .collect() - fun asFlow(chapterIds: List) = downloadRepository.batchDownload(DownloadEnqueue(chapterIds)) + fun asFlow(chapterIds: List) = downloadRepositoryOld.batchDownload(DownloadEnqueue(chapterIds)) - fun asFlow(vararg chapterIds: Long) = downloadRepository.batchDownload(DownloadEnqueue(chapterIds.asList())) + fun asFlow(vararg chapterIds: Long) = downloadRepositoryOld.batchDownload(DownloadEnqueue(chapterIds.asList())) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ClearDownloadQueue.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ClearDownloadQueue.kt index 28352181..e2f4fdd5 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ClearDownloadQueue.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ClearDownloadQueue.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.download.interactor -import ca.gosyer.jui.domain.download.service.DownloadRepository +import ca.gosyer.jui.domain.download.service.DownloadRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class ClearDownloadQueue @Inject constructor( - private val downloadRepository: DownloadRepository, + private val downloadRepositoryOld: DownloadRepositoryOld, ) { suspend fun await(onError: suspend (Throwable) -> Unit = {}) = asFlow() @@ -25,7 +25,7 @@ class ClearDownloadQueue } .collect() - fun asFlow() = downloadRepository.clearDownloadQueue() + fun asFlow() = downloadRepositoryOld.clearDownloadQueue() companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt index 8eebf3a7..945401bb 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/QueueChapterDownload.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.download.service.DownloadRepository +import ca.gosyer.jui.domain.download.service.DownloadRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -17,7 +17,7 @@ import org.lighthousegames.logging.logging class QueueChapterDownload @Inject constructor( - private val downloadRepository: DownloadRepository, + private val downloadRepositoryOld: DownloadRepositoryOld, ) { suspend fun await( mangaId: Long, @@ -54,14 +54,14 @@ class QueueChapterDownload fun asFlow( mangaId: Long, index: Int, - ) = downloadRepository.queueChapterDownload(mangaId, index) + ) = downloadRepositoryOld.queueChapterDownload(mangaId, index) fun asFlow( manga: Manga, index: Int, - ) = downloadRepository.queueChapterDownload(manga.id, index) + ) = downloadRepositoryOld.queueChapterDownload(manga.id, index) - fun asFlow(chapter: Chapter) = downloadRepository.queueChapterDownload(chapter.mangaId, chapter.index) + fun asFlow(chapter: Chapter) = downloadRepositoryOld.queueChapterDownload(chapter.mangaId, chapter.index) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ReorderChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ReorderChapterDownload.kt index bd45980c..38a20362 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ReorderChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/ReorderChapterDownload.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.download.service.DownloadRepository +import ca.gosyer.jui.domain.download.service.DownloadRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -17,7 +17,7 @@ import org.lighthousegames.logging.logging class ReorderChapterDownload @Inject constructor( - private val downloadRepository: DownloadRepository, + private val downloadRepositoryOld: DownloadRepositoryOld, ) { suspend fun await( mangaId: Long, @@ -58,18 +58,18 @@ class ReorderChapterDownload mangaId: Long, index: Int, to: Int, - ) = downloadRepository.reorderChapterDownload(mangaId, index, to) + ) = downloadRepositoryOld.reorderChapterDownload(mangaId, index, to) fun asFlow( manga: Manga, index: Int, to: Int, - ) = downloadRepository.reorderChapterDownload(manga.id, index, to) + ) = downloadRepositoryOld.reorderChapterDownload(manga.id, index, to) fun asFlow( chapter: Chapter, to: Int, - ) = downloadRepository.reorderChapterDownload(chapter.mangaId, chapter.index, to) + ) = downloadRepositoryOld.reorderChapterDownload(chapter.mangaId, chapter.index, to) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StartDownloading.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StartDownloading.kt index c15e3a3f..a0727bbd 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StartDownloading.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StartDownloading.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.download.interactor -import ca.gosyer.jui.domain.download.service.DownloadRepository +import ca.gosyer.jui.domain.download.service.DownloadRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class StartDownloading @Inject constructor( - private val downloadRepository: DownloadRepository, + private val downloadRepositoryOld: DownloadRepositoryOld, ) { suspend fun await(onError: suspend (Throwable) -> Unit = {}) = asFlow() @@ -25,7 +25,7 @@ class StartDownloading } .collect() - fun asFlow() = downloadRepository.startDownloading() + fun asFlow() = downloadRepositoryOld.startDownloading() companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt index d6525b44..e12a390e 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopChapterDownload.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.download.interactor import ca.gosyer.jui.domain.chapter.model.Chapter -import ca.gosyer.jui.domain.download.service.DownloadRepository +import ca.gosyer.jui.domain.download.service.DownloadRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect @@ -17,7 +17,7 @@ import org.lighthousegames.logging.logging class StopChapterDownload @Inject constructor( - private val downloadRepository: DownloadRepository, + private val downloadRepositoryOld: DownloadRepositoryOld, ) { suspend fun await( mangaId: Long, @@ -54,14 +54,14 @@ class StopChapterDownload fun asFlow( mangaId: Long, index: Int, - ) = downloadRepository.stopChapterDownload(mangaId, index) + ) = downloadRepositoryOld.stopChapterDownload(mangaId, index) fun asFlow( manga: Manga, index: Int, - ) = downloadRepository.stopChapterDownload(manga.id, index) + ) = downloadRepositoryOld.stopChapterDownload(manga.id, index) - fun asFlow(chapter: Chapter) = downloadRepository.stopChapterDownload(chapter.mangaId, chapter.index) + fun asFlow(chapter: Chapter) = downloadRepositoryOld.stopChapterDownload(chapter.mangaId, chapter.index) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopDownloading.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopDownloading.kt index a43e8769..6c2ec9cd 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopDownloading.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/interactor/StopDownloading.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.download.interactor -import ca.gosyer.jui.domain.download.service.DownloadRepository +import ca.gosyer.jui.domain.download.service.DownloadRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class StopDownloading @Inject constructor( - private val downloadRepository: DownloadRepository, + private val downloadRepositoryOld: DownloadRepositoryOld, ) { suspend fun await(onError: suspend (Throwable) -> Unit = {}) = asFlow() @@ -25,7 +25,7 @@ class StopDownloading } .collect() - fun asFlow() = downloadRepository.stopDownloading() + fun asFlow() = downloadRepositoryOld.stopDownloading() companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/service/DownloadRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/service/DownloadRepositoryOld.kt similarity index 98% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/service/DownloadRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/service/DownloadRepositoryOld.kt index 16cc02fa..7c276daa 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/service/DownloadRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/download/service/DownloadRepositoryOld.kt @@ -17,7 +17,7 @@ import de.jensklingenberg.ktorfit.http.Path import io.ktor.client.statement.HttpResponse import kotlinx.coroutines.flow.Flow -interface DownloadRepository { +interface DownloadRepositoryOld { @GET("api/v1/downloads/start") fun startDownloading(): Flow diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/GetExtensionList.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/GetExtensionList.kt index c1f535eb..cff914ad 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/GetExtensionList.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/GetExtensionList.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.extension.interactor -import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import ca.gosyer.jui.domain.extension.service.ExtensionRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class GetExtensionList @Inject constructor( - private val extensionRepository: ExtensionRepository, + private val extensionRepositoryOld: ExtensionRepositoryOld, ) { suspend fun await(onError: suspend (Throwable) -> Unit = {}) = asFlow() @@ -25,7 +25,7 @@ class GetExtensionList } .singleOrNull() - fun asFlow() = extensionRepository.getExtensionList() + fun asFlow() = extensionRepositoryOld.getExtensionList() companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtension.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtension.kt index cb157c18..040ad994 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtension.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtension.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.extension.interactor import ca.gosyer.jui.domain.extension.model.Extension -import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import ca.gosyer.jui.domain.extension.service.ExtensionRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class InstallExtension @Inject constructor( - private val extensionRepository: ExtensionRepository, + private val extensionRepositoryOld: ExtensionRepositoryOld, ) { suspend fun await( extension: Extension, @@ -28,7 +28,7 @@ class InstallExtension } .collect() - fun asFlow(extension: Extension) = extensionRepository.installExtension(extension.pkgName) + fun asFlow(extension: Extension) = extensionRepositoryOld.installExtension(extension.pkgName) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtensionFile.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtensionFile.kt index 28a4f38d..67479148 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtensionFile.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/InstallExtensionFile.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.extension.interactor -import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import ca.gosyer.jui.domain.extension.service.ExtensionRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class InstallExtensionFile @Inject constructor( - private val extensionRepository: ExtensionRepository, + private val extensionRepositoryOld: ExtensionRepositoryOld, ) { suspend fun await( path: Path, @@ -28,7 +28,7 @@ class InstallExtensionFile } .collect() - fun asFlow(path: Path) = extensionRepository.installExtension(ExtensionRepository.buildExtensionFormData(path)) + fun asFlow(path: Path) = extensionRepositoryOld.installExtension(ExtensionRepositoryOld.buildExtensionFormData(path)) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UninstallExtension.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UninstallExtension.kt index 1a84e122..0ab9346e 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UninstallExtension.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UninstallExtension.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.extension.interactor import ca.gosyer.jui.domain.extension.model.Extension -import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import ca.gosyer.jui.domain.extension.service.ExtensionRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class UninstallExtension @Inject constructor( - private val extensionRepository: ExtensionRepository, + private val extensionRepositoryOld: ExtensionRepositoryOld, ) { suspend fun await( extension: Extension, @@ -28,7 +28,7 @@ class UninstallExtension } .collect() - fun asFlow(extension: Extension) = extensionRepository.uninstallExtension(extension.pkgName) + fun asFlow(extension: Extension) = extensionRepositoryOld.uninstallExtension(extension.pkgName) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UpdateExtension.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UpdateExtension.kt index 8e4a9821..655b1a2e 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UpdateExtension.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/interactor/UpdateExtension.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.extension.interactor import ca.gosyer.jui.domain.extension.model.Extension -import ca.gosyer.jui.domain.extension.service.ExtensionRepository +import ca.gosyer.jui.domain.extension.service.ExtensionRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class UpdateExtension @Inject constructor( - private val extensionRepository: ExtensionRepository, + private val extensionRepositoryOld: ExtensionRepositoryOld, ) { suspend fun await( extension: Extension, @@ -28,7 +28,7 @@ class UpdateExtension } .collect() - fun asFlow(extension: Extension) = extensionRepository.updateExtension(extension.pkgName) + fun asFlow(extension: Extension) = extensionRepositoryOld.updateExtension(extension.pkgName) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/service/ExtensionRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/service/ExtensionRepositoryOld.kt similarity index 98% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/service/ExtensionRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/service/ExtensionRepositoryOld.kt index ca211cb9..bf7a8690 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/service/ExtensionRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/extension/service/ExtensionRepositoryOld.kt @@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.Flow import okio.FileSystem import okio.buffer -interface ExtensionRepository { +interface ExtensionRepositoryOld { @GET("api/v1/extension/list") fun getExtensionList(): Flow> diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/GetGlobalMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/GetGlobalMeta.kt index 1a43770a..1d4bbc8b 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/GetGlobalMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/GetGlobalMeta.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.global.interactor -import ca.gosyer.jui.domain.global.service.GlobalRepository +import ca.gosyer.jui.domain.global.service.GlobalRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class GetGlobalMeta @Inject constructor( - private val globalRepository: GlobalRepository, + private val globalRepositoryOld: GlobalRepositoryOld, ) { suspend fun await(onError: suspend (Throwable) -> Unit = {}) = asFlow() @@ -25,7 +25,7 @@ class GetGlobalMeta } .singleOrNull() - fun asFlow() = globalRepository.getGlobalMeta() + fun asFlow() = globalRepositoryOld.getGlobalMeta() companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/UpdateGlobalMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/UpdateGlobalMeta.kt index 7f67d1fa..7ec996e9 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/UpdateGlobalMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/interactor/UpdateGlobalMeta.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.global.interactor import ca.gosyer.jui.domain.global.model.GlobalMeta -import ca.gosyer.jui.domain.global.service.GlobalRepository +import ca.gosyer.jui.domain.global.service.GlobalRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.flow @@ -17,7 +17,7 @@ import org.lighthousegames.logging.logging class UpdateGlobalMeta @Inject constructor( - private val globalRepository: GlobalRepository, + private val globalRepositoryOld: GlobalRepositoryOld, ) { suspend fun await( globalMeta: GlobalMeta, @@ -35,7 +35,7 @@ class UpdateGlobalMeta example: Int = globalMeta.example, ) = flow { if (example != globalMeta.example) { - globalRepository.updateGlobalMeta( + globalRepositoryOld.updateGlobalMeta( "example", example.toString(), ).collect() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/service/GlobalRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/service/GlobalRepositoryOld.kt similarity index 96% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/service/GlobalRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/service/GlobalRepositoryOld.kt index f6405455..85a30fe6 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/service/GlobalRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/global/service/GlobalRepositoryOld.kt @@ -14,7 +14,7 @@ import de.jensklingenberg.ktorfit.http.PATCH import io.ktor.client.statement.HttpResponse import kotlinx.coroutines.flow.Flow -interface GlobalRepository { +interface GlobalRepositoryOld { @GET("api/v1/meta") fun getGlobalMeta(): Flow diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/AddMangaToLibrary.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/AddMangaToLibrary.kt index dab8756f..ca25bc06 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/AddMangaToLibrary.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/AddMangaToLibrary.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.library.interactor import ca.gosyer.jui.domain.ServerListeners -import ca.gosyer.jui.domain.library.service.LibraryRepository +import ca.gosyer.jui.domain.library.service.LibraryRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class AddMangaToLibrary @Inject constructor( - private val libraryRepository: LibraryRepository, + private val libraryRepositoryOld: LibraryRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -42,11 +42,11 @@ class AddMangaToLibrary .singleOrNull() fun asFlow(mangaId: Long) = - libraryRepository.addMangaToLibrary(mangaId) + libraryRepositoryOld.addMangaToLibrary(mangaId) .onEach { serverListeners.updateManga(mangaId) } fun asFlow(manga: Manga) = - libraryRepository.addMangaToLibrary(manga.id) + libraryRepositoryOld.addMangaToLibrary(manga.id) .onEach { serverListeners.updateManga(manga.id) } companion object { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/RemoveMangaFromLibrary.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/RemoveMangaFromLibrary.kt index 7f68749d..0597f028 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/RemoveMangaFromLibrary.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/interactor/RemoveMangaFromLibrary.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.library.interactor import ca.gosyer.jui.domain.ServerListeners -import ca.gosyer.jui.domain.library.service.LibraryRepository +import ca.gosyer.jui.domain.library.service.LibraryRepositoryOld import ca.gosyer.jui.domain.manga.model.Manga import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class RemoveMangaFromLibrary @Inject constructor( - private val libraryRepository: LibraryRepository, + private val libraryRepositoryOld: LibraryRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -42,11 +42,11 @@ class RemoveMangaFromLibrary .singleOrNull() fun asFlow(mangaId: Long) = - libraryRepository.removeMangaFromLibrary(mangaId) + libraryRepositoryOld.removeMangaFromLibrary(mangaId) .onEach { serverListeners.updateManga(mangaId) } fun asFlow(manga: Manga) = - libraryRepository.removeMangaFromLibrary(manga.id) + libraryRepositoryOld.removeMangaFromLibrary(manga.id) .onEach { serverListeners.updateManga(manga.id) } companion object { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryRepositoryOld.kt similarity index 95% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryRepositoryOld.kt index ff3e40f2..e134df04 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/library/service/LibraryRepositoryOld.kt @@ -12,7 +12,7 @@ import de.jensklingenberg.ktorfit.http.Path import io.ktor.client.statement.HttpResponse import kotlinx.coroutines.flow.Flow -interface LibraryRepository { +interface LibraryRepositoryOld { @GET("api/v1/manga/{mangaId}/library") fun addMangaToLibrary( @Path("mangaId") mangaId: Long, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetManga.kt index c3a93b38..cfca7d4d 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetManga.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.manga.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.manga.model.Manga -import ca.gosyer.jui.domain.manga.service.MangaRepository +import ca.gosyer.jui.domain.manga.service.MangaRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import kotlinx.coroutines.flow.take @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class GetManga @Inject constructor( - private val mangaRepository: MangaRepository, + private val mangaRepositoryOld: MangaRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -45,12 +45,12 @@ class GetManga fun asFlow(mangaId: Long) = serverListeners.combineMangaUpdates( - mangaRepository.getManga(mangaId), + mangaRepositoryOld.getManga(mangaId), ) { mangaId in it } fun asFlow(manga: Manga) = serverListeners.combineMangaUpdates( - mangaRepository.getManga(manga.id), + mangaRepositoryOld.getManga(manga.id), ) { manga.id in it } companion object { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetMangaFull.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetMangaFull.kt index b03628e1..f3c170e5 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetMangaFull.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/GetMangaFull.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.manga.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.manga.model.Manga -import ca.gosyer.jui.domain.manga.service.MangaRepository +import ca.gosyer.jui.domain.manga.service.MangaRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import kotlinx.coroutines.flow.take @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class GetMangaFull @Inject constructor( - private val mangaRepository: MangaRepository, + private val mangaRepositoryOld: MangaRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -45,12 +45,12 @@ class GetMangaFull fun asFlow(mangaId: Long) = serverListeners.combineMangaUpdates( - mangaRepository.getMangaFull(mangaId), + mangaRepositoryOld.getMangaFull(mangaId), ) { mangaId in it } fun asFlow(manga: Manga) = serverListeners.combineMangaUpdates( - mangaRepository.getMangaFull(manga.id), + mangaRepositoryOld.getMangaFull(manga.id), ) { manga.id in it } companion object { diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshManga.kt index 436a34dc..e9e04c8e 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshManga.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.manga.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.manga.model.Manga -import ca.gosyer.jui.domain.manga.service.MangaRepository +import ca.gosyer.jui.domain.manga.service.MangaRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.singleOrNull @@ -19,7 +19,7 @@ import org.lighthousegames.logging.logging class RefreshManga @Inject constructor( - private val mangaRepository: MangaRepository, + private val mangaRepositoryOld: MangaRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -44,9 +44,9 @@ class RefreshManga } .singleOrNull() - fun asFlow(mangaId: Long) = mangaRepository.getManga(mangaId, true).onEach { serverListeners.updateManga(mangaId) } + fun asFlow(mangaId: Long) = mangaRepositoryOld.getManga(mangaId, true).onEach { serverListeners.updateManga(mangaId) } - fun asFlow(manga: Manga) = mangaRepository.getManga(manga.id, true).onEach { serverListeners.updateManga(manga.id) } + fun asFlow(manga: Manga) = mangaRepositoryOld.getManga(manga.id, true).onEach { serverListeners.updateManga(manga.id) } companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshMangaFull.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshMangaFull.kt index c4bc532b..4f9201c1 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshMangaFull.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/RefreshMangaFull.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.manga.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.manga.model.Manga -import ca.gosyer.jui.domain.manga.service.MangaRepository +import ca.gosyer.jui.domain.manga.service.MangaRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.singleOrNull @@ -19,7 +19,7 @@ import org.lighthousegames.logging.logging class RefreshMangaFull @Inject constructor( - private val mangaRepository: MangaRepository, + private val mangaRepositoryOld: MangaRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -44,9 +44,9 @@ class RefreshMangaFull } .singleOrNull() - fun asFlow(mangaId: Long) = mangaRepository.getMangaFull(mangaId, true).onEach { serverListeners.updateManga(mangaId) } + fun asFlow(mangaId: Long) = mangaRepositoryOld.getMangaFull(mangaId, true).onEach { serverListeners.updateManga(mangaId) } - fun asFlow(manga: Manga) = mangaRepository.getMangaFull(manga.id, true).onEach { serverListeners.updateManga(manga.id) } + fun asFlow(manga: Manga) = mangaRepositoryOld.getMangaFull(manga.id, true).onEach { serverListeners.updateManga(manga.id) } companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/UpdateMangaMeta.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/UpdateMangaMeta.kt index 5f6af7f7..286f72df 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/UpdateMangaMeta.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/interactor/UpdateMangaMeta.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.manga.interactor import ca.gosyer.jui.domain.ServerListeners import ca.gosyer.jui.domain.manga.model.Manga -import ca.gosyer.jui.domain.manga.service.MangaRepository +import ca.gosyer.jui.domain.manga.service.MangaRepositoryOld import io.ktor.http.decodeURLQueryComponent import io.ktor.http.encodeURLQueryComponent import kotlinx.coroutines.flow.catch @@ -20,7 +20,7 @@ import org.lighthousegames.logging.logging class UpdateMangaMeta @Inject constructor( - private val mangaRepository: MangaRepository, + private val mangaRepositoryOld: MangaRepositoryOld, private val serverListeners: ServerListeners, ) { suspend fun await( @@ -39,7 +39,7 @@ class UpdateMangaMeta readerMode: String = manga.meta.juiReaderMode.decodeURLQueryComponent(), ) = flow { if (readerMode.encodeURLQueryComponent() != manga.meta.juiReaderMode) { - mangaRepository.updateMangaMeta( + mangaRepositoryOld.updateMangaMeta( manga.id, "juiReaderMode", readerMode, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/service/MangaRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/service/MangaRepositoryOld.kt similarity index 98% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/service/MangaRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/service/MangaRepositoryOld.kt index 4974ceba..b869e233 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/service/MangaRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/manga/service/MangaRepositoryOld.kt @@ -19,7 +19,7 @@ import io.ktor.client.statement.HttpResponse import io.ktor.utils.io.ByteReadChannel import kotlinx.coroutines.flow.Flow -interface MangaRepository { +interface MangaRepositoryOld { @GET("api/v1/manga/{mangaId}/") fun getManga( @Path("mangaId") mangaId: Long, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetFilterList.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetFilterList.kt index fa9f3a34..9d83a7f2 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetFilterList.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetFilterList.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source -import ca.gosyer.jui.domain.source.service.SourceRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class GetFilterList @Inject constructor( - private val sourceRepository: SourceRepository, + private val sourceRepositoryOld: SourceRepositoryOld, ) { suspend fun await( source: Source, @@ -43,12 +43,12 @@ class GetFilterList fun asFlow( source: Source, reset: Boolean, - ) = sourceRepository.getFilterList(source.id, reset) + ) = sourceRepositoryOld.getFilterList(source.id, reset) fun asFlow( sourceId: Long, reset: Boolean, - ) = sourceRepository.getFilterList(sourceId, reset) + ) = sourceRepositoryOld.getFilterList(sourceId, reset) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetLatestManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetLatestManga.kt index a5cabf65..304d6028 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetLatestManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetLatestManga.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source -import ca.gosyer.jui.domain.source.service.SourceRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class GetLatestManga @Inject constructor( - private val sourceRepository: SourceRepository, + private val sourceRepositoryOld: SourceRepositoryOld, ) { suspend fun await( source: Source, @@ -43,12 +43,12 @@ class GetLatestManga fun asFlow( source: Source, page: Int, - ) = sourceRepository.getLatestManga(source.id, page) + ) = sourceRepositoryOld.getLatestManga(source.id, page) fun asFlow( sourceId: Long, page: Int, - ) = sourceRepository.getLatestManga(sourceId, page) + ) = sourceRepositoryOld.getLatestManga(sourceId, page) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetPopularManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetPopularManga.kt index 2fd6b75f..ce73fce1 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetPopularManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetPopularManga.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source -import ca.gosyer.jui.domain.source.service.SourceRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class GetPopularManga @Inject constructor( - private val sourceRepository: SourceRepository, + private val sourceRepositoryOld: SourceRepositoryOld, ) { suspend fun await( source: Source, @@ -43,12 +43,12 @@ class GetPopularManga fun asFlow( source: Source, page: Int, - ) = sourceRepository.getPopularManga(source.id, page) + ) = sourceRepositoryOld.getPopularManga(source.id, page) fun asFlow( sourceId: Long, page: Int, - ) = sourceRepository.getPopularManga(sourceId, page) + ) = sourceRepositoryOld.getPopularManga(sourceId, page) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetQuickSearchManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetQuickSearchManga.kt index 7566d881..e213cc09 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetQuickSearchManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetQuickSearchManga.kt @@ -9,7 +9,7 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source import ca.gosyer.jui.domain.source.model.sourcefilters.SourceFilterChange import ca.gosyer.jui.domain.source.model.sourcefilters.SourceFilterData -import ca.gosyer.jui.domain.source.service.SourceRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -18,7 +18,7 @@ import org.lighthousegames.logging.logging class GetQuickSearchManga @Inject constructor( - private val sourceRepository: SourceRepository, + private val sourceRepositoryOld: SourceRepositoryOld, ) { suspend fun await( source: Source, @@ -51,7 +51,7 @@ class GetQuickSearchManga searchTerm: String?, page: Int, filters: List?, - ) = sourceRepository.getQuickSearchResults( + ) = sourceRepositoryOld.getQuickSearchResults( source.id, page, SourceFilterData( @@ -65,7 +65,7 @@ class GetQuickSearchManga searchTerm: String?, page: Int, filters: List?, - ) = sourceRepository.getQuickSearchResults( + ) = sourceRepositoryOld.getQuickSearchResults( sourceId, page, SourceFilterData( diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSearchManga.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSearchManga.kt index ab7bedaa..dde0077e 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSearchManga.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSearchManga.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source -import ca.gosyer.jui.domain.source.service.SourceRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class GetSearchManga @Inject constructor( - private val sourceRepository: SourceRepository, + private val sourceRepositoryOld: SourceRepositoryOld, ) { suspend fun await( source: Source, @@ -48,7 +48,7 @@ class GetSearchManga source: Source, searchTerm: String?, page: Int, - ) = sourceRepository.getSearchResults( + ) = sourceRepositoryOld.getSearchResults( source.id, searchTerm?.ifBlank { null }, page, @@ -58,7 +58,7 @@ class GetSearchManga sourceId: Long, searchTerm: String?, page: Int, - ) = sourceRepository.getSearchResults( + ) = sourceRepositoryOld.getSearchResults( sourceId, searchTerm?.ifBlank { null }, page, diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceList.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceList.kt index 4954093c..1214be64 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceList.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceList.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.source.interactor -import ca.gosyer.jui.domain.source.service.SourceRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class GetSourceList @Inject constructor( - private val sourceRepository: SourceRepository, + private val sourceRepositoryOld: SourceRepositoryOld, ) { suspend fun await(onError: suspend (Throwable) -> Unit = {}) = asFlow() @@ -25,7 +25,7 @@ class GetSourceList } .singleOrNull() - fun asFlow() = sourceRepository.getSourceList() + fun asFlow() = sourceRepositoryOld.getSourceList() companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceSettings.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceSettings.kt index c77c2d81..366586bc 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceSettings.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/GetSourceSettings.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source -import ca.gosyer.jui.domain.source.service.SourceRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class GetSourceSettings @Inject constructor( - private val sourceRepository: SourceRepository, + private val sourceRepositoryOld: SourceRepositoryOld, ) { suspend fun await( source: Source, @@ -38,9 +38,9 @@ class GetSourceSettings } .singleOrNull() - fun asFlow(source: Source) = sourceRepository.getSourceSettings(source.id) + fun asFlow(source: Source) = sourceRepositoryOld.getSourceSettings(source.id) - fun asFlow(sourceId: Long) = sourceRepository.getSourceSettings(sourceId) + fun asFlow(sourceId: Long) = sourceRepositoryOld.getSourceSettings(sourceId) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceFilter.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceFilter.kt index 0109ebcb..a4396ec6 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceFilter.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceFilter.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source import ca.gosyer.jui.domain.source.model.sourcefilters.SourceFilterChange -import ca.gosyer.jui.domain.source.service.SourceRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import kotlinx.serialization.encodeToString @@ -19,7 +19,7 @@ import org.lighthousegames.logging.logging class SetSourceFilter @Inject constructor( - private val sourceRepository: SourceRepository, + private val sourceRepositoryOld: SourceRepositoryOld, ) { suspend fun await( source: Source, @@ -85,7 +85,7 @@ class SetSourceFilter source: Source, filterIndex: Int, filter: Any, - ) = sourceRepository.setFilter( + ) = sourceRepositoryOld.setFilter( source.id, SourceFilterChange(filterIndex, filter), ) @@ -94,7 +94,7 @@ class SetSourceFilter sourceId: Long, filterIndex: Int, filter: Any, - ) = sourceRepository.setFilter( + ) = sourceRepositoryOld.setFilter( sourceId, SourceFilterChange(filterIndex, filter), ) @@ -104,7 +104,7 @@ class SetSourceFilter filterIndex: Int, childFilterIndex: Int, filter: Any, - ) = sourceRepository.setFilter( + ) = sourceRepositoryOld.setFilter( source.id, SourceFilterChange(filterIndex, Json.encodeToString(SourceFilterChange(childFilterIndex, filter))), ) @@ -114,7 +114,7 @@ class SetSourceFilter filterIndex: Int, childFilterIndex: Int, filter: Any, - ) = sourceRepository.setFilter( + ) = sourceRepositoryOld.setFilter( sourceId, SourceFilterChange(filterIndex, Json.encodeToString(SourceFilterChange(childFilterIndex, filter))), ) diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceSetting.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceSetting.kt index 2b753c03..ebfded0f 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceSetting.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/interactor/SetSourceSetting.kt @@ -8,7 +8,7 @@ package ca.gosyer.jui.domain.source.interactor import ca.gosyer.jui.domain.source.model.Source import ca.gosyer.jui.domain.source.model.sourcepreference.SourcePreferenceChange -import ca.gosyer.jui.domain.source.service.SourceRepository +import ca.gosyer.jui.domain.source.service.SourceRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -17,7 +17,7 @@ import org.lighthousegames.logging.logging class SetSourceSetting @Inject constructor( - private val sourceRepository: SourceRepository, + private val sourceRepositoryOld: SourceRepositoryOld, ) { suspend fun await( source: Source, @@ -49,7 +49,7 @@ class SetSourceSetting source: Source, settingIndex: Int, setting: Any, - ) = sourceRepository.setSourceSetting( + ) = sourceRepositoryOld.setSourceSetting( source.id, SourcePreferenceChange(settingIndex, setting), ) @@ -58,7 +58,7 @@ class SetSourceSetting sourceId: Long, settingIndex: Int, setting: Any, - ) = sourceRepository.setSourceSetting( + ) = sourceRepositoryOld.setSourceSetting( sourceId, SourcePreferenceChange(settingIndex, setting), ) diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/service/SourceRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/service/SourceRepositoryOld.kt similarity index 99% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/service/SourceRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/service/SourceRepositoryOld.kt index 4678ee11..adf5bab4 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/service/SourceRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/source/service/SourceRepositoryOld.kt @@ -22,7 +22,7 @@ import de.jensklingenberg.ktorfit.http.Query import io.ktor.client.statement.HttpResponse import kotlinx.coroutines.flow.Flow -interface SourceRepository { +interface SourceRepositoryOld { @GET("api/v1/source/list") fun getSourceList(): Flow> diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/GetRecentUpdates.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/GetRecentUpdates.kt index 01e65112..d3f4a151 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/GetRecentUpdates.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/GetRecentUpdates.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.updates.interactor -import ca.gosyer.jui.domain.updates.service.UpdatesRepository +import ca.gosyer.jui.domain.updates.service.UpdatesRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.singleOrNull import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class GetRecentUpdates @Inject constructor( - private val updatesRepository: UpdatesRepository, + private val updatesRepositoryOld: UpdatesRepositoryOld, ) { suspend fun await( pageNum: Int, @@ -27,7 +27,7 @@ class GetRecentUpdates } .singleOrNull() - fun asFlow(pageNum: Int) = updatesRepository.getRecentUpdates(pageNum) + fun asFlow(pageNum: Int) = updatesRepositoryOld.getRecentUpdates(pageNum) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateCategory.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateCategory.kt index f4d26d60..5ef9c6d0 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateCategory.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateCategory.kt @@ -7,7 +7,7 @@ package ca.gosyer.jui.domain.updates.interactor import ca.gosyer.jui.domain.category.model.Category -import ca.gosyer.jui.domain.updates.service.UpdatesRepository +import ca.gosyer.jui.domain.updates.service.UpdatesRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -16,7 +16,7 @@ import org.lighthousegames.logging.logging class UpdateCategory @Inject constructor( - private val updatesRepository: UpdatesRepository, + private val updatesRepositoryOld: UpdatesRepositoryOld, ) { suspend fun await( categoryId: Long, @@ -38,9 +38,9 @@ class UpdateCategory } .collect() - fun asFlow(categoryId: Long) = updatesRepository.updateCategory(categoryId) + fun asFlow(categoryId: Long) = updatesRepositoryOld.updateCategory(categoryId) - fun asFlow(category: Category) = updatesRepository.updateCategory(category.id) + fun asFlow(category: Category) = updatesRepositoryOld.updateCategory(category.id) companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateLibrary.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateLibrary.kt index 4e1e0d33..a3b1dcb5 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateLibrary.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdateLibrary.kt @@ -6,7 +6,7 @@ package ca.gosyer.jui.domain.updates.interactor -import ca.gosyer.jui.domain.updates.service.UpdatesRepository +import ca.gosyer.jui.domain.updates.service.UpdatesRepositoryOld import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.collect import me.tatarka.inject.annotations.Inject @@ -15,7 +15,7 @@ import org.lighthousegames.logging.logging class UpdateLibrary @Inject constructor( - private val updatesRepository: UpdatesRepository, + private val updatesRepositoryOld: UpdatesRepositoryOld, ) { suspend fun await(onError: suspend (Throwable) -> Unit = {}) = asFlow() @@ -25,7 +25,7 @@ class UpdateLibrary } .collect() - fun asFlow() = updatesRepository.updateLibrary() + fun asFlow() = updatesRepositoryOld.updateLibrary() companion object { private val log = logging() diff --git a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/service/UpdatesRepository.kt b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/service/UpdatesRepositoryOld.kt similarity index 96% rename from domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/service/UpdatesRepository.kt rename to domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/service/UpdatesRepositoryOld.kt index da395513..1da94a3a 100644 --- a/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/service/UpdatesRepository.kt +++ b/domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/service/UpdatesRepositoryOld.kt @@ -15,7 +15,7 @@ import de.jensklingenberg.ktorfit.http.Path import io.ktor.client.statement.HttpResponse import kotlinx.coroutines.flow.Flow -interface UpdatesRepository { +interface UpdatesRepositoryOld { @GET("api/v1/update/recentChapters/{pageNum}/") fun getRecentUpdates( @Path("pageNum") pageNum: Int,