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

Avoid showing duplicate entry dialog for same entry

Browse Source 
Fixes #9772

(cherry picked from commit fd30c0adcdfc0efc0aae9e5401843439f2622070)
This commit is contained in:
arkon 2023-07-29 12:07:13 -04:00 committed by Jobobby04
parent cc297da44a
commit 9760cb101d
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,7 +430,7 @@ open class BrowseSourceScreenModel(
} }
suspend fun getDuplicateLibraryManga(manga: Manga): Manga? { suspend fun getDuplicateLibraryManga(manga: Manga): Manga? {
return getDuplicateLibraryManga.await(manga.title) return getDuplicateLibraryManga.await(manga).getOrNull(0)
} }
private fun moveMangaToCategories(manga: Manga, vararg categories: Category) { private fun moveMangaToCategories(manga: Manga, vararg categories: Category) {

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

@ -705,7 +705,7 @@ class MangaScreenModel(
// Add to library // Add to library
// First, check if duplicate exists if callback is provided // First, check if duplicate exists if callback is provided
if (checkDuplicate) { if (checkDuplicate) {
val duplicate = getDuplicateLibraryManga.await(manga.title) val duplicate = getDuplicateLibraryManga.await(manga).getOrNull(0)
if (duplicate != null) { if (duplicate != null) {
updateSuccessState { it.copy(dialog = Dialog.DuplicateManga(manga, duplicate)) } updateSuccessState { it.copy(dialog = Dialog.DuplicateManga(manga, duplicate)) }

6
data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
View File

@ -55,9 +55,9 @@ class MangaRepositoryImpl(
return handler.subscribeToList { mangasQueries.getFavoriteBySourceId(sourceId, mangaMapper) } return handler.subscribeToList { mangasQueries.getFavoriteBySourceId(sourceId, mangaMapper) }
} }
override suspend fun getDuplicateLibraryManga(title: String): Manga? { override suspend fun getDuplicateLibraryManga(id: Long, title: String): List<Manga> {
return handler.awaitOneOrNull { return handler.awaitList {
mangasQueries.getDuplicateLibraryManga(title, mangaMapper) mangasQueries.getDuplicateLibraryManga(title, id, mangaMapper)
} }
} }

2
data/src/main/sqldelight/tachiyomi/data/mangas.sq
View File

@ -100,7 +100,7 @@ SELECT *
FROM mangas FROM mangas
WHERE favorite = 1 WHERE favorite = 1
AND LOWER(title) = :title AND LOWER(title) = :title
LIMIT 1; AND _id != :id;
resetViewerFlags: resetViewerFlags:
UPDATE mangas UPDATE mangas

4
domain/src/main/java/tachiyomi/domain/manga/interactor/GetDuplicateLibraryManga.kt
View File

@ -7,7 +7,7 @@ class GetDuplicateLibraryManga(
private val mangaRepository: MangaRepository, private val mangaRepository: MangaRepository,
) { ) {
suspend fun await(title: String): Manga? { suspend fun await(manga: Manga): List<Manga> {
return mangaRepository.getDuplicateLibraryManga(title.lowercase()) return mangaRepository.getDuplicateLibraryManga(manga.id, manga.title.lowercase())
} }
} }

2
domain/src/main/java/tachiyomi/domain/manga/repository/MangaRepository.kt
View File

@ -23,7 +23,7 @@ interface MangaRepository {
fun getFavoritesBySourceId(sourceId: Long): Flow<List<Manga>> fun getFavoritesBySourceId(sourceId: Long): Flow<List<Manga>>
suspend fun getDuplicateLibraryManga(title: String): Manga? suspend fun getDuplicateLibraryManga(id: Long, title: String): List<Manga>
suspend fun resetViewerFlags(): Boolean suspend fun resetViewerFlags(): Boolean