Castopod
/
Podcini-podcast
mirror of https://github.com/XilinJia/Podcini.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6.3.0 commit

This commit is contained in:
Xilin Jia 2024-08-01 23:47:37 +01:00
parent 2781124d76
commit fd9040ff1a
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/kotlin/ac/mdiq/podcini/storage/database/Queues.kt
View File

@ -120,10 +120,9 @@ object Queues {
val qItemIds = curQueue.episodeIds.toMutableList() val qItemIds = curQueue.episodeIds.toMutableList()
val items_ = episodes.toList() val items_ = episodes.toList()
for (episode in items_) { for (episode in items_) {
if (curQueue.episodeIds.contains(episode.id)) continue if (qItemIds.contains(episode.id)) continue
events.add(FlowEvent.QueueEvent.added(episode, insertPosition)) events.add(FlowEvent.QueueEvent.added(episode, insertPosition))
if (qItemIds.contains(episode.id)) qItemIds.add(insertPosition, episode.id) qItemIds.add(insertPosition, episode.id)
updatedItems.add(episode) updatedItems.add(episode)
qItems.add(insertPosition, episode) qItems.add(insertPosition, episode)
queueModified = true queueModified = true
@ -142,9 +141,8 @@ object Queues {
} }
// curQueue.episodes.addAll(qItems) // curQueue.episodes.addAll(qItems)
for (event in events) { for (event in events) EventFlow.postEvent(event)
EventFlow.postEvent(event)
}
// EventFlow.postEvent(FlowEvent.EpisodeEvent.updated(updatedItems)) // EventFlow.postEvent(FlowEvent.EpisodeEvent.updated(updatedItems))
if (markAsUnplayed && markAsUnplayeds.size > 0) setPlayState(Episode.UNPLAYED, false, *markAsUnplayeds.toTypedArray()) if (markAsUnplayed && markAsUnplayeds.size > 0) setPlayState(Episode.UNPLAYED, false, *markAsUnplayeds.toTypedArray())
// if (performAutoDownload) autodownloadEpisodeMedia(context) // if (performAutoDownload) autodownloadEpisodeMedia(context)
@ -164,9 +162,9 @@ object Queues {
if (queue.episodeIds.contains(episode.id)) return if (queue.episodeIds.contains(episode.id)) return
val queueNew = upsert(queue) { val queueNew = upsert(queue) {
it.episodeIds.add(insertPosition, episode.id) if (!it.episodeIds.contains(episode.id)) it.episodeIds.add(insertPosition, episode.id)
insertPosition++ insertPosition++
if (it.id == curQueue.id) it.update() it.update()
} }
// queueNew.episodes.addAll(queue.episodes) // queueNew.episodes.addAll(queue.episodes)
// queueNew.episodes.add(insertPosition, episode) // queueNew.episodes.add(insertPosition, episode)
@ -285,10 +283,10 @@ object Queues {
if (q.size() == 0 || q.id == curQueue.id) continue if (q.size() == 0 || q.id == curQueue.id) continue
idsInQueuesToRemove = q.episodeIds.intersect(episodeIds.toSet()).toMutableSet() idsInQueuesToRemove = q.episodeIds.intersect(episodeIds.toSet()).toMutableSet()
if (idsInQueuesToRemove.isNotEmpty()) { if (idsInQueuesToRemove.isNotEmpty()) {
q.idsBinList.removeAll(idsInQueuesToRemove)
q.idsBinList.addAll(idsInQueuesToRemove)
val qeids = q.episodeIds.minus(idsInQueuesToRemove)
upsert(q) { upsert(q) {
it.idsBinList.removeAll(idsInQueuesToRemove)
it.idsBinList.addAll(idsInQueuesToRemove)
val qeids = it.episodeIds.minus(idsInQueuesToRemove)
it.episodeIds.clear() it.episodeIds.clear()
it.episodeIds.addAll(qeids) it.episodeIds.addAll(qeids)
it.update() it.update()
@ -306,8 +304,9 @@ object Queues {
curQueue = upsert(q) { curQueue = upsert(q) {
it.idsBinList.removeAll(idsInQueuesToRemove) it.idsBinList.removeAll(idsInQueuesToRemove)
it.idsBinList.addAll(idsInQueuesToRemove) it.idsBinList.addAll(idsInQueuesToRemove)
val qeids = it.episodeIds.minus(idsInQueuesToRemove)
it.episodeIds.clear() it.episodeIds.clear()
it.episodeIds.addAll(it.episodeIds.minus(idsInQueuesToRemove)) it.episodeIds.addAll(qeids)
it.update() it.update()
} }
} }
@ -345,7 +344,7 @@ object Queues {
} else Log.e(TAG, "moveQueueItemHelper: Could not load queue") } else Log.e(TAG, "moveQueueItemHelper: Could not load queue")
curQueue.episodes.clear() curQueue.episodes.clear()
// curQueue.episodes.addAll(episodes) // curQueue.episodes.addAll(episodes)
upsertBlk(curQueue) { curQueue = upsertBlk(curQueue) {
it.episodeIds.clear() it.episodeIds.clear()
for (e in episodes) it.episodeIds.add(e.id) for (e in episodes) it.episodeIds.add(e.id)
it.update() it.update()