Skip to content

fix: persist loop mode after session is restored #856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ludmila-lovelace wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: persist loop mode after session is restored #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/io/github/zyrouge/symphony/services/radio/Radio.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ class Radio(private val symphony: Symphony) : Symphony.Hooks {
originalQueue = originalQueue,
currentQueue = currentQueue,
shuffled = previous.shuffled,
loopModeIndex = previous.loopModeIndex,
)
)
}
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioQueue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ class RadioQueue(private val symphony: Symphony) {
val originalQueue: List<String>,
val currentQueue: List<String>,
val shuffled: Boolean,
val loopModeIndex: Int,
) {
fun serialize() =
listOf(
Expand All @@ -158,6 +159,7 @@ class RadioQueue(private val symphony: Symphony) {
originalQueue.joinToString(","),
currentQueue.joinToString(","),
shuffled.toString(),
loopModeIndex.toString(),
).joinToString(";")

companion object {
Expand All @@ -168,6 +170,7 @@ class RadioQueue(private val symphony: Symphony) {
originalQueue = queue.originalQueue.toList(),
currentQueue = queue.currentQueue.toList(),
shuffled = queue.currentShuffleMode,
loopModeIndex = queue.currentLoopMode.ordinal,
)

fun parse(data: String): Serialized? {
Expand All @@ -179,6 +182,7 @@ class RadioQueue(private val symphony: Symphony) {
originalQueue = semi[2].split(","),
currentQueue = semi[3].split(","),
shuffled = semi[4].toBoolean(),
loopModeIndex = semi[5].toInt(),
)
} catch (_: Exception) {
}
Expand All @@ -196,6 +200,7 @@ class RadioQueue(private val symphony: Symphony) {
currentQueue.addAll(serialized.currentQueue)
symphony.radio.onUpdate.dispatch(Radio.Events.Queue.Modified)
currentShuffleMode = serialized.shuffled
currentLoopMode = LoopMode.values[serialized.loopModeIndex]
afterAdd(
Radio.PlayOptions(
index = serialized.currentSongIndex,
Expand Down
Loading