From d2b37599139583f801c44f665eeb4eceb6a2129b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 27 Feb 2018 11:26:31 +0100
Subject: [PATCH] Rewriting stuff

---
 server/apps/rewrite.js               | 31 ++++++++++++++++++++++++++++
 server/handlers/list.js              |  2 +-
 server/public/assets/js/frontpage.js |  7 ++++++-
 server/public/assets/js/player.js    |  2 +-
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 server/apps/rewrite.js

diff --git a/server/apps/rewrite.js b/server/apps/rewrite.js
new file mode 100644
index 00000000..9748f5c5
--- /dev/null
+++ b/server/apps/rewrite.js
@@ -0,0 +1,31 @@
+path = require('path'),
+pathThumbnails = __dirname;
+db = require(pathThumbnails + '/../handlers/db.js');
+
+db.getCollectionNames(function(err, docs) {
+    for(var i = 0; i < docs.length; i++) {
+        makeNewAndDelete(docs[i]);
+    }
+})
+
+/*function delete(name) {
+    db.collection(name).remove(function(err, doc) {
+
+    })
+}*/
+
+function makeNewAndDelete(name) {
+    db.collection(name).find({views: {$exists: true}}, function(err, doc) {
+        //console.log(doc);
+        if(doc.length == 0) {
+            //console.log(name);
+        } else if(doc.length == 1) {
+            db.collection(name + "_settings").insert(doc[0], function(err, result){
+                console.log("Result insert", result);
+                /*db.collection(name).remove({views: {$exists: true}}, function(err, result_del) {
+                    console.log("Result delete", result_del);
+                });*/
+            });
+        }
+    });
+}
diff --git a/server/handlers/list.js b/server/handlers/list.js
index 97bd3cc3..2bcb7a93 100644
--- a/server/handlers/list.js
+++ b/server/handlers/list.js
@@ -58,7 +58,7 @@ function list(msg, guid, coll, offline, socket) {
             } else {
                 db.createCollection(coll, function(err, docs){
                     var configs = {"addsongs":false, "adminpass":"", "allvideos":true, "frontpage":true, "longsongs":false, "removeplay": false, "shuffle": true, "skip": false, "skips": [], "startTime":Functions.get_time(), "views": [], "vote": false, "desc": ""};
-                    db.collection(coll).insert(configs, function(err, docs){
+                    db.collection(coll + "_settings").insert(configs, function(err, docs){
                         socket.join(coll);
                         List.send_list(coll, socket, true, false, true);
                         db.collection("frontpage_lists").insert({"_id": coll, "count" : 0, "frontpage": true, "accessed": Functions.get_time(), "viewers": 1});
diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js
index 3ff2a17c..1f749243 100755
--- a/server/public/assets/js/frontpage.js
+++ b/server/public/assets/js/frontpage.js
@@ -23,7 +23,12 @@ var Frontpage = {
             msg
         ]);
         Frontpage.all_channels = msg.channels;
-        Frontpage.populate_channels(msg.channels, true);
+        if(msg.channels.length == 0) {
+            $("#preloader").css("display", "none");
+            $("#channel-list-container").append("<p>No channels yet</p>");
+        } else {
+            Frontpage.populate_channels(msg.channels, true);
+        }
         Frontpage.set_viewers(msg.viewers);
     },
 
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index c1d7e856..0b5b65d9 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -9,6 +9,7 @@ var Player = {
     np: {},
 
     youtube_listener: function(obj) {
+        Helper.log(["object", obj]);
         var state;
         if(embed && obj.np) {
             if(window.parentWindow && window.parentOrigin) {
@@ -42,7 +43,6 @@ var Player = {
 
             }
             Helper.log(["video_id variable: " + video_id]);
-
             if(!obj.np){
                 $('#song-title').html("Empty channel. Add some songs!");
                 document.title = "Zoff - the shared YouTube based radio";