data.json + disable_keyboard + fullscreen tests

leopollini · leopollini · commit e67f62212ce6 · 2025-08-28T16:46:47.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,15 +16,9 @@ jobs:
       - name: Build project
         run: |
           npm run build
-          
-
-      - name: Move artifact
-        run: |
-          mkdir output
-          mv dist/* output/
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-output
-          path: output/
+          name: package
+          path: /dist
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 node_modules
 .vscode
 out/
-dist
+dist
+extensions_conf/*
diff --git a/PackageCreator.js b/PackageCreator.js
@@ -1,7 +1,7 @@
 const path = require('./lib/path2');
 const fs = require('fs');
 const kleur = require('kleur');
-const { EXT_CONFIGS_DIR } = require('./lib/Constants');
+const { EXT_CONFIGS_DIR, DATA_CONF_PATH } = require('./lib/Constants');
 
 class PackageCreator
 {
@@ -20,7 +20,7 @@ class PackageCreator
 
 		this.createConfigurations();
 
-		try { fs.writeFileSync(path.joinAppData('data.json'), JSON.stringify({...this.conf.default_data, is_configured: false}, null, 2)); }
+		try { fs.writeFileSync(path.joinAppData(DATA_CONF_PATH), 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));
@@ -40,8 +40,6 @@ class PackageCreator
 	}
 	createConfigurations()
 	{
-		this.conf_files_dir = this.conf.configuration.conf_files_dir;
-		Reflect.deleteProperty(this.conf.configuration, 'conf_files_dir');
 		Object.entries(this.conf.configuration).forEach(([name, conf]) => {
 			this.loadConfiguration(conf, name);
 		});
diff --git a/config.json b/config.json
@@ -37,6 +37,7 @@
 		{
 			"enabled": true,
 			"remap_to_pointeraction": true,
+			"disable_keyboard": true,
 			"actions":
 			{
 				"enlarged_doubleclick":
diff --git a/extensions_conf b/extensions_conf
@@ -0,0 +1 @@
+/home/leonardo/.config/Webpage_Accessor/extensions_conf/
diff --git a/extensions_conf/double-click.json b/extensions_conf/double-click.json
diff --git a/extensions_conf/electronAPI.json b/extensions_conf/electronAPI.json
diff --git a/extensions_conf/long-press.json b/extensions_conf/long-press.json
diff --git a/extensions_conf/window-events.json b/extensions_conf/window-events.json
diff --git a/extensions_main/double-click.js b/extensions_main/double-click.js
@@ -33,15 +33,20 @@ class DoubleClick extends require('../lib/BaseModule')
                          break ;
                     }
                  break ;
+                case 'gestureTapDown' :
+                    this.looseDoubleClickCheck(input, event);
+                 break ;
             }
         });
-        // if (BLOCK_KEYBOARD)
-        // {
-        //     tab.webContents.on('before-input-event', (event, input) => {
-        //         if (input.type === 'char' || input.type === 'rawKeyDown' || input.type === 'keyUp')
-        //             event.preventDefault();
-        //     });
-        // }
+
+        if (this.__conf.disable_keyboard == true)
+        {
+            this.log("disabling keyboard");
+            this.tab.webContents.on("before-input-event", (event, input) => {
+                if (input.type === 'keyDown' || input.type === 'keyUp')
+                    event.preventDefault();
+            });
+        }
     }
     
     async looseDoubleClickCheck(input, event)
diff --git a/extensions_main/window-events.js b/extensions_main/window-events.js
@@ -11,6 +11,8 @@ class WindowSetup extends require('../lib/BaseModule')
 	// Setup code here. This function is called in BaseModule's constructor.
 	setup()
 	{
+		this.requireDataConf();
+
         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});
@@ -31,6 +33,8 @@ class WindowSetup extends require('../lib/BaseModule')
 		globalShortcut.register('d', () => {
 			this.tab.webContents.toggleDevTools();
 		});
+
+		if (this.__data.fullscreen == true) this.window.setFullScreen(true);
 	}
 
 	logWindowDimensions(operation = '')
diff --git a/lib/BaseModule.js b/lib/BaseModule.js
@@ -2,8 +2,7 @@ const fs = require('fs');
 const path = require('./path2')
 const kleur = require('kleur');
 const Env = require('../env');
-
-const { EXT_CONFIGS_DIR } = require('./Constants');
+const { DATA_CONF_PATH } = require('./Constants');
 
 class BaseModule
 {
@@ -47,6 +46,12 @@ class BaseModule
 	setActive(active = true) {this.is_active = active;}
 
 	isActive() {return this.is_active;}
+
+	requireDataConf()
+	{
+		try { this.__data = JSON.parse(fs.readFileSync(path.joinAppData(DATA_CONF_PATH))); }
+		catch (e) { console.log('Could not load conf file for', this.module_name, ':', e, '.'); }
+	}
 }
 
 module.exports = BaseModule;
diff --git a/lib/Constants.js b/lib/Constants.js
@@ -1,4 +1,5 @@
-EXT_CONFIGS_DIR = "extensions_conf";
+EXT_CONFIGS_DIR = 'extensions_conf';
 APPDATA_DIRNAME = 'Webpage_Accessor';
+DATA_CONF_PATH = 'extensions_conf/data.json'
 
-module.exports = { EXT_CONFIGS_DIR, APPDATA_DIRNAME };
+module.exports = { EXT_CONFIGS_DIR, APPDATA_DIRNAME, DATA_CONF_PATH };
diff --git a/main.js b/main.js
@@ -5,8 +5,10 @@ const url = require('url');
 const fs = require('fs');
 const Env = require('./env');
 const pc = require('./PackageCreator');
+const kleur = require('kleur');
+const { DATA_CONF_PATH } = require('./lib/Constants');
 
-const DATA_FILE_PATH = path.joinAppData('data.json');
+const DATA_FILE_PATH = path.joinAppData(DATA_CONF_PATH, 'data.json');
 const LOAD_DIR = path.join(__dirname, 'extensions_main');
 const PAGE_URL = url.format({
 		pathname: path.join(__dirname, "index.html"),
@@ -65,7 +67,7 @@ async function createMainWindow()
 		try
 		{
 			const ModuleClass = require(fullpath);
-			
+			if (typeof(ModuleClass) !== typeof(function () {})) { console.log(kleur.grey("Not loading " + ext + ": not a module")); return } ;
 			const t = new ModuleClass()
 			enabled_modules.push(t);
 			t.__start(mainWindow, mainTab);

-Original file line number
+Diff line change
@@ @@ -1,4 +1,5 @@ @@
 node_modules
 .vscode
 out/
 -dist
 +dist
 +extensions_conf/*
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`{`
`38`	`38`	`"enabled": true,`
`39`	`39`	`"remap_to_pointeraction": true,`
	`40`	`+ "disable_keyboard": true,`
`40`	`41`	`"actions":`
`41`	`42`	`{`
`42`	`43`	`"enlarged_doubleclick":`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/home/leonardo/.config/Webpage_Accessor/extensions_conf/`