Fix channels not unloading / video skipping

acp.js

@@ -116,8 +116,9 @@ module.exports = {
 
         user.socket.on("acp-list-loaded", function() {
             var chans = [];
-            for(var c in Server.channels) {
+            var all = Server.getAllChannels();
-                var chan = Server.channels[c];
+            for(var c in all) {
+                var chan = all[c];
                 if(!chan)
                     continue;
 
@@ -135,8 +136,8 @@ module.exports = {
         });
 
         user.socket.on("acp-channel-unload", function(data) {
-            if(data.name in Server.channels) {
+            if(Server.getChannel(data.name) !== undefined) {
-                var c = Server.channels[data.name];
+                var c = Server.getChannel(data.name);
                 if(!c)
                     return;
                 ActionLog.record(user.ip, user.name, "acp-channel-unload");
@@ -144,6 +145,11 @@ module.exports = {
                 c.users.forEach(function(u) {
                     c.kick(u, "Channel shutting down");
                 });
+
+                // At this point c should be unloaded
+                // if it's still loaded, kill it
+                c = Server.getChannel(data.name);
+                if(c !== undefined)
                     Server.unload(c);
             }
         });

api.js

@@ -131,11 +131,11 @@ function handleChannelData(params, req, res) {
         }
         var d = {
             name: cname,
-            loaded: (cname in Server.channels)
+            loaded: Server.getChannel(cname) !== undefined
         };
 
         if(d.loaded) {
-            var chan = Server.channels[cname];
+            var chan = Server.getChannel(cname);
             d.pagetitle = chan.opts.pagetitle;
             d.media = chan.playlist.current ? chan.playlist.current.media.pack() : {};
             d.usercount = chan.users.length;
@@ -158,9 +158,10 @@ function handleChannelData(params, req, res) {
 
 function handleChannelList(params, req, res) {
     if(params.filter == "public") {
+        var all = Server.getAllChannels();
         var clist = [];
-        for(var key in Server.channels) {
+        for(var key in all) {
-            if(Server.channels[key].opts.show_public) {
+            if(all[key].opts.show_public) {
                 clist.push(key);
             }
         }
@@ -175,7 +176,7 @@ function handleChannelList(params, req, res) {
         return;
     }
     var clist = [];
-    for(var key in Server.channels) {
+    for(var key in Server.getAllChannels()) {
         clist.push(key);
     }
     handleChannelData({channel: clist.join(",")}, req, res);
@@ -385,8 +386,9 @@ function handleProfileChange(params, req, res) {
         error: result ? "" : "Internal error.  Contact an administrator"
     });
 
-    for(var n in Server.channels) {
+    var all = Server.getAllChannels();
-        var chan = Server.channels[n];
+    for(var n in all) {
+        var chan = all[n];
         for(var i = 0; i < chan.users.length; i++) {
             if(chan.users[i].name.toLowerCase() == name) {
                 chan.users[i].profile = {

channel.js

@@ -650,6 +650,7 @@ Channel.prototype.userLeave = function(user) {
     this.logger.log("--- /" + user.ip + " (" + user.name + ") left");
     if(this.users.length == 0) {
         this.logger.log("*** Channel empty, unloading");
+        var name = this.name;
         Server.unload(this);
     }
 }

playlist.js

@@ -12,6 +12,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 ULList = require("./ullist").ULList;
 var Media = require("./media").Media;
 var InfoGetter = require("./get-info");
+var AllPlaylists = {};
 
 function PlaylistItem(media, uid) {
     this.media = media;
@@ -32,6 +33,11 @@ PlaylistItem.prototype.pack = function() {
 }
 
 function Playlist(chan) {
+    if(chan.name in AllPlaylists && AllPlaylists[chan.name]) {
+        var pl = AllPlaylists[chan.name];
+        if("_leadInterval" in pl)
+            pl.die();
+    }
     this.items = new ULList();
     this.current = null;
     this.next_uid = 0;
@@ -47,31 +53,20 @@ function Playlist(chan) {
     this.lock = false;
     this.action_queue = [];
     this._qaInterval = false;
+    AllPlaylists[chan.name] = this;
 
     if(chan) {
         this.channel = chan;
         var pl = this;
         this.on("mediaUpdate", function(m) {
-            if(chan != pl.channel) {
-                pl.die();
-                return;
-            }
             chan.sendAll("mediaUpdate", m.timeupdate());
         });
         this.on("changeMedia", function(m) {
-            if(chan != pl.channel) {
-                pl.die();
-                return;
-            }
             chan.onVideoChange();
             chan.sendAll("setCurrent", pl.current.uid);
             chan.sendAll("changeMedia", m.fullupdate());
         });
         this.on("remove", function(item) {
-            if(chan != pl.channel) {
-                pl.die();
-                return;
-            }
             chan.broadcastPlaylistMeta();
             chan.sendAll("delete", {
                 uid: item.uid
@@ -129,6 +124,8 @@ Playlist.prototype.die = function () {
         clearInterval(this._leadInterval);
         this._leadInterval = false;
     }
+    for(var key in this)
+        delete this[key];
 }
 
 Playlist.prototype.load = function(data, callback) {

server.js

@@ -106,7 +106,7 @@ var Database = require("./database.js");
 Database.setup(Config);
 Database.init();
 
-exports.channels = {};
+var channels = {};
 exports.clients = {};
 
 fs.exists("chandump", function(exists) {
@@ -181,19 +181,42 @@ if(!Config.DEBUG) {
 
 function shutdown() {
     Logger.syslog.log("Unloading channels...");
-    for(var name in exports.channels) {
+    for(var name in channels) {
-        if(exports.channels[name].registered)
+        if(channels[name].registered)
-            exports.channels[name].saveDump();
+            channels[name].saveDump();
     }
     Logger.syslog.log("Shutting Down");
     process.exit(0);
 }
 
+exports.getChannel = function (name) {
+    return channels[name];
+}
+
+exports.getAllChannels = function () {
+    return channels;
+}
+
+var Channel = require("./channel.js").Channel;
+exports.createChannel = function (name) {
+    var chan = new Channel(name);
+    channels[name] = chan;
+    return chan;
+}
+
+exports.getOrCreateChannel = function (name) {
+    var chan = exports.getChannel(name);
+    if(chan !== undefined)
+        return chan;
+    return exports.createChannel(name);
+}
+
 exports.unload = function(chan) {
     if(chan.registered) {
         chan.saveDump();
     }
     chan.playlist.die();
-    exports.channels[chan.name] = null;
+    delete channels[chan.name];
-    delete exports.channels[chan.name];
+    for(var i in chan)
+        delete chan[i];
 }

user.js

@@ -97,15 +97,7 @@ User.prototype.initCallbacks = function() {
         if(data.name.length > 100)
             return;
         data.name = data.name.toLowerCase();
-        // Channel already loaded
+        this.channel = Server.getOrCreateChannel(data.name);
-        if(data.name in Server.channels && Server.channels[data.name] != null) {
-            this.channel = Server.channels[data.name];
-        }
-        // Channel not loaded
-        else {
-            Server.channels[data.name] = new Channel(data.name);
-            this.channel = Server.channels[data.name];
-        }
         if(this.loggedIn) {
             var chanrank = this.channel.getRank(this.name);
             if(chanrank > this.rank) {

www/channel.html

@@ -211,6 +211,18 @@
     <div class="push"></div>
     <div id="sitefooter">
     </div>
+
+<script type="text/javascript"><!--
+google_ad_client = "ca-pub-5492049762046640";
+/* CyTube */
+google_ad_slot = "6580478946";
+google_ad_width = 728;
+google_ad_height = 90;
+//-->
+</script>
+<script type="text/javascript"
+src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
   </div>
   <div id="footer">
     <p class="muted">