From 47eb565b3bba7a261d80a1dcc9a601ba21503d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsolt=20Jur=C3=A1nyi?= Date: Fri, 18 Oct 2019 20:18:24 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20a=20conf.js=20m=C5=B1k=C3=B6d=C3=A9?= =?UTF-8?q?s=20f=C3=BCggv=C3=A9nybe=20szervez=C3=A9se?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/conf.js | 27 ++++++++++++++++----------- src/main.js | 4 +++- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/conf.js b/src/conf.js index ed7ebb0..0757e1f 100644 --- a/src/conf.js +++ b/src/conf.js @@ -1,17 +1,22 @@ const dotenv = require('dotenv'); const cli = require('./cli'); -// Load environment variables and defaults -dotenv.config(); -process.env.LOG_LEVEL = 2; -process.env.OUTPUT_DIR = process.env.OUTPUT_DIR || './szamlak'; -process.env.SLEEP = process.env.SLEEP || 3; -process.env.TEMP_DIR = process.env.TEMP_DIR || ''; +function configurate() { + // Load environment variables and defaults + dotenv.config(); + process.env.LOG_LEVEL = 2; + process.env.OUTPUT_DIR = process.env.OUTPUT_DIR || './szamlak'; + process.env.SLEEP = process.env.SLEEP || 3; + process.env.TEMP_DIR = process.env.TEMP_DIR || ''; -// Load command line arguments -cli.config(); + // Load command line arguments + cli.config(); + + // Auto print help + if (!process.env.DIJNET_USER || !process.env.DIJNET_PASS) { + cli.printHelpAndExit(); + } -// Auto print help -if (!process.env.DIJNET_USER || !process.env.DIJNET_PASS) { - cli.printHelpAndExit(); } + +module.exports = configurate; diff --git a/src/main.js b/src/main.js index e06e0c4..c10e2e4 100644 --- a/src/main.js +++ b/src/main.js @@ -1,11 +1,13 @@ const fs = require('fs'); const path = require('path'); const mkdirp = require('util').promisify(require('mkdirp')); -require('./conf'); // eslint-disable-line import/no-unassigned-import +const configurate = require('./conf'); const { handleError } = require('./err'); const dijnet = require('./lib'); const log = require('./logger'); +configurate(); + function tmp(name) { return process.env.TEMP_DIR.length === 0 ? null : path.join(process.env.TEMP_DIR, name); }