mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-10 06:42:05 +01:00
Code Issues Projects Releases Wiki Activity

Add some alternate category interaction methodes

Browse Source
This commit is contained in:
Syer10
2021-03-29 01:55:19 -04:00
parent d0a920b740
commit f66951bbb5
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/kotlin/ca/gosyer/backend/network/interactions/CategoryInteractionHandler.kt
View File

@@ -18,7 +18,6 @@ import ca.gosyer.backend.network.requests.getMangaCategoriesQuery
import ca.gosyer.backend.network.requests.getMangaInCategoryQuery
import ca.gosyer.backend.network.requests.removeMangaFromCategoryRequest
import io.ktor.client.HttpClient
import io.ktor.client.request.forms.formData
import io.ktor.client.statement.HttpResponse
import io.ktor.http.HttpMethod
import io.ktor.http.Parameters
@@ -33,17 +32,25 @@ class CategoryInteractionHandler(private val client: HttpClient): BaseInteractio
)
}
suspend fun getMangaCategories(manga: Manga) = getMangaCategories(manga.id)
suspend fun addMangaToCategory(mangaId: Long, categoryId: Long) = withContext(Dispatchers.IO) {
client.getRepeat<HttpResponse>(
serverUrl + addMangaToCategoryQuery(mangaId, categoryId)
)
}
suspend fun addMangaToCategory(manga: Manga, category: Category) = addMangaToCategory(manga.id, category.id)
suspend fun addMangaToCategory(manga: Manga, categoryId: Long) = addMangaToCategory(manga.id, categoryId)
suspend fun addMangaToCategory(mangaId: Long, category: Category) = addMangaToCategory(mangaId, category.id)
suspend fun removeMangaFromCategory(mangaId: Long, categoryId: Long) = withContext(Dispatchers.IO) {
client.deleteRepeat<HttpResponse>(
serverUrl + removeMangaFromCategoryRequest(mangaId, categoryId)
)
}
suspend fun removeMangaFromCategory(manga: Manga, category: Category) = removeMangaFromCategory(manga.id, category.id)
suspend fun removeMangaFromCategory(manga: Manga, categoryId: Long) = removeMangaFromCategory(manga.id, categoryId)
suspend fun removeMangaFromCategory(mangaId: Long, category: Category) = removeMangaFromCategory(mangaId, category.id)
suspend fun getCategories() = withContext(Dispatchers.IO) {
client.getRepeat<List<Category>>(
@@ -73,16 +80,9 @@ class CategoryInteractionHandler(private val client: HttpClient): BaseInteractio
}
) {
method = HttpMethod.Patch
formData {
if (name != null) {
append("name", name)
}
if (isLanding != null) {
append("isLanding", isLanding.toString())
}
}
}
}
suspend fun modifyCategory(category: Category, name: String? = null, isLanding: Boolean? = null) = modifyCategory(category.id, name, isLanding)
suspend fun reorderCategory(categoryId: Long, to: Int, from: Int) = withContext(Dispatchers.IO) {
client.submitFormRepeat<HttpResponse>(
@@ -95,16 +95,19 @@ class CategoryInteractionHandler(private val client: HttpClient): BaseInteractio
method = HttpMethod.Patch
}
}
suspend fun reorderCategory(category: Category, to: Int, from: Int) = reorderCategory(category.id, to, from)
suspend fun deleteCategory(categoryId: Long) = withContext(Dispatchers.IO) {
client.deleteRepeat<HttpResponse>(
serverUrl + categoryDeleteRequest(categoryId)
)
}
suspend fun deleteCategory(category: Category) = deleteCategory(category.id)
suspend fun getMangaFromCategory(categoryId: Long) = withContext(Dispatchers.IO) {
client.getRepeat<List<Manga>>(
serverUrl + getMangaInCategoryQuery(categoryId)
)
}
suspend fun getMangaFromCategory(category: Category) = getMangaFromCategory(category.id)
}

10
src/main/kotlin/ca/gosyer/ui/categories/CategoriesMenuViewModel.kt
View File

@@ -63,17 +63,17 @@ class CategoriesMenuViewModel : ViewModel() {
originalCategories.forEach { originalCategory ->
val category = categories.find { it.id == originalCategory.id }
if (category == null) {
CategoryInteractionHandler(httpClient).deleteCategory(originalCategory.id)
CategoryInteractionHandler(httpClient).deleteCategory(originalCategory)
} else if (category.name != originalCategory.name) {
CategoryInteractionHandler(httpClient).modifyCategory(originalCategory.id, category.name)
CategoryInteractionHandler(httpClient).modifyCategory(originalCategory, category.name)
}
}
val updatedCategories = CategoryInteractionHandler(httpClient).getCategories()
updatedCategories.forEach { updatedCategory ->
val category = categories.find { it.id == updatedCategory.id || it.name == updatedCategory.name } ?: return@forEach
if (category.order != updatedCategory.order) {
logger.debug { category.order.toString() + " to " + updatedCategory.order.toString() }
CategoryInteractionHandler(httpClient).reorderCategory(updatedCategory.id, category.order, updatedCategory.order)
logger.debug { "${category.order} to ${updatedCategory.order}" }
CategoryInteractionHandler(httpClient).reorderCategory(updatedCategory, category.order, updatedCategory.order)
}
}
@@ -92,7 +92,7 @@ class CategoriesMenuViewModel : ViewModel() {
}
fun createCategory(name: String) {
_categories.value += MenuCategory(order = categories.value.size, name = name, landing = false)
_categories.value += MenuCategory(order = categories.value.size + 1, name = name, landing = false)
}
fun moveUp(category: MenuCategory) {

2
src/main/kotlin/ca/gosyer/ui/library/LibraryScreenViewModel.kt
View File

@@ -63,7 +63,7 @@ class LibraryScreenViewModel: ViewModel() {
library.categories.value = listOf(defaultCategory) + categories.sortedBy { it.order }
categories.map {
async {
library.mangaMap.setManga(it.order, CategoryInteractionHandler(httpClient).getMangaFromCategory(it.id))
library.mangaMap.setManga(it.order, CategoryInteractionHandler(httpClient).getMangaFromCategory(it))
}
}.awaitAll()
val mangaInCategories = library.mangaMap.flatMap { it.value.value }.map { it.id }.distinct()