moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preserve current playing item when shuffling (#812)

This commit is contained in:
Calvin Montgomery 2019-08-01 19:57:32 -07:00
parent 27e8885285
commit 1ec3eab0dc
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/channel/playlist.js
View File

@ -748,6 +748,8 @@ PlaylistModule.prototype.handleShuffle = function (user) {
this.channel.logger.log("[playlist] " + user.getName() + " shuffled the playlist"); this.channel.logger.log("[playlist] " + user.getName() + " shuffled the playlist");
var pl = this.items.toArray(false); var pl = this.items.toArray(false);
let currentUid = this.current ? this.current.uid : null;
let currentTime = this.current ? this.current.media.currentTime : undefined;
this.items.clear(); this.items.clear();
this.semaphore.reset(); this.semaphore.reset();
while (pl.length > 0) { while (pl.length > 0) {
@ -758,7 +760,12 @@ PlaylistModule.prototype.handleShuffle = function (user) {
queueby: pl[i].queueby queueby: pl[i].queueby
}); });
this.items.append(item); if (pl[i].uid === currentUid) {
this.items.prepend(item);
} else {
this.items.append(item);
}
pl.splice(i, 1); pl.splice(i, 1);
} }
this._listDirty = true; this._listDirty = true;
@ -772,7 +779,7 @@ PlaylistModule.prototype.handleShuffle = function (user) {
u.socket.emit("playlist", pl); u.socket.emit("playlist", pl);
} }
}); });
this.startPlayback(); this.startPlayback(currentTime);
}; };
/** /**