Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs
This commit is contained in:
@@ -1,19 +1,18 @@
|
|||||||
module.exports = (function() {
|
/*
|
||||||
"use strict";
|
* Generated by PEG.js 0.10.0.
|
||||||
|
|
||||||
/*
|
|
||||||
* Generated by PEG.js 0.9.0.
|
|
||||||
*
|
*
|
||||||
* http://pegjs.org/
|
* http://pegjs.org/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function peg$subclass(child, parent) {
|
"use strict";
|
||||||
|
|
||||||
|
function peg$subclass(child, parent) {
|
||||||
function ctor() { this.constructor = child; }
|
function ctor() { this.constructor = child; }
|
||||||
ctor.prototype = parent.prototype;
|
ctor.prototype = parent.prototype;
|
||||||
child.prototype = new ctor();
|
child.prototype = new ctor();
|
||||||
}
|
}
|
||||||
|
|
||||||
function peg$SyntaxError(message, expected, found, location) {
|
function peg$SyntaxError(message, expected, found, location) {
|
||||||
this.message = message;
|
this.message = message;
|
||||||
this.expected = expected;
|
this.expected = expected;
|
||||||
this.found = found;
|
this.found = found;
|
||||||
@@ -23,58 +22,164 @@ module.exports = (function() {
|
|||||||
if (typeof Error.captureStackTrace === "function") {
|
if (typeof Error.captureStackTrace === "function") {
|
||||||
Error.captureStackTrace(this, peg$SyntaxError);
|
Error.captureStackTrace(this, peg$SyntaxError);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
peg$subclass(peg$SyntaxError, Error);
|
||||||
|
|
||||||
|
peg$SyntaxError.buildMessage = function(expected, found) {
|
||||||
|
var DESCRIBE_EXPECTATION_FNS = {
|
||||||
|
literal: function(expectation) {
|
||||||
|
return "\"" + literalEscape(expectation.text) + "\"";
|
||||||
|
},
|
||||||
|
|
||||||
|
"class": function(expectation) {
|
||||||
|
var escapedParts = "",
|
||||||
|
i;
|
||||||
|
|
||||||
|
for (i = 0; i < expectation.parts.length; i++) {
|
||||||
|
escapedParts += expectation.parts[i] instanceof Array
|
||||||
|
? classEscape(expectation.parts[i][0]) + "-" + classEscape(expectation.parts[i][1])
|
||||||
|
: classEscape(expectation.parts[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
peg$subclass(peg$SyntaxError, Error);
|
return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]";
|
||||||
|
},
|
||||||
|
|
||||||
function peg$parse(input) {
|
any: function(expectation) {
|
||||||
var options = arguments.length > 1 ? arguments[1] : {},
|
return "any character";
|
||||||
parser = this,
|
},
|
||||||
|
|
||||||
peg$FAILED = {},
|
end: function(expectation) {
|
||||||
|
return "end of input";
|
||||||
|
},
|
||||||
|
|
||||||
|
other: function(expectation) {
|
||||||
|
return expectation.description;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
function hex(ch) {
|
||||||
|
return ch.charCodeAt(0).toString(16).toUpperCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
function literalEscape(s) {
|
||||||
|
return s
|
||||||
|
.replace(/\\/g, '\\\\')
|
||||||
|
.replace(/"/g, '\\"')
|
||||||
|
.replace(/\0/g, '\\0')
|
||||||
|
.replace(/\t/g, '\\t')
|
||||||
|
.replace(/\n/g, '\\n')
|
||||||
|
.replace(/\r/g, '\\r')
|
||||||
|
.replace(/[\x00-\x0F]/g, function(ch) { return '\\x0' + hex(ch); })
|
||||||
|
.replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x' + hex(ch); });
|
||||||
|
}
|
||||||
|
|
||||||
|
function classEscape(s) {
|
||||||
|
return s
|
||||||
|
.replace(/\\/g, '\\\\')
|
||||||
|
.replace(/\]/g, '\\]')
|
||||||
|
.replace(/\^/g, '\\^')
|
||||||
|
.replace(/-/g, '\\-')
|
||||||
|
.replace(/\0/g, '\\0')
|
||||||
|
.replace(/\t/g, '\\t')
|
||||||
|
.replace(/\n/g, '\\n')
|
||||||
|
.replace(/\r/g, '\\r')
|
||||||
|
.replace(/[\x00-\x0F]/g, function(ch) { return '\\x0' + hex(ch); })
|
||||||
|
.replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x' + hex(ch); });
|
||||||
|
}
|
||||||
|
|
||||||
|
function describeExpectation(expectation) {
|
||||||
|
return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
|
||||||
|
}
|
||||||
|
|
||||||
|
function describeExpected(expected) {
|
||||||
|
var descriptions = new Array(expected.length),
|
||||||
|
i, j;
|
||||||
|
|
||||||
|
for (i = 0; i < expected.length; i++) {
|
||||||
|
descriptions[i] = describeExpectation(expected[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
descriptions.sort();
|
||||||
|
|
||||||
|
if (descriptions.length > 0) {
|
||||||
|
for (i = 1, j = 1; i < descriptions.length; i++) {
|
||||||
|
if (descriptions[i - 1] !== descriptions[i]) {
|
||||||
|
descriptions[j] = descriptions[i];
|
||||||
|
j++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
descriptions.length = j;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (descriptions.length) {
|
||||||
|
case 1:
|
||||||
|
return descriptions[0];
|
||||||
|
|
||||||
|
case 2:
|
||||||
|
return descriptions[0] + " or " + descriptions[1];
|
||||||
|
|
||||||
|
default:
|
||||||
|
return descriptions.slice(0, -1).join(", ")
|
||||||
|
+ ", or "
|
||||||
|
+ descriptions[descriptions.length - 1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function describeFound(found) {
|
||||||
|
return found ? "\"" + literalEscape(found) + "\"" : "end of input";
|
||||||
|
}
|
||||||
|
|
||||||
|
return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
|
||||||
|
};
|
||||||
|
|
||||||
|
function peg$parse(input, options) {
|
||||||
|
options = options !== void 0 ? options : {};
|
||||||
|
|
||||||
|
var peg$FAILED = {},
|
||||||
|
|
||||||
peg$startRuleFunctions = { start: peg$parsestart },
|
peg$startRuleFunctions = { start: peg$parsestart },
|
||||||
peg$startRuleFunction = peg$parsestart,
|
peg$startRuleFunction = peg$parsestart,
|
||||||
|
|
||||||
peg$c0 = "|",
|
peg$c0 = "|",
|
||||||
peg$c1 = { type: "literal", value: "|", description: "\"|\"" },
|
peg$c1 = peg$literalExpectation("|", false),
|
||||||
peg$c2 = "&",
|
peg$c2 = "&",
|
||||||
peg$c3 = { type: "literal", value: "&", description: "\"&\"" },
|
peg$c3 = peg$literalExpectation("&", false),
|
||||||
peg$c4 = "!",
|
peg$c4 = "!",
|
||||||
peg$c5 = { type: "literal", value: "!", description: "\"!\"" },
|
peg$c5 = peg$literalExpectation("!", false),
|
||||||
peg$c6 = "(",
|
peg$c6 = "(",
|
||||||
peg$c7 = { type: "literal", value: "(", description: "\"(\"" },
|
peg$c7 = peg$literalExpectation("(", false),
|
||||||
peg$c8 = ")",
|
peg$c8 = ")",
|
||||||
peg$c9 = { type: "literal", value: ")", description: "\")\"" },
|
peg$c9 = peg$literalExpectation(")", false),
|
||||||
peg$c10 = function(left, right) { return left || right; },
|
peg$c10 = function(left, right) { return left || right; },
|
||||||
peg$c11 = function(left, right) { return left && right; },
|
peg$c11 = function(left, right) { return left && right; },
|
||||||
peg$c12 = function(value) { return !value; },
|
peg$c12 = function(value) { return !value; },
|
||||||
peg$c13 = function(value) { return value; },
|
peg$c13 = function(value) { return value; },
|
||||||
peg$c14 = ",",
|
peg$c14 = ",",
|
||||||
peg$c15 = { type: "literal", value: ",", description: "\",\"" },
|
peg$c15 = peg$literalExpectation(",", false),
|
||||||
peg$c16 = " ",
|
peg$c16 = " ",
|
||||||
peg$c17 = { type: "literal", value: " ", description: "\" \"" },
|
peg$c17 = peg$literalExpectation(" ", false),
|
||||||
peg$c18 = "[",
|
peg$c18 = "[",
|
||||||
peg$c19 = { type: "literal", value: "[", description: "\"[\"" },
|
peg$c19 = peg$literalExpectation("[", false),
|
||||||
peg$c20 = "]",
|
peg$c20 = "]",
|
||||||
peg$c21 = { type: "literal", value: "]", description: "\"]\"" },
|
peg$c21 = peg$literalExpectation("]", false),
|
||||||
peg$c22 = function(acs, a) { return checkAccess(acs, a); },
|
peg$c22 = function(acs, a) { return checkAccess(acs, a); },
|
||||||
peg$c23 = /^[A-Z]/,
|
peg$c23 = /^[A-Z]/,
|
||||||
peg$c24 = { type: "class", value: "[A-Z]", description: "[A-Z]" },
|
peg$c24 = peg$classExpectation([["A", "Z"]], false, false),
|
||||||
peg$c25 = function(c) { return c.join(''); },
|
peg$c25 = function(c) { return c.join(''); },
|
||||||
peg$c26 = /^[A-Za-z0-9\-_+]/,
|
peg$c26 = /^[A-Za-z0-9\-_+]/,
|
||||||
peg$c27 = { type: "class", value: "[A-Za-z0-9\\-_\\+]", description: "[A-Za-z0-9\\-_\\+]" },
|
peg$c27 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "-", "_", "+"], false, false),
|
||||||
peg$c28 = function(a) { return a.join('') },
|
peg$c28 = function(a) { return a.join('') },
|
||||||
peg$c29 = function(v) { return v; },
|
peg$c29 = function(v) { return v; },
|
||||||
peg$c30 = function(start, last) { return start.concat(last); },
|
peg$c30 = function(start, last) { return start.concat(last); },
|
||||||
peg$c31 = function(l) { return l; },
|
peg$c31 = function(l) { return l; },
|
||||||
peg$c32 = /^[0-9]/,
|
peg$c32 = /^[0-9]/,
|
||||||
peg$c33 = { type: "class", value: "[0-9]", description: "[0-9]" },
|
peg$c33 = peg$classExpectation([["0", "9"]], false, false),
|
||||||
peg$c34 = function(d) { return parseInt(d.join(''), 10); },
|
peg$c34 = function(d) { return parseInt(d.join(''), 10); },
|
||||||
|
|
||||||
peg$currPos = 0,
|
peg$currPos = 0,
|
||||||
peg$savedPos = 0,
|
peg$savedPos = 0,
|
||||||
peg$posDetailsCache = [{ line: 1, column: 1, seenCR: false }],
|
peg$posDetailsCache = [{ line: 1, column: 1 }],
|
||||||
peg$maxFailPos = 0,
|
peg$maxFailPos = 0,
|
||||||
peg$maxFailExpected = [],
|
peg$maxFailExpected = [],
|
||||||
peg$silentFails = 0,
|
peg$silentFails = 0,
|
||||||
@@ -97,27 +202,44 @@ module.exports = (function() {
|
|||||||
return peg$computeLocation(peg$savedPos, peg$currPos);
|
return peg$computeLocation(peg$savedPos, peg$currPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
function expected(description) {
|
function expected(description, location) {
|
||||||
throw peg$buildException(
|
location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
|
||||||
null,
|
|
||||||
[{ type: "other", description: description }],
|
throw peg$buildStructuredError(
|
||||||
|
[peg$otherExpectation(description)],
|
||||||
input.substring(peg$savedPos, peg$currPos),
|
input.substring(peg$savedPos, peg$currPos),
|
||||||
peg$computeLocation(peg$savedPos, peg$currPos)
|
location
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function error(message) {
|
function error(message, location) {
|
||||||
throw peg$buildException(
|
location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
|
||||||
message,
|
|
||||||
null,
|
throw peg$buildSimpleError(message, location);
|
||||||
input.substring(peg$savedPos, peg$currPos),
|
}
|
||||||
peg$computeLocation(peg$savedPos, peg$currPos)
|
|
||||||
);
|
function peg$literalExpectation(text, ignoreCase) {
|
||||||
|
return { type: "literal", text: text, ignoreCase: ignoreCase };
|
||||||
|
}
|
||||||
|
|
||||||
|
function peg$classExpectation(parts, inverted, ignoreCase) {
|
||||||
|
return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
|
||||||
|
}
|
||||||
|
|
||||||
|
function peg$anyExpectation() {
|
||||||
|
return { type: "any" };
|
||||||
|
}
|
||||||
|
|
||||||
|
function peg$endExpectation() {
|
||||||
|
return { type: "end" };
|
||||||
|
}
|
||||||
|
|
||||||
|
function peg$otherExpectation(description) {
|
||||||
|
return { type: "other", description: description };
|
||||||
}
|
}
|
||||||
|
|
||||||
function peg$computePosDetails(pos) {
|
function peg$computePosDetails(pos) {
|
||||||
var details = peg$posDetailsCache[pos],
|
var details = peg$posDetailsCache[pos], p;
|
||||||
p, ch;
|
|
||||||
|
|
||||||
if (details) {
|
if (details) {
|
||||||
return details;
|
return details;
|
||||||
@@ -130,23 +252,15 @@ module.exports = (function() {
|
|||||||
details = peg$posDetailsCache[p];
|
details = peg$posDetailsCache[p];
|
||||||
details = {
|
details = {
|
||||||
line: details.line,
|
line: details.line,
|
||||||
column: details.column,
|
column: details.column
|
||||||
seenCR: details.seenCR
|
|
||||||
};
|
};
|
||||||
|
|
||||||
while (p < pos) {
|
while (p < pos) {
|
||||||
ch = input.charAt(p);
|
if (input.charCodeAt(p) === 10) {
|
||||||
if (ch === "\n") {
|
|
||||||
if (!details.seenCR) { details.line++; }
|
|
||||||
details.column = 1;
|
|
||||||
details.seenCR = false;
|
|
||||||
} else if (ch === "\r" || ch === "\u2028" || ch === "\u2029") {
|
|
||||||
details.line++;
|
details.line++;
|
||||||
details.column = 1;
|
details.column = 1;
|
||||||
details.seenCR = true;
|
|
||||||
} else {
|
} else {
|
||||||
details.column++;
|
details.column++;
|
||||||
details.seenCR = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
p++;
|
p++;
|
||||||
@@ -186,71 +300,13 @@ module.exports = (function() {
|
|||||||
peg$maxFailExpected.push(expected);
|
peg$maxFailExpected.push(expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
function peg$buildException(message, expected, found, location) {
|
function peg$buildSimpleError(message, location) {
|
||||||
function cleanupExpected(expected) {
|
return new peg$SyntaxError(message, null, null, location);
|
||||||
var i = 1;
|
|
||||||
|
|
||||||
expected.sort(function(a, b) {
|
|
||||||
if (a.description < b.description) {
|
|
||||||
return -1;
|
|
||||||
} else if (a.description > b.description) {
|
|
||||||
return 1;
|
|
||||||
} else {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
while (i < expected.length) {
|
|
||||||
if (expected[i - 1] === expected[i]) {
|
|
||||||
expected.splice(i, 1);
|
|
||||||
} else {
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildMessage(expected, found) {
|
|
||||||
function stringEscape(s) {
|
|
||||||
function hex(ch) { return ch.charCodeAt(0).toString(16).toUpperCase(); }
|
|
||||||
|
|
||||||
return s
|
|
||||||
.replace(/\\/g, '\\\\')
|
|
||||||
.replace(/"/g, '\\"')
|
|
||||||
.replace(/\x08/g, '\\b')
|
|
||||||
.replace(/\t/g, '\\t')
|
|
||||||
.replace(/\n/g, '\\n')
|
|
||||||
.replace(/\f/g, '\\f')
|
|
||||||
.replace(/\r/g, '\\r')
|
|
||||||
.replace(/[\x00-\x07\x0B\x0E\x0F]/g, function(ch) { return '\\x0' + hex(ch); })
|
|
||||||
.replace(/[\x10-\x1F\x80-\xFF]/g, function(ch) { return '\\x' + hex(ch); })
|
|
||||||
.replace(/[\u0100-\u0FFF]/g, function(ch) { return '\\u0' + hex(ch); })
|
|
||||||
.replace(/[\u1000-\uFFFF]/g, function(ch) { return '\\u' + hex(ch); });
|
|
||||||
}
|
|
||||||
|
|
||||||
var expectedDescs = new Array(expected.length),
|
|
||||||
expectedDesc, foundDesc, i;
|
|
||||||
|
|
||||||
for (i = 0; i < expected.length; i++) {
|
|
||||||
expectedDescs[i] = expected[i].description;
|
|
||||||
}
|
|
||||||
|
|
||||||
expectedDesc = expected.length > 1
|
|
||||||
? expectedDescs.slice(0, -1).join(", ")
|
|
||||||
+ " or "
|
|
||||||
+ expectedDescs[expected.length - 1]
|
|
||||||
: expectedDescs[0];
|
|
||||||
|
|
||||||
foundDesc = found ? "\"" + stringEscape(found) + "\"" : "end of input";
|
|
||||||
|
|
||||||
return "Expected " + expectedDesc + " but " + foundDesc + " found.";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (expected !== null) {
|
|
||||||
cleanupExpected(expected);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function peg$buildStructuredError(expected, found, location) {
|
||||||
return new peg$SyntaxError(
|
return new peg$SyntaxError(
|
||||||
message !== null ? message : buildMessage(expected, found),
|
peg$SyntaxError.buildMessage(expected, found),
|
||||||
expected,
|
expected,
|
||||||
found,
|
found,
|
||||||
location
|
location
|
||||||
@@ -832,12 +888,12 @@ module.exports = (function() {
|
|||||||
return client.node === value;
|
return client.node === value;
|
||||||
},
|
},
|
||||||
NP : function numberOfPosts() {
|
NP : function numberOfPosts() {
|
||||||
// :TODO: implement me!!!!
|
const postCount = parseInt(user.properties.post_count, 10);
|
||||||
return false;
|
return !isNaN(value) && postCount >= value;
|
||||||
},
|
},
|
||||||
NC : function numberOfCalls() {
|
NC : function numberOfCalls() {
|
||||||
// :TODO: implement me!!
|
const loginCount = parseInt(user.properties.login_count, 10);
|
||||||
return false;
|
return !isNaN(value) && loginCount >= value;
|
||||||
},
|
},
|
||||||
SC : function isSecureConnection() {
|
SC : function isSecureConnection() {
|
||||||
return client.session.isSecure;
|
return client.session.isSecure;
|
||||||
@@ -900,11 +956,10 @@ module.exports = (function() {
|
|||||||
return peg$result;
|
return peg$result;
|
||||||
} else {
|
} else {
|
||||||
if (peg$result !== peg$FAILED && peg$currPos < input.length) {
|
if (peg$result !== peg$FAILED && peg$currPos < input.length) {
|
||||||
peg$fail({ type: "end", description: "end of input" });
|
peg$fail(peg$endExpectation());
|
||||||
}
|
}
|
||||||
|
|
||||||
throw peg$buildException(
|
throw peg$buildStructuredError(
|
||||||
null,
|
|
||||||
peg$maxFailExpected,
|
peg$maxFailExpected,
|
||||||
peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
|
peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
|
||||||
peg$maxFailPos < input.length
|
peg$maxFailPos < input.length
|
||||||
@@ -912,10 +967,9 @@ module.exports = (function() {
|
|||||||
: peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
|
: peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
module.exports = {
|
||||||
SyntaxError: peg$SyntaxError,
|
SyntaxError: peg$SyntaxError,
|
||||||
parse: peg$parse
|
parse: peg$parse
|
||||||
};
|
};
|
||||||
})();
|
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ exports.getFileEntryPath = getFileEntryPath;
|
|||||||
exports.changeFileAreaWithOptions = changeFileAreaWithOptions;
|
exports.changeFileAreaWithOptions = changeFileAreaWithOptions;
|
||||||
exports.scanFile = scanFile;
|
exports.scanFile = scanFile;
|
||||||
exports.scanFileAreaForChanges = scanFileAreaForChanges;
|
exports.scanFileAreaForChanges = scanFileAreaForChanges;
|
||||||
|
exports.getDescFromFileName = getDescFromFileName;
|
||||||
|
|
||||||
const WellKnownAreaTags = exports.WellKnownAreaTags = {
|
const WellKnownAreaTags = exports.WellKnownAreaTags = {
|
||||||
Invalid : '',
|
Invalid : '',
|
||||||
@@ -670,3 +671,11 @@ function scanFileAreaForChanges(areaInfo, options, iterator, cb) {
|
|||||||
return cb(err);
|
return cb(err);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getDescFromFileName(fileName) {
|
||||||
|
// :TODO: this method could use some more logic to really be nice.
|
||||||
|
const ext = paths.extname(fileName);
|
||||||
|
const name = paths.basename(fileName, ext);
|
||||||
|
|
||||||
|
return _.upperFirst(name.replace(/[\-_.+]/g, ' ').replace(/\s+/g, ' '));
|
||||||
|
}
|
||||||
@@ -290,8 +290,9 @@ module.exports = class FileEntry {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// :TODO: Use static get accessor:
|
static get WellKnownMetaValues() {
|
||||||
static getWellKnownMetaValues() { return Object.keys(FILE_WELL_KNOWN_META); }
|
return Object.keys(FILE_WELL_KNOWN_META);
|
||||||
|
}
|
||||||
|
|
||||||
static findFileBySha(sha, cb) {
|
static findFileBySha(sha, cb) {
|
||||||
// full or partial SHA-256
|
// full or partial SHA-256
|
||||||
|
|||||||
@@ -93,8 +93,9 @@ class PacketHeader {
|
|||||||
|
|
||||||
// See FSC-48
|
// See FSC-48
|
||||||
if(address.point) {
|
if(address.point) {
|
||||||
|
this.auxNet = address.origNet;
|
||||||
this.origNet = -1;
|
this.origNet = -1;
|
||||||
this.auxNet = address.net;
|
|
||||||
} else {
|
} else {
|
||||||
this.origNet = address.net;
|
this.origNet = address.net;
|
||||||
this.auxNet = 0;
|
this.auxNet = 0;
|
||||||
@@ -296,7 +297,7 @@ function Packet(options) {
|
|||||||
|
|
||||||
buffer.writeUInt16LE(packetHeader.baud, 16);
|
buffer.writeUInt16LE(packetHeader.baud, 16);
|
||||||
buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
|
buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
|
||||||
buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xff : packetHeader.origNet, 20);
|
buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xffff : packetHeader.origNet, 20);
|
||||||
buffer.writeUInt16LE(packetHeader.destNet, 22);
|
buffer.writeUInt16LE(packetHeader.destNet, 22);
|
||||||
buffer.writeUInt8(packetHeader.prodCodeLo, 24);
|
buffer.writeUInt8(packetHeader.prodCodeLo, 24);
|
||||||
buffer.writeUInt8(packetHeader.prodRevHi, 25);
|
buffer.writeUInt8(packetHeader.prodRevHi, 25);
|
||||||
@@ -334,7 +335,7 @@ function Packet(options) {
|
|||||||
|
|
||||||
buffer.writeUInt16LE(packetHeader.baud, 16);
|
buffer.writeUInt16LE(packetHeader.baud, 16);
|
||||||
buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
|
buffer.writeUInt16LE(FTN_PACKET_HEADER_TYPE, 18);
|
||||||
buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xff : packetHeader.origNet, 20);
|
buffer.writeUInt16LE(-1 === packetHeader.origNet ? 0xffff : packetHeader.origNet, 20);
|
||||||
buffer.writeUInt16LE(packetHeader.destNet, 22);
|
buffer.writeUInt16LE(packetHeader.destNet, 22);
|
||||||
buffer.writeUInt8(packetHeader.prodCodeLo, 24);
|
buffer.writeUInt8(packetHeader.prodCodeLo, 24);
|
||||||
buffer.writeUInt8(packetHeader.prodRevHi, 25);
|
buffer.writeUInt8(packetHeader.prodRevHi, 25);
|
||||||
|
|||||||
@@ -23,7 +23,14 @@ const exitCodes = exports.ExitCodes = {
|
|||||||
BAD_ARGS : -3,
|
BAD_ARGS : -3,
|
||||||
};
|
};
|
||||||
|
|
||||||
const argv = exports.argv = require('minimist')(process.argv.slice(2));
|
const argv = exports.argv = require('minimist')(process.argv.slice(2), {
|
||||||
|
alias : {
|
||||||
|
h : 'help',
|
||||||
|
v : 'version',
|
||||||
|
c : 'config',
|
||||||
|
n : 'no-prompt',
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
function printUsageAndSetExitCode(errMsg, exitCode) {
|
function printUsageAndSetExitCode(errMsg, exitCode) {
|
||||||
if(_.isUndefined(exitCode)) {
|
if(_.isUndefined(exitCode)) {
|
||||||
|
|||||||
@@ -9,12 +9,14 @@ const initConfigAndDatabases = require('./oputil_common.js').initConfigAndDataba
|
|||||||
const getHelpFor = require('./oputil_help.js').getHelpFor;
|
const getHelpFor = require('./oputil_help.js').getHelpFor;
|
||||||
const getAreaAndStorage = require('./oputil_common.js').getAreaAndStorage;
|
const getAreaAndStorage = require('./oputil_common.js').getAreaAndStorage;
|
||||||
const Errors = require('../../core/enig_error.js').Errors;
|
const Errors = require('../../core/enig_error.js').Errors;
|
||||||
|
const getDescFromFileName = require('../../core/file_base_area.js').getDescFromFileName;
|
||||||
|
|
||||||
const async = require('async');
|
const async = require('async');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const paths = require('path');
|
const paths = require('path');
|
||||||
const _ = require('lodash');
|
const _ = require('lodash');
|
||||||
const moment = require('moment');
|
const moment = require('moment');
|
||||||
|
const inq = require('inquirer');
|
||||||
|
|
||||||
exports.handleFileBaseCommand = handleFileBaseCommand;
|
exports.handleFileBaseCommand = handleFileBaseCommand;
|
||||||
|
|
||||||
@@ -33,6 +35,40 @@ exports.handleFileBaseCommand = handleFileBaseCommand;
|
|||||||
|
|
||||||
let fileArea; // required during init
|
let fileArea; // required during init
|
||||||
|
|
||||||
|
function finalizeEntryAndPersist(fileEntry, cb) {
|
||||||
|
async.series(
|
||||||
|
[
|
||||||
|
function getDescIfNeeded(callback) {
|
||||||
|
if(false === argv.prompt || ( fileEntry.desc && fileEntry.desc.length > 0 ) ) {
|
||||||
|
return callback(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
const questions = [
|
||||||
|
{
|
||||||
|
name : 'desc',
|
||||||
|
message : `Description for ${fileEntry.fileName}:`,
|
||||||
|
type : 'input',
|
||||||
|
default : getDescFromFileName(fileEntry.fileName),
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
inq.prompt(questions).then( answers => {
|
||||||
|
fileEntry.desc = answers.desc;
|
||||||
|
return callback(null);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
function persist(callback) {
|
||||||
|
fileEntry.persist( err => {
|
||||||
|
return callback(err);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
],
|
||||||
|
err => {
|
||||||
|
return cb(err);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function scanFileAreaForChanges(areaInfo, options, cb) {
|
function scanFileAreaForChanges(areaInfo, options, cb) {
|
||||||
|
|
||||||
const storageLocations = fileArea.getAreaStorageLocations(areaInfo).filter(sl => {
|
const storageLocations = fileArea.getAreaStorageLocations(areaInfo).filter(sl => {
|
||||||
@@ -94,7 +130,7 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
fileEntry.persist( err => {
|
finalizeEntryAndPersist(fileEntry, err => {
|
||||||
return nextFile(err);
|
return nextFile(err);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ const usageHelp = exports.USAGE_HELP = {
|
|||||||
<command> [<args>]
|
<command> [<args>]
|
||||||
|
|
||||||
global args:
|
global args:
|
||||||
--config PATH : specify config path (${getDefaultConfigPath()})
|
-c, --config PATH : specify config path (${getDefaultConfigPath()})
|
||||||
--no-prompt : assume defaults/don't prompt for input where possible
|
-n, --no-prompt : assume defaults/don't prompt for input where possible
|
||||||
|
|
||||||
where <command> is one of:
|
where <command> is one of:
|
||||||
user : user utilities
|
user : user utilities
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ module.exports = function() {
|
|||||||
if(0 === argv._.length ||
|
if(0 === argv._.length ||
|
||||||
'help' === argv._[0])
|
'help' === argv._[0])
|
||||||
{
|
{
|
||||||
printUsageAndSetExitCode(getHelpFor('General'), ExitCodes.SUCCESS);
|
return printUsageAndSetExitCode(getHelpFor('General'), ExitCodes.SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch(argv._[0]) {
|
switch(argv._[0]) {
|
||||||
|
|||||||
@@ -142,6 +142,8 @@ const OPTIONS = {
|
|||||||
//SSPI_LOGON : 139,
|
//SSPI_LOGON : 139,
|
||||||
//PRAGMA_HEARTBEAT : 140
|
//PRAGMA_HEARTBEAT : 140
|
||||||
|
|
||||||
|
ARE_YOU_THERE : 246, // aka 'AYT' RFC 854 @ https://tools.ietf.org/html/rfc854
|
||||||
|
|
||||||
EXTENDED_OPTIONS_LIST : 255, // RFC 861 (STD 32)
|
EXTENDED_OPTIONS_LIST : 255, // RFC 861 (STD 32)
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -192,7 +194,7 @@ OPTION_IMPLS[OPTIONS.TERMINAL_SPEED] =
|
|||||||
OPTION_IMPLS[OPTIONS.REMOTE_FLOW_CONTROL] =
|
OPTION_IMPLS[OPTIONS.REMOTE_FLOW_CONTROL] =
|
||||||
OPTION_IMPLS[OPTIONS.X_DISPLAY_LOCATION] =
|
OPTION_IMPLS[OPTIONS.X_DISPLAY_LOCATION] =
|
||||||
OPTION_IMPLS[OPTIONS.SEND_LOCATION] =
|
OPTION_IMPLS[OPTIONS.SEND_LOCATION] =
|
||||||
|
OPTION_IMPLS[OPTIONS.ARE_YOU_THERE] =
|
||||||
OPTION_IMPLS[OPTIONS.SUPPRESS_GO_AHEAD] = function(bufs, i, event) {
|
OPTION_IMPLS[OPTIONS.SUPPRESS_GO_AHEAD] = function(bufs, i, event) {
|
||||||
event.buf = bufs.splice(0, i).toBuffer();
|
event.buf = bufs.splice(0, i).toBuffer();
|
||||||
return event;
|
return event;
|
||||||
|
|||||||
@@ -44,12 +44,12 @@
|
|||||||
return client.node === value;
|
return client.node === value;
|
||||||
},
|
},
|
||||||
NP : function numberOfPosts() {
|
NP : function numberOfPosts() {
|
||||||
// :TODO: implement me!!!!
|
const postCount = parseInt(user.properties.post_count, 10);
|
||||||
return false;
|
return !isNaN(value) && postCount >= value;
|
||||||
},
|
},
|
||||||
NC : function numberOfCalls() {
|
NC : function numberOfCalls() {
|
||||||
// :TODO: implement me!!
|
const loginCount = parseInt(user.properties.login_count, 10);
|
||||||
return false;
|
return !isNaN(value) && loginCount >= value;
|
||||||
},
|
},
|
||||||
SC : function isSecureConnection() {
|
SC : function isSecureConnection() {
|
||||||
return client.session.isSecure;
|
return client.session.isSecure;
|
||||||
|
|||||||
@@ -229,7 +229,7 @@ exports.getModule = class FileAreaList extends MenuModule {
|
|||||||
// We need the entry object to contain meta keys even if they are empty as
|
// We need the entry object to contain meta keys even if they are empty as
|
||||||
// consumers may very likely attempt to use them
|
// consumers may very likely attempt to use them
|
||||||
//
|
//
|
||||||
const metaValues = FileEntry.getWellKnownMetaValues();
|
const metaValues = FileEntry.WellKnownMetaValues;
|
||||||
metaValues.forEach(name => {
|
metaValues.forEach(name => {
|
||||||
const value = !_.isUndefined(currEntry.meta[name]) ? currEntry.meta[name] : 'N/A';
|
const value = !_.isUndefined(currEntry.meta[name]) ? currEntry.meta[name] : 'N/A';
|
||||||
entryInfo[_.camelCase(name)] = value;
|
entryInfo[_.camelCase(name)] = value;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ const getSortedAvailableFileAreas = require('../core/file_base_area.js').getSor
|
|||||||
const getAreaDefaultStorageDirectory = require('../core/file_base_area.js').getAreaDefaultStorageDirectory;
|
const getAreaDefaultStorageDirectory = require('../core/file_base_area.js').getAreaDefaultStorageDirectory;
|
||||||
const scanFile = require('../core/file_base_area.js').scanFile;
|
const scanFile = require('../core/file_base_area.js').scanFile;
|
||||||
const getFileAreaByTag = require('../core/file_base_area.js').getFileAreaByTag;
|
const getFileAreaByTag = require('../core/file_base_area.js').getFileAreaByTag;
|
||||||
|
const getDescFromFileName = require('../core/file_base_area.js').getDescFromFileName;
|
||||||
const ansiGoto = require('../core/ansi_term.js').goto;
|
const ansiGoto = require('../core/ansi_term.js').goto;
|
||||||
const moveFileWithCollisionHandling = require('../core/file_util.js').moveFileWithCollisionHandling;
|
const moveFileWithCollisionHandling = require('../core/file_util.js').moveFileWithCollisionHandling;
|
||||||
const pathWithTerminatingSeparator = require('../core/file_util.js').pathWithTerminatingSeparator;
|
const pathWithTerminatingSeparator = require('../core/file_util.js').pathWithTerminatingSeparator;
|
||||||
@@ -681,7 +682,7 @@ exports.getModule = class UploadModule extends MenuModule {
|
|||||||
self.viewControllers.fileDetails.switchFocus(MciViewIds.fileDetails.tags);
|
self.viewControllers.fileDetails.switchFocus(MciViewIds.fileDetails.tags);
|
||||||
} else {
|
} else {
|
||||||
descView.setPropertyValue('mode', 'edit');
|
descView.setPropertyValue('mode', 'edit');
|
||||||
descView.setText('');
|
descView.setText(getDescFromFileName(fileEntry.fileName)); // try to come up with something good as a default
|
||||||
descView.acceptsFocus = true;
|
descView.acceptsFocus = true;
|
||||||
self.viewControllers.fileDetails.switchFocus(MciViewIds.fileDetails.desc);
|
self.viewControllers.fileDetails.switchFocus(MciViewIds.fileDetails.desc);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user