rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Fix #248, fix channel caching temp media

Browse source
This commit is contained in:
calzoneman 2013-08-07 21:05:30 -04:00
parent ac9d60eee7
commit 9c83a4dd3e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
channel.js
View file

@ -1161,6 +1161,7 @@ Channel.prototype.addMedia = function(data, user) {
return; return;
} }
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) {
@ -1195,9 +1196,6 @@ Channel.prototype.addMedia = function(data, user) {
return; return;
} }
data.temp = isLive(data.type) || !this.hasPermission(user, "addnontemp");
data.queueby = user ? user.name : "";
this.playlist.addMedia(data, function(err, item) { this.playlist.addMedia(data, function(err, item) {
if(err) { if(err) {
if(err === true) if(err === true)
@ -1213,7 +1211,8 @@ Channel.prototype.addMedia = function(data, user) {
after: item.prev ? item.prev.uid : "prepend" after: item.prev ? item.prev.uid : "prepend"
}); });
chan.broadcastPlaylistMeta(); chan.broadcastPlaylistMeta();
chan.cacheMedia(item.media); if(!item.temp)
chan.cacheMedia(item.media);
} }
}); });
} }
@ -1237,7 +1236,8 @@ Channel.prototype.addMediaList = function(data, user) {
after: item.prev ? item.prev.uid : "prepend" after: item.prev ? item.prev.uid : "prepend"
}); });
chan.broadcastPlaylistMeta(); chan.broadcastPlaylistMeta();
chan.cacheMedia(item.media); if(!item.temp)
chan.cacheMedia(item.media);
} }
}); });
} }

4
www/assets/js/ui.js
View file

@ -314,7 +314,7 @@ $("#customembed_btn").click(function () {
$("#getplaylist").click(function() { $("#getplaylist").click(function() {
var callback = function(data) { var callback = function(data) {
PLAYER.hide(); hidePlayer();
socket.listeners("playlist").splice( socket.listeners("playlist").splice(
socket.listeners("playlist").indexOf(callback) socket.listeners("playlist").indexOf(callback)
); );
@ -342,7 +342,7 @@ $("#getplaylist").click(function() {
$("<div/>").addClass("modal-footer").appendTo(modal); $("<div/>").addClass("modal-footer").appendTo(modal);
modal.on("hidden", function() { modal.on("hidden", function() {
modal.remove(); modal.remove();
PLAYER.unhide(); unhidePlayer();
}); });
modal.modal(); modal.modal();
} }