Overview
| Comment: | [njs] Fix some case in cli |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | njs | nodejs |
| Files: | files | file ages | folders |
| SHA3-256: |
e0cae3263fcc84a57527253f467be58c |
| User & Date: | IllusionPerdu on 2018-10-17 13:43:18 |
| Original Comment: | [js] Fix some case in cli |
| Other Links: | branch diff | manifest | tags |
Context
|
2018-10-17
| ||
| 13:44 | [njs] fix typos and mistakes check-in: 5815576455 user: olr tags: njs, nodejs | |
| 13:43 | [njs] Fix some case in cli check-in: e0cae3263f user: IllusionPerdu tags: njs, nodejs | |
| 13:30 | [graphspell][js] fix time calculation for suggestions check-in: ed091d83b9 user: olr tags: graphspell, nodejs | |
Changes
Modified gc_lang/fr/nodejs/cli/bin/gramma-cli.js from [82063d3e76] to [2fa257f1cc].
| ︙ | ︙ | |||
165 166 167 168 169 170 171 |
if (action in oRep) {
repText += toTitle(action) + " " + oRep[action];
}
}
for (const action of ["morph", "lemma"]) {
if (action in oRep) {
| > | | | | | | | | | | | | | | | | | > | | | | > > | | | | > | < < < < < < < > | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > | | | | > > > > > > > > | > > > > > | | | | | | | | | | > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > | | > > | > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < < < < < < | | | | | | | > > > | > > | | | | < < < < < < | | | < | | < < < | 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 |
if (action in oRep) {
repText += toTitle(action) + " " + oRep[action];
}
}
for (const action of ["morph", "lemma"]) {
if (action in oRep) {
for (const toAff of oRep[action]) {
if (toAff.text == "NoText") {
repText += "\n" + toTitle(action) + ": Pas de texte à vérifier.";
} else {
if (toAff.reponse.length == 0) {
repText += "\nAuncun " + toTitle(action) + " existant pour: «" + toAff.text + "»";
} else {
let ascii = "├";
let numRep = 0;
repText += "\n" + toTitle(action) + " possible de: «" + toAff.text + "»";
for (let reponse of toAff.reponse) {
numRep++;
if (numRep == toAff.reponse.length) {
ascii = "└";
}
repText += "\n " + ascii + " " + reponse;
}
}
repText += affPerf(toAff.time);
}
}
}
}
if ("spell" in oRep) {
for (const toAff of oRep.spell) {
if (toAff.text == "NoText") {
repText += "\nSpell: Pas de texte à vérifier.";
} else {
repText += "\nLe mot «" + toAff.text + "» " + (toAff.reponse ? "existe" : "innexistant");
repText += affPerf(toAff.time);
}
}
}
if ("suggest" in oRep) {
for (const toAff of oRep.suggest) {
if (toAff.text == "NoText") {
repText += "\nSuggest : Pas de texte à vérifier.";
} else {
//let numgroup = 0;
if (toAff.reponse.length == 0) {
repText += "\nAucune suggestion possible pour: «" + toAff.text + "»";
} else {
repText += "\nSuggestion possible de: «" + toAff.text + "»";
let ascii = "├";
let numRep = 0;
for (let reponse of toAff.reponse) {
numRep++;
if (numRep == toAff.reponse.length) {
ascii = "└";
}
repText += "\n " + ascii + " " + reponse;
}
}
repText += affPerf(toAff.time);
}
}
}
if ("format" in oRep) {
for (const toAff of oRep.format) {
if (toAff.text == "NoText") {
repText += "\nPas de texte à formatter.";
} else {
repText += "\nMise en forme:\n" + toAff.reponse;
repText += affPerf(toAff.time);
}
}
}
if ("lexique" in oRep) {
for (const toAff of oRep.lexique) {
if (toAff.text == "NoText") {
repText += "\nLexique: Pas de texte à vérifier.";
} else {
repText += "\nLexique:";
let ascii1, ascii1a, numRep1, ascii2, numRep2, replength;
ascii1 = "├";
ascii1a = "│";
numRep1 = 0;
replength = toAff.reponse.length;
for (let reponse of toAff.reponse) {
numRep1++;
if (numRep1 == replength) {
ascii1 = "└";
ascii1a = " ";
}
repText += "\n " + ascii1 + " " + reponse.sValue;
let ascii = "├";
let numRep = 0;
for (let label of reponse.aLabel) {
numRep++;
if (numRep == reponse.aLabel.length) {
ascii = "└";
}
repText += "\n " + ascii1a + " " + ascii + " " + label.trim();
}
}
repText += affPerf(toAff.time);
}
}
}
if ("check" in oRep) {
for (const toAff of oRep.check) {
if (toAff.text == "NoText") {
repText += "\nCheck: Pas de texte à vérifier.";
} else {
let ascii1, ascii1a, numRep1, ascii2, numRep2, replength;
ascii1 = "├";
ascii1a = "│";
numRep1 = 0;
replength = Object.keys(toAff.reponse.lGrammarErrors).length;
if (replength == 0) {
repText += "\nPas de faute de grammaire";
} else {
repText += "\nFaute(s) de grammaire";
for (let gramma of toAff.reponse.lGrammarErrors) {
numRep1++;
if (numRep1 == replength) {
ascii1 = "└";
ascii1a = " ";
}
repText += "\n " + ascii1 + " " + gramma.nStart + "->" + gramma.nEnd + " " + gramma.sMessage;
ascii2 = "├";
numRep2 = 0;
for (let suggestion of gramma.aSuggestions) {
numRep2++;
if (numRep2 == gramma.aSuggestions.length) {
ascii2 = "└";
}
repText += "\n " + ascii1a + " " + ascii2 + ' "' + suggestion + '"';
}
}
}
ascii1 = "├";
ascii1a = "│";
numRep1 = 0;
replength = Object.keys(toAff.reponse.lSpellingErrors).length;
if (replength == 0) {
repText += "\nPas de faute d'orthographe";
} else {
repText += "\nFaute(s) d'orthographe";
for (let ortho of toAff.reponse.lSpellingErrors) {
numRep1++;
if (numRep1 == replength) {
ascii1 = "└";
ascii1a = " ";
}
repText += "\n " + ascii1 + " " + ortho.nStart + "->" + ortho.nEnd + " " + ortho.sValue;
ascii2 = "├";
numRep2 = 0;
for (let suggestion of ortho.aSuggestions) {
numRep2++;
if (numRep2 == ortho.aSuggestions.length) {
ascii2 = "└";
}
repText += "\n " + ascii1a + " " + ascii2 + ' "' + suggestion + '"';
}
}
}
repText += affPerf(toAff.time);
}
}
}
if ("help" in oRep) {
let colorNum = 31;
for (const action of oRep.help) {
//Uniquement pour le fun on met de la couleur ;)
if (action.indexOf("===") > -1) {
console.log("\x1b[" + colorNum + "m" + action + "\x1b[0m");
colorNum = colorNum + 2;
} else {
console.log(action);
}
}
}
return repText.trim("\n");
}
function affPerf(aTime) {
if (aTime == "NA") {
return "";
}
return "\nExécuté en: " + aTime + " ms";
}
function actionGramma(repPreference, action, aAction) {
let tStart, tEnd;
let tmpRep = {
text: "",
reponse: "",
time: "NA"
};
if (!isBool(aAction) && aAction !== "") {
tmpRep.text = aAction;
sText = aAction;
} else if (!isBool(sText)) {
//Utilisation du dernier texte connu
tmpRep.text = sText;
} else {
tmpRep.text = "NoText";
}
if (repPreference.perf) {
tStart = performance.now();
}
tmpRep.reponse = oGrammarChecker[cmdAction[action].execute](tmpRep.text);
if (repPreference.perf) {
tEnd = performance.now();
tmpRep["time"] = (Math.round((tEnd - tStart) * 1000) / 1000).toString();
}
return tmpRep;
}
function actionToExec(aArg) {
let repAction = {};
if (!isBool(aArg.text)) {
sText = aArg.text;
}
for (const action of ["json", "perf"]) {
if (getArg(aArg, [action])) {
repPreference[action] = getArgVal(aArg, [action]);
repAction[action] = repPreference[action] ? "ON" : "OFF";
}
}
for (const action of ["gceoption", "tfoption"]) {
if (getArg(aArg, [action])) {
let sFonction = action == "gceoption" ? "GceOption" : "TfOption";
let sOpt = sText.split(" ");
if (sOpt[0] == "reset") {
oGrammarChecker["reset" + sFonction + "s"]();
repAction[action] = "reset";
} else {
for (const optAction of sOpt) {
let bOptVal = optAction[0] == "+" ? true : false;
let sOptName = optAction.slice(1, optAction.length);
oGrammarChecker["set" + sFonction](sOptName, bOptVal);
repAction[action] = sText;
}
}
}
}
for (const action in aArg) {
if (cmdAction[action] && cmdAction[action].execute !== "") {
//console.log(aArg, aArg[action], !isBool(aArg[action]), !isBool(repAction.text));
if (!repAction[action]) {
repAction[action] = [];
}
if (typeof aArg[action] === "object") {
for (const valAction of aArg[action]) {
tmpRep = actionGramma(repPreference, action, valAction);
repAction[action].push(tmpRep);
}
} else {
tmpRep = actionGramma(repPreference, action, aArg[action]);
repAction[action].push(tmpRep);
}
}
}
if (getArg(aArg, ["help"])) {
repAction["help"] = [];
repAction["help"].push("================================== Aide: ==================================");
repAction["help"].push("");
repAction["help"].push("Il y a trois modes de fonctionnement: client / client intératif / serveur.");
repAction["help"].push(" * le client intéractif: «gramma-cli -i».");
repAction["help"].push(' * pour le client exemple: «gramma-cli --command "mot/texte"».');
repAction["help"].push(" * le serveur se lance avec la commande «gramma-cli --server --port 8085».");
repAction["help"].push("");
repAction["help"].push("========================= Les commandes/arguments: ========================");
repAction["help"].push("");
for (const action in cmdAction) {
repAction["help"].push(action.padEnd(10, " ") + ": " + cmdAction[action].arg.padEnd(8, " ") + ": " + cmdAction[action].description);
}
repAction["help"].push("");
repAction["help"].push("================================== Note: ==================================");
repAction["help"].push("");
repAction["help"].push("En mode client: les arguments sont de la forme «--argument» !");
repAction["help"].push("En mode client intéractif: pour les commandes concernant un texte, vous");
repAction["help"].push(" pouvez taper la commande puis entrer (pour saisir le texte) pour ");
repAction["help"].push(' terminer la saisie du texte et exécuter la commande taper /"commande"');
}
if (repPreference.json) {
return JSON.stringify(repAction);
} else {
return repToText(repAction);
}
}
function argToExec(aCommand, aText, rl, resetCmd = true) {
let execAct = {};
aCommand = aCommand.toLowerCase();
if (!isBool(aText)) {
execAct["text"] = aText;
execAct[aCommand] = true;
} else {
execAct[aCommand] = toBool(aText);
}
console.log(actionToExec(execAct));
//sBufferConsole = "";
if (resetCmd) {
sCmdToExec = "";
}
if (typeof rl !== "undefined") {
rl.setPrompt(msgPrompt);
}
}
function completer(line) {
var hits = cmdAll.filter(function(c) {
if (c.indexOf(line) == 0) {
return c;
}
});
return [hits && hits.length ? hits : cmdAll, line];
}
if (process.argv.length <= 2) {
console.log(actionToExec({ help: true }));
} else {
//var GrammarChecker = require("./api.js");
//console.log(module.paths);
var GrammarChecker = require("grammalecte");
var oGrammarChecker = new GrammarChecker.GrammarChecker(["Grammalecte", "Graphspell", "TextFormatter", "Lexicographer", "Tokenizer"], "fr");
if (argCmd.server) {
var http = require("http");
var url = require("url");
var querystring = require("querystring");
var collectRequestData = function(aRequest, aResponse, callback) {
|
| ︙ | ︙ | |||
528 529 530 531 532 533 534 |
console.log(msgEnd);
process.exit(0);
}
let lg = sBuffer.toLowerCase().trim();
let bSpace = lg.indexOf(" ") > -1;
if (!bSpace) {
| | | 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 |
console.log(msgEnd);
process.exit(0);
}
let lg = sBuffer.toLowerCase().trim();
let bSpace = lg.indexOf(" ") > -1;
if (!bSpace) {
if (cmdOne.indexOf(lg) > -1) {
argToExec(lg, sBuffer, rl, true);
} else if (cmdAll.indexOf(lg) > -1) {
sBufferConsole = "";
sCmdToExec = lg;
//Prompt simple pour distinguer que c"est une suite d"une commande
rl.setPrompt(msgSuite);
} else if (lg.slice(1) == sCmdToExec) {
|
| ︙ | ︙ | |||
558 559 560 561 562 563 564 |
rl.prompt();
}).on("close", () => {
console.log(msgEnd);
process.exit(0);
});
} else {
| > > > > > > > | > > | | > | 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 |
rl.prompt();
}).on("close", () => {
console.log(msgEnd);
process.exit(0);
});
} else {
if (
typeof argCmd.text !== "object" &&
typeof argCmd.json !== "object" &&
typeof argCmd.perf !== "object" &&
typeof argCmd.gceoption !== "object" &&
typeof argCmd.tfoption !== "object"
) {
console.log(actionToExec(argCmd));
} else {
console.log("Votre demmande est confuse.");
}
}
}
|