From 0870a0651f1d2cf29ccee3ff52bebc54b7810c14 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 8 Apr 2019 16:31:36 +0200 Subject: [PATCH] Move the various scripts into a dedicated folder --- .../check-account-deletion.js | 2 +- check-accounts.js => scripts/check-accounts.js | 4 ++-- .../delete-inactive.js | 4 ++-- .../expire-channels.js | 8 ++++---- pinned.js => scripts/pinned.js | 6 +++--- pinneddata.js => scripts/pinneddata.js | 18 +++++++++--------- 6 files changed, 21 insertions(+), 21 deletions(-) rename check-account-deletion.js => scripts/check-account-deletion.js (96%) rename check-accounts.js => scripts/check-accounts.js (91%) rename delete-inactive.js => scripts/delete-inactive.js (92%) rename expire-channels.js => scripts/expire-channels.js (92%) rename pinned.js => scripts/pinned.js (92%) rename pinneddata.js => scripts/pinneddata.js (93%) diff --git a/check-account-deletion.js b/scripts/check-account-deletion.js similarity index 96% rename from check-account-deletion.js rename to scripts/check-account-deletion.js index 39bbf02f5..34930d1eb 100644 --- a/check-account-deletion.js +++ b/scripts/check-account-deletion.js @@ -54,7 +54,7 @@ let data = []; let pinned = []; nThen((waitFor) => { - let f = './pins/' + edPublic.slice(0, 2) + '/' + edPublic + '.ndjson'; + let f = '../pins/' + edPublic.slice(0, 2) + '/' + edPublic + '.ndjson'; Fs.readFile(f, waitFor((err, content) => { if (err) { throw err; } pinned = hashesFromPinFile(content.toString('utf8'), f); diff --git a/check-accounts.js b/scripts/check-accounts.js similarity index 91% rename from check-accounts.js rename to scripts/check-accounts.js index 4f37e51fd..ae31676cf 100644 --- a/check-accounts.js +++ b/scripts/check-accounts.js @@ -1,7 +1,7 @@ /* globals Buffer */ var Https = require('https'); -var Config = require("./config.js"); -var Package = require("./package.json"); +var Config = require("../config/config.js"); +var Package = require("../package.json"); var body = JSON.stringify({ domain: Config.myDomain, diff --git a/delete-inactive.js b/scripts/delete-inactive.js similarity index 92% rename from delete-inactive.js rename to scripts/delete-inactive.js index 9acf15f69..80d2bb09a 100644 --- a/delete-inactive.js +++ b/scripts/delete-inactive.js @@ -5,9 +5,9 @@ const Saferphore = require("saferphore"); const PinnedData = require('./pinneddata'); let config; try { - config = require('./config'); + config = require('../config/config'); } catch (e) { - config = require('./config.example'); + config = require('../config/config.example'); } if (!config.inactiveTime || typeof(config.inactiveTime) !== "number") { return; } diff --git a/expire-channels.js b/scripts/expire-channels.js similarity index 92% rename from expire-channels.js rename to scripts/expire-channels.js index f7597b323..ec25d10a7 100644 --- a/expire-channels.js +++ b/scripts/expire-channels.js @@ -5,13 +5,13 @@ var nThen = require("nthen"); var config; try { - config = require('./config'); + config = require('../config/config'); } catch (e) { - config = require('./config.example'); + config = require('../config/config.example'); } -var FileStorage = require(config.storage || './storage/file'); -var root = Path.resolve(config.taskPath || './tasks'); +var FileStorage = require('../' + config.storage || './storage/file'); +var root = Path.resolve('../' + config.taskPath || './tasks'); var dirs; var nt; diff --git a/pinned.js b/scripts/pinned.js similarity index 92% rename from pinned.js rename to scripts/pinned.js index d5df9373a..15c1f922f 100644 --- a/pinned.js +++ b/scripts/pinned.js @@ -35,7 +35,7 @@ const hashesFromPinFile = (pinFile, fileName) => { module.exports.load = function (cb, config) { nThen((waitFor) => { - Fs.readdir('./pins', waitFor((err, list) => { + Fs.readdir('../pins', waitFor((err, list) => { if (err) { if (err.code === 'ENOENT') { dirList = []; @@ -48,11 +48,11 @@ module.exports.load = function (cb, config) { }).nThen((waitFor) => { dirList.forEach((f) => { sema.take((returnAfter) => { - Fs.readdir('./pins/' + f, waitFor(returnAfter((err, list2) => { + Fs.readdir('../pins/' + f, waitFor(returnAfter((err, list2) => { if (err) { throw err; } list2.forEach((ff) => { if (config && config.exclude && config.exclude.indexOf(ff) > -1) { return; } - fileList.push('./pins/' + f + '/' + ff); + fileList.push('../pins/' + f + '/' + ff); }); }))); }); diff --git a/pinneddata.js b/scripts/pinneddata.js similarity index 93% rename from pinneddata.js rename to scripts/pinneddata.js index 346062fb6..4c30f0a67 100644 --- a/pinneddata.js +++ b/scripts/pinneddata.js @@ -65,7 +65,7 @@ const pinned = {}; // map of pinned files module.exports.load = function (config, cb) { nThen((waitFor) => { // read the subdirectories in the datastore - Fs.readdir('./datastore', waitFor((err, list) => { + Fs.readdir('../datastore', waitFor((err, list) => { if (err) { throw err; } dirList = list; })); @@ -76,15 +76,15 @@ module.exports.load = function (config, cb) { sema.take((returnAfter) => { // get the list of files in every subdirectory // and push them to 'fileList' - Fs.readdir('./datastore/' + f, waitFor(returnAfter((err, list2) => { + Fs.readdir('../datastore/' + f, waitFor(returnAfter((err, list2) => { if (err) { throw err; } - list2.forEach((ff) => { fileList.push('./datastore/' + f + '/' + ff); }); + list2.forEach((ff) => { fileList.push('../datastore/' + f + '/' + ff); }); }))); }); }); }).nThen((waitFor) => { // read the subdirectories in 'blob' - Fs.readdir('./blob', waitFor((err, list) => { + Fs.readdir('../blob', waitFor((err, list) => { if (err) { throw err; } // overwrite dirList dirList = list; @@ -96,9 +96,9 @@ module.exports.load = function (config, cb) { sema.take((returnAfter) => { // get the list of files in every subdirectory // and push them to 'fileList' - Fs.readdir('./blob/' + f, waitFor(returnAfter((err, list2) => { + Fs.readdir('../blob/' + f, waitFor(returnAfter((err, list2) => { if (err) { throw err; } - list2.forEach((ff) => { fileList.push('./blob/' + f + '/' + ff); }); + list2.forEach((ff) => { fileList.push('../blob/' + f + '/' + ff); }); }))); }); }); @@ -118,7 +118,7 @@ module.exports.load = function (config, cb) { }); }).nThen((waitFor) => { // read the subdirectories in the pinstore - Fs.readdir('./pins', waitFor((err, list) => { + Fs.readdir('../pins', waitFor((err, list) => { if (err) { throw err; } dirList = list; })); @@ -131,9 +131,9 @@ module.exports.load = function (config, cb) { sema.take((returnAfter) => { // get the list of files in every subdirectory // and push them to 'fileList' (which is empty because we keep reusing it) - Fs.readdir('./pins/' + f, waitFor(returnAfter((err, list2) => { + Fs.readdir('../pins/' + f, waitFor(returnAfter((err, list2) => { if (err) { throw err; } - list2.forEach((ff) => { fileList.push('./pins/' + f + '/' + ff); }); + list2.forEach((ff) => { fileList.push('../pins/' + f + '/' + ff); }); }))); }); });