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

Fix queueby on user playlists

This commit is contained in:
Calvin Montgomery 2013-07-09 20:38:48 +04:00
parent 68146043ad
commit 31564b97fd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channel.js
View File

@ -1192,6 +1192,8 @@ Channel.prototype.tryQueue = function(user, data) {
return; return;
} }
data.queueby = user ? user.name : "";
if(data.list) if(data.list)
this.addMediaList(data, user); this.addMediaList(data, user);
else else
@ -1200,7 +1202,6 @@ Channel.prototype.tryQueue = function(user, data) {
Channel.prototype.addMedia = function(data, user) { Channel.prototype.addMedia = function(data, user) {
data.temp = isLive(data.type) || !this.hasPermission(user, "addnontemp"); data.temp = isLive(data.type) || !this.hasPermission(user, "addnontemp");
data.queueby = user ? user.name : "";
data.maxlength = this.hasPermission(user, "exceedmaxlength") ? 0 : this.opts.maxlength; data.maxlength = this.hasPermission(user, "exceedmaxlength") ? 0 : this.opts.maxlength;
var chan = this; var chan = this;
if(data.id in this.library) { if(data.id in this.library) {
@ -1294,6 +1295,7 @@ Channel.prototype.tryQueuePlaylist = function(user, data) {
var pl = Database.loadUserPlaylist(user.name, data.name); var pl = Database.loadUserPlaylist(user.name, data.name);
data.list = pl; data.list = pl;
data.queueby = user.name;
this.addMediaList(data, user); this.addMediaList(data, user);
} }

4
playlist.js
View File

@ -249,8 +249,12 @@ Playlist.prototype.addMediaList = function(data, callback) {
start = data.list[data.list.length - 1]; start = data.list[data.list.length - 1];
} }
if(this.items.length != 0)
start = false;
var pl = this; var pl = this;
data.list.forEach(function(x) { data.list.forEach(function(x) {
x.queueby = data.queueby;
x.pos = data.pos; x.pos = data.pos;
if(start && x == start) { if(start && x == start) {
pl.addMedia(x, function (err, item) { pl.addMedia(x, function (err, item) {