From 3e704559f5bab69e776bdc51ce94abd23d5dcd06 Mon Sep 17 00:00:00 2001
From: Dooho Yi <pilotedeguerre@gmail.com>
Date: Thu, 10 Nov 2022 17:29:06 +0900
Subject: [PATCH] last final mod push

---
 server.js           | 40 ++++++++++++++++++++++++++++++++++------
 src/pages/live.html | 10 +++++-----
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/server.js b/server.js
index e6c48af..50225ea 100644
--- a/server.js
+++ b/server.js
@@ -139,13 +139,19 @@ fastify.get("/fields", async function (request, reply) {
 
   let folders = [];
   for (const item of list) {
-    var fields = JSON.parse((await fs.readFile('/media/storage/public/sound-parade/' + item + '/fields.json')).toString('utf8'));
-    folders.push({
-      foldername: item,
-      group: fields.group,
-      title: fields.title,
-      comment: fields.comment,
+    let json = await fs.readFile('/media/storage/public/sound-parade/' + item + '/fields.json')
+    .catch((err) => {
+      console.error(err);
     });
+    if (json != undefined) {
+      var fields = JSON.parse(json.toString('utf8'));
+      folders.push({
+        foldername: item,
+        group: fields.group,
+        title: fields.title,
+        comment: fields.comment,
+      });
+    }
   }
 
   reply.send(folders);
@@ -311,6 +317,28 @@ io.on("connection", function(socket) {
     io.emit("flow", req);
   });
 
+  socket.on("info", async (fn) => {
+
+    //get list
+    let list = await fs.readdir('/media/storage/public/sound-parade/');
+    //list.reverse();
+
+    // console.log(list);
+
+    let folders = [];
+    for (const item of list) {
+      var fields = JSON.parse((await fs.readFile('/media/storage/public/sound-parade/' + item + '/fields.json')).toString('utf8'));
+      folders.push({
+        foldername: item,
+        group: fields.group,
+        title: fields.title,
+        comment: fields.comment,
+      });
+    }
+
+    fn(folders);
+  });
+
 });
 
 //
diff --git a/src/pages/live.html b/src/pages/live.html
index 3655f85..e3ca51f 100644
--- a/src/pages/live.html
+++ b/src/pages/live.html
@@ -133,12 +133,12 @@
          "audio": "https://p.dianaband.info/public/sound-parade/" + list[flow] + "/audio.mp3",
          "alt": "알트",
          "size": {
-           "base": 40,
-           "random": 20
+           "base": 20,
+           "random": 5
          },
          "y": {
-           "base": 20,
-           "random": 10
+           "base": 10,
+           "random": 50
          },
          "showtime": 20000
        };
@@ -163,7 +163,7 @@
 
            im.position(
              windowWidth * (1 + fading_factor),
-             (windowHeight * (object.y.base + object.y.random * Math.random()) * 0.5) / 100 // 좀더 위로 위로 - 50%  (ratio)
+             (windowHeight * (object.y.base + object.y.random * Math.random()) * 0.75) / 100 // 좀더 위로 위로 - 50%  (ratio)
            );
 
            //그림의 크기와 초기 위치 ==> 세로 보기인 경우