Drop custom confirmation logic in favor of using the built-in Node.js readline
module
Most likely this code predates our use of Node.js, but in Node.js asking for user confirmation is a solved problem, so we can remove the custom logic we have for this, which overall makes things much simpler.
This commit is contained in:
parent
869b396011
commit
a24982a733
19
test/test.js
19
test/test.js
@ -25,6 +25,7 @@ var puppeteer = require("puppeteer");
|
|||||||
var url = require("url");
|
var url = require("url");
|
||||||
var testUtils = require("./testutils.js");
|
var testUtils = require("./testutils.js");
|
||||||
const dns = require("dns");
|
const dns = require("dns");
|
||||||
|
const readline = require("readline");
|
||||||
const yargs = require("yargs");
|
const yargs = require("yargs");
|
||||||
|
|
||||||
// Chrome uses host `127.0.0.1` in the browser's websocket endpoint URL while
|
// Chrome uses host `127.0.0.1` in the browser's websocket endpoint URL while
|
||||||
@ -229,14 +230,17 @@ function updateRefImages() {
|
|||||||
sync(false); // don't remove tmp/ for botio
|
sync(false); // don't remove tmp/ for botio
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
testUtils.confirm(
|
|
||||||
|
const reader = readline.createInterface(process.stdin, process.stdout);
|
||||||
|
reader.question(
|
||||||
"Would you like to update the master copy in ref/? [yn] ",
|
"Would you like to update the master copy in ref/? [yn] ",
|
||||||
function (confirmed) {
|
function (answer) {
|
||||||
if (confirmed) {
|
if (answer.toLowerCase() === "y") {
|
||||||
sync(true);
|
sync(true);
|
||||||
} else {
|
} else {
|
||||||
console.log(" OK, not updating.");
|
console.log(" OK, not updating.");
|
||||||
}
|
}
|
||||||
|
reader.close();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -358,13 +362,16 @@ function startRefTest(masterMode, showRefImages) {
|
|||||||
}
|
}
|
||||||
console.log("Temporary snapshot dir tmp/ is still around.");
|
console.log("Temporary snapshot dir tmp/ is still around.");
|
||||||
console.log("tmp/ can be removed if it has nothing you need.");
|
console.log("tmp/ can be removed if it has nothing you need.");
|
||||||
testUtils.confirm(
|
|
||||||
|
const reader = readline.createInterface(process.stdin, process.stdout);
|
||||||
|
reader.question(
|
||||||
"SHOULD THIS SCRIPT REMOVE tmp/? THINK CAREFULLY [yn] ",
|
"SHOULD THIS SCRIPT REMOVE tmp/? THINK CAREFULLY [yn] ",
|
||||||
function (confirmed) {
|
function (answer) {
|
||||||
if (confirmed) {
|
if (answer.toLowerCase() === "y") {
|
||||||
testUtils.removeDirSync(refsTmpDir);
|
testUtils.removeDirSync(refsTmpDir);
|
||||||
}
|
}
|
||||||
setup();
|
setup();
|
||||||
|
reader.close();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
@ -63,80 +63,3 @@ exports.ensureDirSync = function ensureDirSync(dir) {
|
|||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
var stdinBuffer = "",
|
|
||||||
endOfStdin = false,
|
|
||||||
stdinInitialized = false;
|
|
||||||
var stdinOnLineCallbacks = [];
|
|
||||||
|
|
||||||
function handleStdinBuffer() {
|
|
||||||
var callback;
|
|
||||||
if (endOfStdin) {
|
|
||||||
if (stdinBuffer && stdinOnLineCallbacks.length > 0) {
|
|
||||||
callback = stdinOnLineCallbacks.shift();
|
|
||||||
callback(stdinBuffer);
|
|
||||||
stdinBuffer = null;
|
|
||||||
}
|
|
||||||
while (stdinOnLineCallbacks.length > 0) {
|
|
||||||
callback = stdinOnLineCallbacks.shift();
|
|
||||||
callback();
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
while (stdinOnLineCallbacks.length > 0) {
|
|
||||||
var i = stdinBuffer.indexOf("\n");
|
|
||||||
if (i < 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
callback = stdinOnLineCallbacks.shift();
|
|
||||||
var result = stdinBuffer.substring(0, i + 1);
|
|
||||||
stdinBuffer = stdinBuffer.substring(i + 1);
|
|
||||||
callback(result);
|
|
||||||
}
|
|
||||||
// all callbacks handled, stop stdin processing
|
|
||||||
process.stdin.pause();
|
|
||||||
}
|
|
||||||
|
|
||||||
function initStdin() {
|
|
||||||
process.stdin.setEncoding("utf8");
|
|
||||||
|
|
||||||
process.stdin.on("data", function (chunk) {
|
|
||||||
stdinBuffer += chunk;
|
|
||||||
handleStdinBuffer();
|
|
||||||
});
|
|
||||||
|
|
||||||
process.stdin.on("end", function () {
|
|
||||||
endOfStdin = true;
|
|
||||||
handleStdinBuffer();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
exports.prompt = function prompt(message, callback) {
|
|
||||||
if (!stdinInitialized) {
|
|
||||||
process.stdin.resume();
|
|
||||||
initStdin();
|
|
||||||
stdinInitialized = true;
|
|
||||||
} else if (stdinOnLineCallbacks.length === 0) {
|
|
||||||
process.stdin.resume();
|
|
||||||
}
|
|
||||||
|
|
||||||
process.stdout.write(message);
|
|
||||||
stdinOnLineCallbacks.push(callback);
|
|
||||||
handleStdinBuffer();
|
|
||||||
};
|
|
||||||
|
|
||||||
exports.confirm = function confirm(message, callback) {
|
|
||||||
exports.prompt(message, function (answer) {
|
|
||||||
if (answer === undefined) {
|
|
||||||
callback();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (answer[0].toLowerCase() === "y") {
|
|
||||||
callback(true);
|
|
||||||
} else if (answer[0].toLowerCase() === "n") {
|
|
||||||
callback(false);
|
|
||||||
} else {
|
|
||||||
confirm(message, callback);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user