my_wins 1.2.3 → 1.3.1

package/lib/index.js

@@ -1,6 +1,7 @@
 const { spawn, execFile, exec } = require("child_process");
 const fs = require("fs");
 const JSON5 = require("json5");
+const inquirer = require("inquirer");
 const keysender = require("@sumbat/keysender");
 const defaultSettings = {
     x: 0,
@@ -13,7 +14,7 @@ const defaultSettings = {
 	wy_total : 12,
 };
 
-function makeWinsArray(settings, ) {
+function makeWinsArray(settings) {
 	let winsArray = settings.winsArray || [];
 	let {x,y,width, height, screenWidth, screenHeight, wy_total, wx_total} = settings;
 	const scr_sz = keysender.getScreenSize();
@@ -41,17 +42,24 @@ function awaitDelay(delay) {
 	});
 }
 
-module.exports.defaultSettings = defaultSettings;
-module.exports.run = async ()=>{
-	console.log("Screen size:", keysender.getScreenSize());
+function parseArgs(argv) {
+	const raw = argv.slice(2);
+	const menu = raw.includes("-m") || raw.includes("--menu");
+	const positional = raw.filter((arg)=>arg !== "-m" && arg !== "--menu");
+	return {
+		menu,
+		single: positional[0],
+	};
+}
 
+function loadSettings() {
 	let settings;
 	try {
 		settings = Object.assign({}, defaultSettings, JSON5.parse(fs.readFileSync("my_wins.json")));
 	} catch (e) {
 		if(!e.message.startsWith("ENOENT")) {
 			console.error(`Error reading 'my_wins.json' ${e.message}`);
-			return;
+			return null;
 		} else
 			console.log(`Usage:
 		create 'my_wins.json' with optional contents
@@ -76,10 +84,36 @@ module.exports.run = async ()=>{
 
 	if (!settings.wins) settings.wins = {};
 
-	const arg2 = process.argv[2];
-	if(settings.wins[arg2]) {
+	try {
+		let personal_settings ;
+		try {
+			personal_settings = JSON5.parse(fs.readFileSync("my_wins_personal.json"));
+		} catch (e) {
+			if (!e.message.startsWith("ENOENT")) {
+				console.error(`Error reading 'my_wins_personal.json' ${e.message}`);
+				return null;
+			}
+		}
+		if (personal_settings) {
+			for (let k in personal_settings) if (k !== "wins") settings[k] = personal_settings[k];
+
+			if (personal_settings.wins) {
+				for (let name in personal_settings.wins)
+					if (!settings.wins[name]) settings.wins[name] = personal_settings.wins[name];
+					else Object.assign(settings.wins[name], personal_settings.wins[name]);
+			}
+		}
+	} catch (e) {}
+
+	return settings;
+}
+
+function buildRunSettings(baseSettings, filterNames) {
+	const settings = JSON.parse(JSON.stringify(baseSettings));
+	const hasFilter = Array.isArray(filterNames) && filterNames.length > 0;
+	if (hasFilter) {
 		for(let k in settings.wins) {
-			if(k !== arg2) {
+			if(!filterNames.includes(k)) {
 				delete settings.wins[k];
 			}
 		}
@@ -95,22 +129,12 @@ module.exports.run = async ()=>{
 		w.title = w.name+randSuffix()
 	}
 
-	try {
-		let personal_settings ;
-		try {
-			personal_settings = JSON5.parse(fs.readFileSync("my_wins_personal.json"));
-		} catch (e) {
-			if (!e.message.startsWith("ENOENT")) {
-				console.error(`Error reading 'my_wins_personal.json' ${e.message}`);
-				return;
-			}
-		}
-		for (let k in personal_settings) if (k !== "wins") settings[k] = personal_settings[k];
+	return settings;
+}
 
-		for (let name in personal_settings.wins)
-			if (!settings.wins[name]) settings.wins[name] = personal_settings.wins[name];
-			else Object.assign(settings.wins[name], personal_settings.wins[name]);
-	} catch (e) {}
+async function runOnce(baseSettings, filterNames) {
+	const settings = buildRunSettings(baseSettings, filterNames);
+	if (!Object.keys(settings.wins).length) return;
 
 	let wins = keysender.getAllWindows();
 
@@ -192,6 +216,54 @@ module.exports.run = async ()=>{
 
 	await awaitDelay(700);
 	console.log(`my_wins finished successfully!`);
+}
+
+async function promptMenu(winNames) {
+	const choices = winNames.map((name)=>({ name, value: name }));
+	choices.push({ name: "exit", value: "__exit__", checked: true });
+	const { selections } = await inquirer.prompt([
+		{
+			type: "checkbox",
+			name: "selections",
+			message: "Select commands to run",
+			choices,
+		},
+	]);
+	return selections;
+}
+
+module.exports.defaultSettings = defaultSettings;
+module.exports.run = async ()=>{
+	console.log("Screen size:", keysender.getScreenSize());
+
+	const settings = loadSettings();
+	if (!settings) return;
+
+	const args = parseArgs(process.argv);
+	const winNames = Object.keys(settings.wins || {});
+
+	if (args.menu) {
+		if (!winNames.length) {
+			console.log("No wins configured.");
+			process.exit(0);
+		}
+		while (true) {
+			const selections = await promptMenu(winNames);
+			const exitSelected = selections.includes("__exit__");
+			const selectedNames = selections.filter((item)=>item !== "__exit__");
+			if (selectedNames.length) {
+				await runOnce(settings, selectedNames);
+			}
+			if (exitSelected) break;
+		}
+		process.exit(0);
+	}
+
+	if (args.single && settings.wins[args.single]) {
+		await runOnce(settings, [args.single]);
+	} else {
+		await runOnce(settings);
+	}
+
 	process.exit(0);
 };
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "my_wins",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "Automates starting and laying out your console windows for tsc, babel, tests, verdaccio, etc...",
   "keywords": [
     "automation",
@@ -15,11 +15,13 @@
     "my_wins": "bin/index.js"
   },
   "scripts": {
-    "start": "node index.js"
+    "start": "node index.js",
+	"startm": "node index.js -m"
   },
   "author": "Yuri Yaryshev",
   "license": "Unlicense",
   "dependencies": {
+    "inquirer": "^8.2.6",
     "json5": "^2.1.3",
     "@sumbat/keysender": "^2.3.0"
   },

package/readme.md

@@ -65,6 +65,20 @@ Now if you need to restart or pause/resume any of your cmd just do
 
 ***my_wins*** uses json5 to parse it's settings, so you can leave trailing commas or remove quotes around json-keys (see json5 package for details).
 
+### Menu mode
+
+Use menu mode to pick multiple commands interactively:
+
+```shell
+my_wins -m
+```
+
+or
+
+```shell
+my_wins --menu
+```
+
 ### All options
 
 You can also create "my_wins_personal.json" which can partially or fully overrides my_wins.