From eb5e0181514c0284207176f7fd6638aac4f6a88a Mon Sep 17 00:00:00 2001 From: Dooho Yi Date: Wed, 16 Nov 2022 15:58:37 +0900 Subject: [PATCH] parameterize --- server.js | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/server.js b/server.js index e88e84c..2bffcd6 100644 --- a/server.js +++ b/server.js @@ -65,14 +65,14 @@ fastify.get("/en/", async function (request, reply) { //get '/list' fastify.get("/list", async function (request, reply) { //get list - let list = await fs.readdir('/media/storage/public/sound-parade/'); + let list = await fs.readdir(process.env.userdata); list.reverse(); // console.log(list); let folders = []; for (const item of list) { - let json = await fs.readFile('/media/storage/public/sound-parade/' + item + '/fields.json') + let json = await fs.readFile(process.env.userdata + item + '/fields.json') .catch((err) => { console.error(err); }); @@ -97,7 +97,11 @@ fastify.get("/list", async function (request, reply) { fastify.get("/uploads/:foldername/:filename", async function (request, reply) { //get file & send +<<<<<<< HEAD var file = await fs.readFile('/media/storage/public/sound-parade/' + request.params.foldername + '/' + request.params.filename); +======= + var file = await fs.readFile(process.env.userdata + request.params.foldername + '/' + request.params.filename); +>>>>>>> ac763a7 (parameters) reply.send(file); }); @@ -116,7 +120,7 @@ fastify.get("/preview/:foldername", function (request, reply) { fastify.get("/entries", async function (request, reply) { //get list - let list = await fs.readdir('/media/storage/public/sound-parade/'); + let list = await fs.readdir(process.env.userdata); reply.send(list); }); @@ -125,14 +129,14 @@ fastify.get("/entries", async function (request, reply) { fastify.get("/fields", async function (request, reply) { //get list - let list = await fs.readdir('/media/storage/public/sound-parade/'); + let list = await fs.readdir(process.env.userdata); //list.reverse(); // console.log(list); let folders = []; for (const item of list) { - let json = await fs.readFile('/media/storage/public/sound-parade/' + item + '/fields.json') + let json = await fs.readFile(process.env.userdata + item + '/fields.json') .catch((err) => { console.error(err); }); @@ -154,18 +158,18 @@ fastify.get("/fields", async function (request, reply) { fastify.get("/delete/:foldername/:pass", async function (request, reply) { //get pw - var fields = JSON.parse((await fs.readFile('/media/storage/public/sound-parade/' + request.params.foldername + '/fields.json')).toString('utf8')); + var fields = JSON.parse((await fs.readFile(process.env.userdata + request.params.foldername + '/fields.json')).toString('utf8')); var res = false; if (fields.pass == request.params.pass) { // console.log('good pass'); //ok. let's move it to trashbin. (mv ../sound-parade.trash) - // await fs.rename('/media/storage/public/sound-parade/' + request.params.foldername, '/media/storage/public/sound-parade.trash/' + request.params.foldername); + // await fs.rename(process.env.userdata + request.params.foldername, '/media/storage/public/sound-parade.trash/' + request.params.foldername); const client = new Client(server); - const folder = await client.getFolder("/Storage/public/sound-parade/" + request.params.foldername); - await folder.move("/Storage/public/sound-parade.trash/" + request.params.foldername); + const folder = await client.getFolder(process.env.userdata_nextcloud + request.params.foldername); + await folder.move(process.env.userdata_nextcloud_trash + request.params.foldername); // res = true; @@ -207,7 +211,7 @@ fastify.post("/", async function (request, reply) { console.log("-- ready"); //file server opened //create unique folder ==> timestamp + uuid - const folder = await client.createFolder("Storage/public/sound-parade/" + moment().tz('Asia/Seoul').format('YYYYMMDD-HHmmss-') + uuidv1()); + const folder = await client.createFolder(process.env.userdata_nextcloud + moment().tz('Asia/Seoul').format('YYYYMMDD-HHmmss-') + uuidv1()); // const json = await folder.createFile("fields.json", Buffer.from(JSON.stringify({ group: audiofile.fields.group.value, @@ -315,14 +319,14 @@ io.on("connection", function(socket) { socket.on("info", async (fn) => { //get list - let list = await fs.readdir('/media/storage/public/sound-parade/'); + let list = await fs.readdir(process.env.userdata); //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')); + var fields = JSON.parse((await fs.readFile(process.env.userdata + item + '/fields.json')).toString('utf8')); folders.push({ foldername: item, group: fields.group, @@ -364,7 +368,7 @@ var looper; console.log(timegap); //get # list - let list = await fs.readdir('/media/storage/public/sound-parade/'); + let list = await fs.readdir(process.env.userdata); console.log(list.length); //loop over... @@ -376,7 +380,7 @@ var looper; })(1000); //listen -fastify.listen(10000, function (err, address) { +fastify.listen(process.env.port, function (err, address) { if (err) { fastify.log.error(err) process.exit(1)