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

Add try-catch to playlist loading

This commit is contained in:
calzoneman 2013-10-12 15:54:39 -05:00
parent af2ef83df8
commit babeb01ebe
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog
View File

@ -1,3 +1,7 @@
Sat Oct 12 15:53 2013 CDT
* lib/channel.js: Add a try-catch to playlist loading to catch
the mysterious error that's been coming up (corrupt pl?)
Mon Oct 07 19:00 2013 CDT Mon Oct 07 19:00 2013 CDT
* lib/channel.js: Rearrange the callback order to prevent database * lib/channel.js: Rearrange the callback order to prevent database
lookups from racing with the playlist queue. lookups from racing with the playlist queue.

8
lib/channel.js
View File

@ -1599,9 +1599,10 @@ Channel.prototype.tryQueuePlaylist = function(user, data) {
return; return;
} }
try {
if (data.pos === "next") { if (data.pos === "next") {
pl.reverse(); pl.reverse();
if (self.playlist.items.length === 0) if (pl.length > 0 && self.playlist.items.length === 0)
pl.unshift(pl.pop()); pl.unshift(pl.pop());
} }
@ -1610,6 +1611,11 @@ Channel.prototype.tryQueuePlaylist = function(user, data) {
pl[i].temp = !self.hasPermission(user, "addnontemp"); pl[i].temp = !self.hasPermission(user, "addnontemp");
self.addMedia(pl[i], user); self.addMedia(pl[i], user);
} }
} catch (e) {
Logger.errlog.log("Loading user playlist failed!");
Logger.errlog.log("PL: " + user.name + "-" + data.name);
Logger.errlog.log(e.stack);
}
}); });
} }