a commit

Author: leopollini

PackageCreator.js

@@ -17,16 +17,17 @@ class PackageCreator
 		try {app.conf = JSON.parse(fs.readFileSync(PackageCreator.CONF_FILE_PATH));}
 		catch(e) {console.log('Main: could not load config file:', e); app.exit(0); } // new pc(); return ;}
 		// load data file, if present
-		console.log('arcodio', findAppArg('reload-configs'));
 
 		if (fs.existsSync(PackageCreator.DATA_FILE_PATH))
 		{
 			try
 			{
 				app.data = JSON.parse(fs.readFileSync(PackageCreator.DATA_FILE_PATH));
-				console.log(app.data.is_configured, findAppArg('reload-configs'));
 				if (app.data.is_configured == true && !findAppArg('reload-configs'))
+				{
+					console.log("### APP ALREADY CONFIGURED ###");
 					return;
+				}
 			}
 			catch(e) {console.log('Main: could not load data file. Reconfiguring Webpage Accessor', e); }
 		}

config.json

@@ -6,7 +6,7 @@
 			"name": "Leonardo Pollini",
 			"email": "[email protected]"
 		},
-		"version": "0.0.11",
+		"version": "0.0.20",
 		"autoupdate": false,
 		"electron_package": "package.json",
 		"app_name": "Webpage Accessor",
@@ -58,6 +58,7 @@
 		},
 		"other_actions":
 		{
+			"enabled": true,
 			"actions":
 			{
 				"toolbar":
@@ -105,7 +106,7 @@
 				{
 					"enabled": true,
 					"extension": "splashscreen",
-					"splash_timeout": 20,
+					"splash_timeout": 5,
 					"splash_url": 
 					{
 						"pathname": "google.com",

extensions/autoupdate/preload.js

@@ -10,6 +10,8 @@ class Autoupdate_preload extends require('../../lib/BasePreload.js')
         if (this.__conf.update_mode.mode == "long_press")
         {
             this.update_click_timeout = this.__conf.update_mode
+
+            // bad check: frequent false positives.
             window.addEventListener('pointerdown', (event) => {
                 this.update_check_timer = setTimeout(() => {this.updateCheckRequest()}, this.__conf.update_mode.duration * 1000);
             })

extensions/splashscreen/main.js

@@ -8,7 +8,7 @@ const url = require('url');
 class Splashscreen extends require('../../lib/BaseModule')
 {
     MODULE_NAME = "splashscreen";    // MUST be the same as the 'extension' field in config.json
-    required_modules = ['window-events'];
+    // required_modules = ['window-events'];
 
     is_splashscreen = false;
     inputed = true;
@@ -32,13 +32,14 @@ class Splashscreen extends require('../../lib/BaseModule')
                 this.removeSplash();
         });
 
+        // Actual splash screen activation time is between 3/4 of the timeout value and 3/2 of the timeout value
         setInterval(() => {
             if (Env.VERBOSE)
                 this.log("splash_check");
             if (!this.inputed)
                 this.setSplash();
             this.inputed = false;
-        }, (this.__conf.splash_timeout || 60) * 500);
+        }, (this.__conf.splash_timeout || 60) * 750);
 
         // const mainTab = TabsManager.activeTabName;
         // TabsManager.setNewTab(this.splash, "splash");

extensions/window-events/main.js

@@ -1,5 +1,6 @@
 const { app, globalShortcut } = require('electron');
-const {checkActiveModules} = require('../../main')
+const {checkActiveModules} = require('../../main');
+const Env = require('../../env');
 
 // Sample Module. Plase copy-paste this file into new module's main folder
 class WindowSetup extends require('../../lib/BaseModule')
@@ -15,15 +16,18 @@ class WindowSetup extends require('../../lib/BaseModule')
         this.window.on('resize', () => {
 			if (this.window.isFullScreen()) return ;
             this.tab.setBounds({x: 0, y: 0  , height: this.window.getContentBounds().height, width: this.window.getContentBounds().width});
-			this.logWindowDimensions('resize');
+			if (Env.VERBOSE)
+				this.logWindowDimensions('resize');
         });
         this.window.on('enter-full-screen', () => {
             this.tab.setBounds({x: 0, y: 0  , height: this.window.getContentBounds().height, width: this.window.getContentBounds().width});
-			this.logWindowDimensions('enter fullscreen');
+			if (Env.VERBOSE)
+				this.logWindowDimensions('enter fullscreen');
         });
         this.window.on('leave-full-screen', () => {
             this.tab.setBounds({x: 0, y: 0  , height: this.window.getContentBounds().height, width: this.window.getContentBounds().width});
-			this.logWindowDimensions('leave fullscreen');
+			if (Env.VERBOSE)
+				this.logWindowDimensions('leave fullscreen');
         });
 
 		if (this.__conf.enable_shortcuts == true)

lib/BaseModule.js

@@ -65,8 +65,11 @@ class BaseModule
 			catch (e) { this.warn('Could not load conf file for', this.module_name, ':', e, '.'); }
 
 		if (!this.__conf) this.warn('__conf not defined.');
-		else if (this.__conf.enabled == false) return;
-		
+		else if (this.__conf.enabled == false)
+		{
+			this.warn('Module disabled in config.'); return;
+		}
+
 		this.__data = data;	// This is the contents of data.json
 
 		// this.log('Setting up', this.module_name, 'config:', this.__conf, '...');

main.js

@@ -81,11 +81,11 @@ function checkActiveModules()
 	});
 }
 
-// app.on('browser-window-created', (event, window) => {
-//   console.log('New window created:', window.id);
-//   window.close();
-//   // You can check window count here
-// });
+app.on('browser-window-created', (event, window) => {
+  console.log('New window created:', window.id);
+  window.close();
+  // You can check window count here
+});
 
 
 app.on('ready', createMainWindow);

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "webpage_accessor",
-	"version": "0.0.19",
+	"version": "0.0.20",
 	"description": "Electron tests for independant desktop web app",
 	"author": {
 		"name": "Leonardo Pollini",