Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various improvements to terminal CLI #392

Merged
merged 1 commit into from
Jul 22, 2023
Merged

Various improvements to terminal CLI #392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 36 additions & 38 deletions index.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import * as Insect from "./output/Insect/index.js";
import * as path from "path";
import * as xdgBasedir from "xdg-basedir";

var insectEnv = Insect.initialEnvironment;

Expand All @@ -25,56 +26,53 @@ function runInsect(fmt, line) {
return res;
}

// Handle command line arguments
if (process.argv.length >= 4) {
usage();
} else if (process.argv.length == 3) {
var arg = process.argv[2];
if (arg === "-h" || arg === "--help") {
// Top-level await is not supported in Node 12 and earlier.
(async function() {
if (process.env.INSECT_NO_RC !== "true") {
var [util, lineReader, os] = await Promise.all([import("util"), import("line-reader"), import("os")]);

var rcFilePaths = [path.join(xdgBasedir.config, "insect/insectrc"), path.join(os.homedir(), ".insectrc")];
var eachLine = util.promisify(lineReader.eachLine);

for (const rcFilePath of rcFilePaths) {
try {
await eachLine(rcFilePath, function(line) {
var res = runInsect(Insect.fmtPlain, line);
// We really only care when it breaks
if (res && res.msgType === "error") {
console.error(res.msg);
process.exit(1);
}
});
break;
} catch (err) {
if (err.code !== "ENOENT") {
throw err;
}
}
}
}

// Handle command line arguments
var args = process.argv.slice(2);
if (args[0] === "-h" || args[0] === "--help") {
usage();
} else {
} else if (args.length !== 0) {
// Execute a single command
var res = runInsect(Insect.fmtPlain, arg);
var res = runInsect(Insect.fmtPlain, args.join(" "));
if (res.msgType === "value" || res.msgType === "info") {
console.log(res.msg);
} else if (res.msgType === "error") {
console.error(res.msg);
process.exit(1);
triallax marked this conversation as resolved.
Show resolved Hide resolved
}
process.exit(0);
}
}

if (process.env.INSECT_NO_RC !== "true") {
// Top-level await is not supported in Node 12 and earlier.
(async function() {
var [os, lineReader] = await Promise.all([import("os"), import("line-reader")]);

var rcFile = path.join(os.homedir(), ".insectrc");
lineReader.eachLine(rcFile, function (line) {
var res = runInsect(Insect.fmtPlain, line);
// We really only care when it breaks
if (res && res.msgType === "error") {
console.error(res.msg);
process.exit(1);
}
}, function (err) {
// If the file doesn't exist, that's fine
if (err && err.code !== "ENOENT") {
throw err;
} else {
startInsect();
}
});
})();
} else {
startInsect();
}

async function startInsect() {
var interactive = process.stdin.isTTY;

if (interactive) {
var [fs, clipboardy, readline, xdgBasedir] = await Promise.all([import("fs"), import("clipboardy"), import("readline"), import("xdg-basedir")]);
var [fs, clipboardy, readline] = await Promise.all([import("fs"), import("clipboardy"), import("readline")]);
triallax marked this conversation as resolved.
Show resolved Hide resolved

// Create `xdgBasedir.data` if it doesn't already exist.
// See https://github.com/sharkdp/insect/issues/364.
Expand Down Expand Up @@ -192,4 +190,4 @@ async function startInsect() {
}
});
}
}
}());