appdata fix

Author: leopollini

PackageCreator.js

@@ -1,30 +1,43 @@
-const path = require('path');
+const path = require('./lib/path2');
 const fs = require('fs');
 const kleur = require('kleur');
-
+const { EXT_CONFIGS_DIR } = require('./lib/Constants');
 
 class PackageCreator
 {
 	static CONF_FILE_PATH = path.join(__dirname, 'config.json');
+	
 
 	constructor()
 	{
 		console.log("### CONFIGURING PACKAGE ###");
+
+		this.createAppDirectories();
 		try {this.conf = JSON.parse(fs.readFileSync(PackageCreator.CONF_FILE_PATH));}
 		catch (e) {return console.log('Could not load config file:', e);}
 
 		// console.log(conf);
 
 		this.createConfigurations();
 
-		try { fs.writeFileSync(path.join(__dirname, 'data.json'), JSON.stringify({...conf.default_data, is_configured: false}, null, 2)); }
-		catch { console.log('Could not create data.json file'); }
+		try { fs.writeFileSync(path.joinAppData('data.json'), JSON.stringify({...this.conf.default_data, is_configured: false}, null, 2)); }
+		catch (e) { console.log('Could not create data.json file:', e); }
 		// this.conf.is_configured = true;
 		// fs.writeFileSync(PackageCreator.CONF_FILE_PATH, JSON.stringify(this.conf, null, 2));
 		console.log("### PACKAGE CONFIGURATION CONCLUDED ###");
 	}
 
-
+	createAppDirectories()
+	{
+		[EXT_CONFIGS_DIR].forEach(dir => {
+			dir = path.joinAppData(dir);
+			if (!fs.existsSync(dir))
+			{
+				console.log("@ Creating", dir);
+				fs.mkdirSync(dir, { recursive: true });
+			}
+		});
+	}
 	createConfigurations()
 	{
 		this.conf_files_dir = this.conf.configuration.conf_files_dir;
@@ -68,7 +81,7 @@ class PackageCreator
 		this.betterLog(depth + 1, 'configuring', kleur.green(name));
 		const ext_name = ext.extension;
 		Reflect.deleteProperty(ext, 'extension');
-		fs.writeFileSync(path.join(__dirname, this.conf_files_dir, ext_name) + '.json', JSON.stringify(ext, null, 2));
+		fs.writeFileSync(path.joinConfigDir(ext_name + '.json'), JSON.stringify(ext, null, 2));
 	}
 
 	betterLog(depth, ...msg)

config.json

@@ -25,7 +25,6 @@
 
 	"configuration":
 	{
-		"conf_files_dir": "extensions_conf",
 		"keyboard_config":
 		{
 			"enabled": false,

extensions_main/double-click.js

@@ -1,5 +1,3 @@
-const path = require('path');
-
 // radial double-click
 class DoubleClick extends require('../lib/BaseModule')
 {

extensions_main/electronAPI.js

@@ -1,6 +1,5 @@
 const { app, ipcMain } = require('electron');
 const fs = require('fs');
-const path = require('path')
 
 // Sample Module. Plase copy-paste this file into new module's main folder
 class ElectronAPI extends require('../lib/BaseModule')

extensions_main/window-events.js

@@ -1,5 +1,4 @@
 const { app, globalShortcut } = require('electron');
-const path = require('path')
 
 // Sample Module. Plase copy-paste this file into new module's main folder
 class WindowSetup extends require('../lib/BaseModule')

lib/BaseModule.js

@@ -1,9 +1,9 @@
 const fs = require('fs');
-const path = require('path')
+const path = require('./path2')
 const kleur = require('kleur');
 const Env = require('../env');
 
-const CONF_DIR = 'extensions_conf';
+const { EXT_CONFIGS_DIR } = require('./Constants');
 
 class BaseModule
 {
@@ -20,9 +20,9 @@ class BaseModule
 		this.window = window;
 		this.tab = tab;
 		this.module_name = this.MODULE_NAME || 'BaseModule';
-		this.conf_file_path = path.join(__dirname, '..', CONF_DIR, this.module_name + '.json');
+		this.conf_file_path = path.joinConfigDir(this.module_name + '.json');
 		try { this.__conf = JSON.parse(fs.readFileSync(this.conf_file_path, 'utf-8')); }
-		catch (e) { console.log('Could not load conf file for', this.module_name, ':', e.message, '.'); }
+		catch (e) { console.log('Could not load conf file for', this.module_name, ':', e, '.'); }
 
 		if (!this.__conf) console.log('__conf not defined.');
 		else if (this.__conf.enabled == false) return;

lib/Constants.js

@@ -0,0 +1,4 @@
+EXT_CONFIGS_DIR = "extensions_conf";
+APPDATA_DIRNAME = 'Webpage_Accessor';
+
+module.exports = { EXT_CONFIGS_DIR, APPDATA_DIRNAME };

lib/SAMPLE_MODULE.js

@@ -1,4 +1,4 @@
-const path = require('path')
+const path = require('./path2')
 
 // Sample Module. Plase copy-paste this file into new module's main folder
 class SAMPLEMODULE extends require('./BaseModule')

lib/path2.js

@@ -0,0 +1,14 @@
+const path = require('path');
+const { app } = require('electron')
+const { EXT_CONFIGS_DIR, APPDATA_DIRNAME } = require('./Constants');
+
+class path2
+{
+    static __dirname = path.join(app.getPath('appData'), '');
+
+    static joinAppData(...dir) {return path.join(path2.__dirname, APPDATA_DIRNAME, ...dir);}
+    static joinConfigDir(...dir) {return path.join(path2.__dirname, APPDATA_DIRNAME, EXT_CONFIGS_DIR, ...dir);}
+    static join(...dir) {return path.join(...dir);}
+}
+
+module.exports = path2;

main.js

@@ -1,12 +1,12 @@
 
-const path = require('path');
+const path = require('./lib/path2');
 const {app, WebContentsView, BaseWindow, screen } = require('electron');
 const url = require('url');
 const fs = require('fs');
 const Env = require('./env');
 const pc = require('./PackageCreator');
 
-const DATA_FILE_PATH = path.join(__dirname, 'data.json');
+const DATA_FILE_PATH = path.joinAppData('data.json');
 const LOAD_DIR = path.join(__dirname, 'extensions_main');
 const PAGE_URL = url.format({
 		pathname: path.join(__dirname, "index.html"),
@@ -25,8 +25,9 @@ async function createMainWindow()
 	// try {app.conf = JSON.parse(fs.readFileSync(pc.CONF_FILE_PATH));}
 	// catch {console.log('Could not load config file');}
 	try {app.data = JSON.parse(fs.readFileSync(DATA_FILE_PATH));}
-	catch {console.log('Could not load data file');}
-	if (!app.data.is_configured) new pc();
+	catch {console.log('Could not load data file'); } // new pc(); return ;}
+	
+	if (!app.data.is_configured) try {new pc()} catch (e) {console.log("### CONFIGURATION FAILED:", e, "###")};
 
 	const {height, width} = screen.getPrimaryDisplay().workAreaSize;
 	app.displaySize = {height: height, width: width}
@@ -64,13 +65,14 @@ async function createMainWindow()
 		try
 		{
 			const ModuleClass = require(fullpath);
+			
 			const t = new ModuleClass()
 			enabled_modules.push(t);
 			t.__start(mainWindow, mainTab);
 		}
 		catch (e)
 		{ 
-			console.log("Module not loaded:", e.message);
+			console.log("Module not loaded:", e);
 		}
 	});