rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: deletion queries (#504)

Browse source 
* feat: introduce `deleteFromList` extension function for `Media`

* refactor: remove redundant deletion code, migrate to `deleteFromList`
This commit is contained in:
Toby Bridle 2024-10-28 14:27:52 +00:00 • committed by GitHub
parent bd1f3388f7
commit e8ca3f2222
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 66 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/ani/dantotsu/media/Media.kt
View file

@ -1,15 +1,22 @@
package ani.dantotsu.media package ani.dantotsu.media
import android.graphics.Bitmap import android.graphics.Bitmap
import ani.dantotsu.connections.anilist.Anilist
import ani.dantotsu.connections.anilist.api.FuzzyDate import ani.dantotsu.connections.anilist.api.FuzzyDate
import ani.dantotsu.connections.anilist.api.MediaEdge import ani.dantotsu.connections.anilist.api.MediaEdge
import ani.dantotsu.connections.anilist.api.MediaList import ani.dantotsu.connections.anilist.api.MediaList
import ani.dantotsu.connections.anilist.api.MediaStreamingEpisode import ani.dantotsu.connections.anilist.api.MediaStreamingEpisode
import ani.dantotsu.connections.anilist.api.MediaType import ani.dantotsu.connections.anilist.api.MediaType
import ani.dantotsu.connections.anilist.api.Query import ani.dantotsu.connections.anilist.api.Query
import ani.dantotsu.connections.mal.MAL
import ani.dantotsu.media.anime.Anime import ani.dantotsu.media.anime.Anime
import ani.dantotsu.media.manga.Manga import ani.dantotsu.media.manga.Manga
import ani.dantotsu.profile.User import ani.dantotsu.profile.User
import ani.dantotsu.settings.saving.PrefManager
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.io.Serializable import java.io.Serializable
import ani.dantotsu.connections.anilist.api.Media as ApiMedia import ani.dantotsu.connections.anilist.api.Media as ApiMedia
@ -130,6 +137,37 @@ data class Media(
fun mangaName() = if (countryOfOrigin != "JP") mainName() else nameRomaji fun mangaName() = if (countryOfOrigin != "JP") mainName() else nameRomaji
} }
fun Media?.deleteFromList(
scope: CoroutineScope,
onSuccess: suspend () -> Unit,
onError: suspend (e: Exception) -> Unit,
onNotFound: suspend () -> Unit
) {
val id = this?.userListId
scope.launch {
withContext(Dispatchers.IO) {
this@deleteFromList?.let { media ->
val _id = id ?: Anilist.query.userMediaDetails(media).userListId;
_id?.let { listId ->
try {
Anilist.mutation.deleteList(listId)
MAL.query.deleteList(media.anime != null, media.idMAL)
val removeList = PrefManager.getCustomVal("removeList", setOf<Int>())
PrefManager.setCustomVal(
"removeList", removeList.minus(listId)
)
onSuccess()
} catch (e: Exception) {
onError(e)
}
} ?: onNotFound()
}
}
}
}
fun emptyMedia() = Media( fun emptyMedia() = Media(
id = 0, id = 0,
name = "No media found", name = "No media found",

36
app/src/main/java/ani/dantotsu/media/MediaListDialogFragment.kt
View file

@ -271,29 +271,23 @@ class MediaListDialogFragment : BottomSheetDialogFragment() {
} }
binding.mediaListDelete.setOnClickListener { binding.mediaListDelete.setOnClickListener {
var id = media!!.userListId
scope.launch { scope.launch {
withContext(Dispatchers.IO) { media?.deleteFromList(scope, onSuccess = {
if (id != null) { Refresh.all()
Anilist.mutation.deleteList(id!!) snackString(getString(R.string.deleted_from_list))
MAL.query.deleteList(media?.anime != null, media?.idMAL) dismissAllowingStateLoss()
} else { }, onError = { e ->
val profile = Anilist.query.userMediaDetails(media!!) withContext(Dispatchers.Main) {
profile.userListId?.let { listId -> snackString(
id = listId getString(
Anilist.mutation.deleteList(listId) R.string.delete_fail_reason, e.message
MAL.query.deleteList(media?.anime != null, media?.idMAL) )
} )
} }
} }, onNotFound = {
PrefManager.setCustomVal("removeList", removeList.minus(media?.id)) snackString(getString(R.string.no_list_id))
} })
if (id != null) {
Refresh.all()
snackString(getString(R.string.deleted_from_list))
dismissAllowingStateLoss()
} else {
snackString(getString(R.string.no_list_id))
} }
} }
} }

38
app/src/main/java/ani/dantotsu/media/MediaListDialogSmallFragment.kt
View file

@ -63,36 +63,24 @@ class MediaListDialogSmallFragment : BottomSheetDialogFragment() {
binding.mediaListContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin += navBarHeight } binding.mediaListContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin += navBarHeight }
val scope = viewLifecycleOwner.lifecycleScope val scope = viewLifecycleOwner.lifecycleScope
binding.mediaListDelete.setOnClickListener { binding.mediaListDelete.setOnClickListener {
var id = media.userListId
viewLifecycleOwner.lifecycleScope.launch { viewLifecycleOwner.lifecycleScope.launch {
withContext(Dispatchers.IO) { scope.launch {
if (id != null) { media.deleteFromList(scope, onSuccess = {
try {
Anilist.mutation.deleteList(id!!)
MAL.query.deleteList(media.anime != null, media.idMAL)
} catch (e: Exception) {
withContext(Dispatchers.Main) {
snackString(getString(R.string.delete_fail_reason, e.message))
}
return@withContext
}
} else {
val profile = Anilist.query.userMediaDetails(media)
profile.userListId?.let { listId ->
id = listId
Anilist.mutation.deleteList(listId)
MAL.query.deleteList(media.anime != null, media.idMAL)
}
}
}
withContext(Dispatchers.Main) {
if (id != null) {
Refresh.all() Refresh.all()
snackString(getString(R.string.deleted_from_list)) snackString(getString(R.string.deleted_from_list))
dismissAllowingStateLoss() dismissAllowingStateLoss()
} else { }, onError = { e ->
withContext(Dispatchers.Main) {
snackString(
getString(
R.string.delete_fail_reason, e.message
)
)
}
}, onNotFound = {
snackString(getString(R.string.no_list_id)) snackString(getString(R.string.no_list_id))
} })
} }
} }
} }