From d5bdf299baf73255fb1330e9c60b78d724ea84fe Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Fri, 26 Feb 2021 16:08:05 +0100
Subject: [PATCH] The 'common' is now the instance lib ('instance/lib')
---
Makefile | 2 +-
client/main.js | 2 +-
instance/index.js | 2 +-
{common => instance/lib}/.gitkeep | 0
{common => instance/lib}/config.js | 2 +-
{common => instance/lib}/db.js | 4 ++--
{common => instance/lib}/isRunning.js | 0
{common => instance/lib}/lkt.js | 4 ++--
{common => instance/lib}/logger.js | 2 +-
instance/log.js | 2 +-
main.js | 10 +++++-----
test/test_db.js | 4 ++--
test/test_lkt.js | 4 ++--
13 files changed, 19 insertions(+), 19 deletions(-)
rename {common => instance/lib}/.gitkeep (100%)
rename {common => instance/lib}/config.js (96%)
rename {common => instance/lib}/db.js (98%)
rename {common => instance/lib}/isRunning.js (100%)
rename {common => instance/lib}/lkt.js (99%)
rename {common => instance/lib}/logger.js (98%)
diff --git a/Makefile b/Makefile
index ba84005..7f4fe47 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,6 @@ debug:
$(YARN) test --no-sandbox
style:
- $(YARN) prettier --write instance common style client test main.js >/dev/null
+ $(YARN) prettier --write instance style client test main.js >/dev/null
.PHONY: test debug run prepare style
diff --git a/client/main.js b/client/main.js
index ab07310..f80a39e 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,5 +1,5 @@
const rootDirectory = `${__dirname}/..`;
-const logger = require(rootDirectory + '/common/logger.js');
+const logger = require(rootDirectory + '/instance/lib/logger.js');
const express = require('express');
const packageConfig = require(rootDirectory + '/package.json').config;
diff --git a/instance/index.js b/instance/index.js
index 613dc78..83d1717 100644
--- a/instance/index.js
+++ b/instance/index.js
@@ -1,7 +1,7 @@
/* The main window instance */
const { ipcRenderer } = require('electron'),
- logger = require('../common/logger.js'),
+ logger = require('./lib/logger.js'),
ejs = require('ejs'),
e = require('express');
diff --git a/common/.gitkeep b/instance/lib/.gitkeep
similarity index 100%
rename from common/.gitkeep
rename to instance/lib/.gitkeep
diff --git a/common/config.js b/instance/lib/config.js
similarity index 96%
rename from common/config.js
rename to instance/lib/config.js
index 6583fa4..bfbc6af 100644
--- a/common/config.js
+++ b/instance/lib/config.js
@@ -2,7 +2,7 @@ const ini = require('ini'),
os = require('os'),
fs = require('fs');
-const packageConfig = require('../package.json').config;
+const packageConfig = require('../../package.json').config;
const __configDir = `${os.homedir()}/.config/lektor`;
const __configFile = `${__configDir}/amadeus.ini`;
diff --git a/common/db.js b/instance/lib/db.js
similarity index 98%
rename from common/db.js
rename to instance/lib/db.js
index 0f608fb..dd06166 100644
--- a/common/db.js
+++ b/instance/lib/db.js
@@ -1,5 +1,5 @@
-const logger = require.main.require('./common/logger.js');
-const config = require.main.require('./common/config.js');
+const logger = require('./logger.js');
+const config = require('./config.js');
var sqlite3 = require.main.require('sqlite3').verbose();
/* The kara table is defined as follows:
diff --git a/common/isRunning.js b/instance/lib/isRunning.js
similarity index 100%
rename from common/isRunning.js
rename to instance/lib/isRunning.js
diff --git a/common/lkt.js b/instance/lib/lkt.js
similarity index 99%
rename from common/lkt.js
rename to instance/lib/lkt.js
index 5f58ad1..52ca9ba 100644
--- a/common/lkt.js
+++ b/instance/lib/lkt.js
@@ -1,8 +1,8 @@
-const logger = require.main.require('./common/logger.js'),
+const logger = require('./logger.js'),
net = require('net'),
{ finished } = require('stream'),
{ cli } = require('winston/lib/winston/config');
-var config = require.main.require('./common/config.js');
+var config = require('./config.js');
class LktClient {
/***************************************
diff --git a/common/logger.js b/instance/lib/logger.js
similarity index 98%
rename from common/logger.js
rename to instance/lib/logger.js
index de288aa..33bba9f 100644
--- a/common/logger.js
+++ b/instance/lib/logger.js
@@ -1,6 +1,6 @@
/* To use this logger, just require the file and use the logger as follows:
* <code>
- * const logger = require('./common/logger.js');
+ * const logger = require('./instance/lib/logger.js');
* logger.log('info', 'This is an information message.');
* logger.log('debug', 'This is an information message.');
* logger.log('warn', 'This is an information message.');
diff --git a/instance/log.js b/instance/log.js
index 1663bba..8d7c1e1 100644
--- a/instance/log.js
+++ b/instance/log.js
@@ -1,7 +1,7 @@
/* The log window */
const { ipcRenderer } = require('electron'),
- logger = require('../common/logger.js'),
+ logger = require('./lib/logger.js'),
ejs = require('ejs'),
e = require('express'),
fs = require('fs'),
diff --git a/main.js b/main.js
index e9f03de..43a11b7 100644
--- a/main.js
+++ b/main.js
@@ -1,10 +1,10 @@
-const logger = require.main.require('./common/logger.js'),
+const logger = require.main.require('./instance/lib/logger.js'),
electron = require('electron'),
{ app, BrowserWindow, globalShortcut, ipcMain } = require('electron'),
{ fork, spawn } = require('child_process'),
fs = require('fs'),
- lkt = require.main.require('./common/lkt.js'),
- isRunning = require('./common/isRunning.js');
+ lkt = require.main.require('./instance/lib/lkt.js'),
+ isRunning = require('./instance/lib/isRunning.js');
let electronEjs = require('electron-ejs');
let ejs = new electronEjs({ app: 'Amadeus' }, {});
@@ -12,8 +12,8 @@ let ejs = new electronEjs({ app: 'Amadeus' }, {});
const packageConfig = require('./package.json').config;
logger.debug('main', 'Package config is ' + JSON.stringify(packageConfig));
-var config = require('./common/config.js');
-var db = require.main.require('./common/db.js');
+var config = require('./instance/lib/config.js');
+var db = require.main.require('./instance/lib/db.js');
var Tail = require('tail').Tail;
var client; /* Sub process for the express server */
diff --git a/test/test_db.js b/test/test_db.js
index 36094fa..326fd1d 100644
--- a/test/test_db.js
+++ b/test/test_db.js
@@ -1,5 +1,5 @@
-const logger = require.main.require('./common/logger.js');
-const KaraDatabase = require.main.require('./common/db.js');
+const logger = require.main.require('./instance/lib/logger.js');
+const KaraDatabase = require.main.require('./instance/lib/db.js');
var myDb = new KaraDatabase("/home/kara/kara.db");
diff --git a/test/test_lkt.js b/test/test_lkt.js
index 98a08ac..461783f 100644
--- a/test/test_lkt.js
+++ b/test/test_lkt.js
@@ -1,5 +1,5 @@
-const logger = require.main.require('./common/logger.js');
-const lkt = require.main.require('./common/lkt.js');
+const logger = require.main.require('./instance/lib/logger.js');
+const lkt = require.main.require('./instance/lib/lkt.js');
lkt
.commandStatus()
--
GitLab