albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merger, changedataversion, motd refactor

Browse source
This commit is contained in:
YourFriendlyNeighborhoodDealer 2019-08-14 10:34:55 +02:00
parent 9cacee321c
commit 50a1dd91eb
3 changed files with 364 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

39
utils/changedataversion.js
View file

@ -1,32 +1,31 @@
const utils = require('./utils.js'); const utils = require('../utils/utils.js')
const dataFile = "public/data.json"; const dataFile = '../public/data.json'
const versionFile = "public/version"; const versionFile = '../public/version'
var p = GetParams(); var p = GetParams()
if (p.length <= 0) { if (p.length <= 0) {
console.log("no params!"); console.log('no params!')
process.exit(0); process.exit(0)
} }
var param = p.join(' ')
var param = p.join(" "); console.log('param: ' + param)
console.log("param: " + param); var d = utils.ReadFile(dataFile)
var parsed = JSON.parse(d)
var d = utils.ReadFile(dataFile); console.log('Old version:')
var parsed = JSON.parse(d); console.log(parsed.version)
console.log("Old version:"); parsed.version = param
console.log(parsed.version);
parsed.version = param; console.log('New version:')
console.log(parsed.version)
console.log("New version:"); utils.WriteFile(JSON.stringify(parsed), dataFile)
console.log(parsed.version); utils.WriteFile(parsed.version, versionFile)
utils.WriteFile(JSON.stringify(parsed), dataFile); function GetParams () {
utils.WriteFile(parsed.version, versionFile); return process.argv.splice(2)
function GetParams() {
return process.argv.splice(2);
} }

478
utils/merger.js
View file

@ -22,280 +22,256 @@
// join json datas, or raw datas // join json datas, or raw datas
// or something else // or something else
const minMatchAmmount = 55; const minMatchAmmount = 55
const minResultMatchPercent = 99; const minResultMatchPercent = 99
const lengthDiffMultiplier = 10; const lengthDiffMultiplier = 10
class Question { class Question {
constructor(q, a, i) { constructor (q, a, i) {
this.Q = q; this.Q = q
this.A = a; this.A = a
this.I = i; this.I = i
} }
toString() { toString () {
var r = "?" + this.Q + "\n!" + this.A; var r = '?' + this.Q + '\n!' + this.A
if (this.I) if (this.I) { r += '\n>' + this.I }
r += "\n>" + this.I; return r
return r;
} }
HasQuestion() { HasQuestion () {
return this.Q != undefined; return this.Q != undefined
} }
HasAnswer() { HasAnswer () {
return this.A != undefined; return this.A != undefined
} }
HasImage() { HasImage () {
return this.I != undefined; return this.I != undefined
} }
IsComplete() { IsComplete () {
return this.HasQuestion() && this.HasAnswer(); return this.HasQuestion() && this.HasAnswer()
} }
// TODO: TEST DIS // TODO: TEST DIS
Compare(q2, i) { Compare (q2, i) {
if (typeof q2 == 'string') { if (typeof q2 === 'string') {
var qmatchpercent = Question.CompareString(this.Q, q2); var qmatchpercent = Question.CompareString(this.Q, q2)
if (i == undefined || i.length == 0) if (i == undefined || i.length == 0) { return qmatchpercent } else {
return qmatchpercent;
else {
if (this.HasImage()) { if (this.HasImage()) {
const imatchpercent = this.HasImage() ? Question.CompareString(this.I.join(" "), i.join(" ")) : const imatchpercent = this.HasImage() ? Question.CompareString(this.I.join(' '), i.join(' '))
0; : 0
return (qmatchpercent + imatchpercent) / 2; return (qmatchpercent + imatchpercent) / 2
} else { } else {
qmatchpercent -= 30; qmatchpercent -= 30
if (qmatchpercent < 0) if (qmatchpercent < 0) { return 0 } else { return qmatchpercent }
return 0;
else
return qmatchpercent;
} }
} }
} else { } else {
const qmatchpercent = Question.CompareString(this.Q, q2.Q); const qmatchpercent = Question.CompareString(this.Q, q2.Q)
const amatchpercent = Question.CompareString(this.A, q2.A); const amatchpercent = Question.CompareString(this.A, q2.A)
if (this.I != undefined) { if (this.I != undefined) {
const imatchpercent = this.I == undefined ? Question.CompareString(this.I.join(" "), q2.I.join( const imatchpercent = this.I == undefined ? Question.CompareString(this.I.join(' '), q2.I.join(
" ")) : 0; ' ')) : 0
return (qmatchpercent + amatchpercent + imatchpercent) / 3; return (qmatchpercent + amatchpercent + imatchpercent) / 3
} else { } else {
return (qmatchpercent + amatchpercent) / 2; return (qmatchpercent + amatchpercent) / 2
} }
} }
} }
static CompareString(s1, s2) { static CompareString (s1, s2) {
s1 = SimplifyStringForComparison(s1).split(" "); s1 = SimplifyStringForComparison(s1).split(' ')
s2 = SimplifyStringForComparison(s2).split(" "); s2 = SimplifyStringForComparison(s2).split(' ')
var match = 0; var match = 0
for (var i = 0; i < s1.length; i++) for (var i = 0; i < s1.length; i++) {
if (s2.includes(s1[i])) if (s2.includes(s1[i])) { match++ }
match++; }
var percent = Math.round(((match / s1.length) * 100).toFixed(2)); // matched words percent var percent = Math.round(((match / s1.length) * 100).toFixed(2)) // matched words percent
var lengthDifference = Math.abs(s2.length - s1.length); var lengthDifference = Math.abs(s2.length - s1.length)
percent -= lengthDifference * lengthDiffMultiplier; percent -= lengthDifference * lengthDiffMultiplier
if (percent < 0) if (percent < 0) { percent = 0 }
percent = 0; return percent
return percent;
} }
} }
class Subject { class Subject {
constructor(n) { constructor (n) {
this.Name = n; this.Name = n
this.Questions = []; this.Questions = []
} }
get length() { get length () {
return this.Questions.length; return this.Questions.length
} }
AddQuestion(q) { AddQuestion (q) {
this.Questions.push(q); this.Questions.push(q)
} }
toString() { toString () {
var r = []; var r = []
for (var i = 0; i < this.Questions.length; i++) for (var i = 0; i < this.Questions.length; i++) { r.push(this.Questions[i].toString()) }
r.push(this.Questions[i].toString()); return '+' + this.Name + '\n' + r.join('\n')
return "+" + this.Name + "\n" + r.join("\n");
} }
} }
class QuestionDB { class QuestionDB {
constructor() { constructor () {
this.Subjects = []; this.Subjects = []
} }
get length() { get length () {
return this.Subjects.length; return this.Subjects.length
} }
AddQuestion(subj, q) { AddQuestion (subj, q) {
var i = 0; var i = 0
while (i < this.Subjects.length && this.Subjects[i].Name != subj) while (i < this.Subjects.length && this.Subjects[i].Name != subj) { i++ }
i++; if (i < this.Subjects.length) { this.Subjects[i].AddQuestion(q) } else {
if (i < this.Subjects.length) const n = new Subject(subj)
this.Subjects[i].AddQuestion(q); n.AddQuestion(q)
else { this.Subjects.push(n)
const n = new Subject(subj);
n.AddQuestion(q);
this.Subjects.push(n);
} }
} }
AddSubject(subj) { AddSubject (subj) {
var i = 0; var i = 0
while (i < this.length && subj.Name != this.Subjects[i].Name) while (i < this.length && subj.Name != this.Subjects[i].Name) { i++ }
i++;
if (i < this.length) { if (i < this.length) {
this.Subjects.concat(subj.Questions); this.Subjects.concat(subj.Questions)
} else { } else {
this.Subjects.push(subj); this.Subjects.push(subj)
} }
} }
toString() { toString () {
var r = []; var r = []
for (var i = 0; i < this.Subjects.length; i++) for (var i = 0; i < this.Subjects.length; i++) { r.push(this.Subjects[i].toString()) }
r.push(this.Subjects[i].toString()); return r.join('\n\n')
return r.join("\n\n");
} }
} }
var utils = require('./utils.js'); var utils = require('./utils.js')
var actions = require('./actions.js'); var actions = require('./actions.js')
Main(); Main()
function Main() {
console.clear();
const params = GetParams();
console.log(params);
var dbs = [];
function Main () {
console.clear()
const params = GetParams()
console.log(params)
var dbs = []
for (var i = 0; i < params.length; i++) { for (var i = 0; i < params.length; i++) {
PrintLN(); PrintLN()
console.log(params[i] + ": "); console.log(params[i] + ': ')
try { try {
dbs.push(ParseJSONData(utils.ReadFile(params[i]))); dbs.push(ParseJSONData(utils.ReadFile(params[i])))
console.log("JSON data added"); console.log('JSON data added')
} catch (e) { } catch (e) {
console.log(e); console.log(e)
console.log("Trying with old format..."); console.log('Trying with old format...')
dbs.push(ReadData(utils.ReadFile(params[i])).result); dbs.push(ReadData(utils.ReadFile(params[i])).result)
} }
} }
PrintLN(); PrintLN()
dbs.forEach((item) => { dbs.forEach((item) => {
PrintDB(item); PrintDB(item)
}); })
var olds = []; var olds = []
if (dbs.length == 1) { if (dbs.length == 1) {
for ( let i = 0; i < dbs[0].length; i++) for (let i = 0; i < dbs[0].length; i++) { olds.push(dbs[0].Subjects[i].length) }
olds.push(dbs[0].Subjects[i].length);
} }
console.log("Parsed data count: " + dbs.length); console.log('Parsed data count: ' + dbs.length)
PrintLN(); PrintLN()
console.log("Merging databases..."); console.log('Merging databases...')
var db = MergeDatabases(dbs); var db = MergeDatabases(dbs)
console.log("Removing duplicates..."); console.log('Removing duplicates...')
var r = RemoveDuplicates(db); var r = RemoveDuplicates(db)
console.log("RESULT:"); console.log('RESULT:')
PrintDB(r, olds); PrintDB(r, olds)
utils.WriteFile(JSON.stringify(r), "newData"); utils.WriteFile(JSON.stringify(r), 'newData')
console.log("File written!"); console.log('File written!')
} }
function PrintLN() { function PrintLN () {
console.log("------------------------------------------------------"); console.log('------------------------------------------------------')
} }
function PrintDB(r, olds) { function PrintDB (r, olds) {
console.log("Data subject count: " + r.length); console.log('Data subject count: ' + r.length)
var maxLength = 0; var maxLength = 0
for (var i = 0; i < r.length; i++) { for (var i = 0; i < r.length; i++) {
if (maxLength < r.Subjects[i].Name.length) if (maxLength < r.Subjects[i].Name.length) { maxLength = r.Subjects[i].Name.length }
maxLength = r.Subjects[i].Name.length;
} }
let qcount = 0; let qcount = 0
for (var i = 0; i < r.length; i++) { for (var i = 0; i < r.length; i++) {
let line = i; let line = i
if (line < 10) if (line < 10) { line += ' ' }
line += ' ';
line += ": "; line += ': '
var currLength = line.length + maxLength + 4; var currLength = line.length + maxLength + 4
line += r.Subjects[i].Name; line += r.Subjects[i].Name
while (line.length < currLength) { while (line.length < currLength) {
if (i % 4 == 0) if (i % 4 == 0) { line += '.' } else { line += ' ' }
line += ".";
else
line += " ";
} }
if (olds && olds.length > 0) { if (olds && olds.length > 0) {
// TODO: check if correct row! should be now, but well... // TODO: check if correct row! should be now, but well...
if (olds[i] < 10) if (olds[i] < 10) { line += ' ' }
line += " "; if (olds[i] < 100) { line += ' ' }
if (olds[i] < 100)
line += " ";
line += olds[i]; line += olds[i]
line += " -> "; line += ' -> '
} }
if (r.Subjects[i].length < 10) if (r.Subjects[i].length < 10) { line += ' ' }
line += " "; if (r.Subjects[i].length < 100) { line += ' ' }
if (r.Subjects[i].length < 100)
line += " ";
line += r.Subjects[i].length; line += r.Subjects[i].length
qcount += r.Subjects[i].length; qcount += r.Subjects[i].length
line += " db"; line += ' db'
console.log(line); console.log(line)
} }
console.log("Total questions: " + qcount); console.log('Total questions: ' + qcount)
PrintLN(); PrintLN()
} }
function GetParams() { function GetParams () {
return process.argv.splice(2); return process.argv.splice(2)
} }
function ParseJSONData(data) { function ParseJSONData (data) {
var d = JSON.parse(data); var d = JSON.parse(data)
var r = new QuestionDB(); var r = new QuestionDB()
var rt = []; var rt = []
for (var i = 0; i < d.Subjects.length; i++) { for (var i = 0; i < d.Subjects.length; i++) {
let s = new Subject(d.Subjects[i].Name); let s = new Subject(d.Subjects[i].Name)
var j = 0; var j = 0
for (j = 0; j < d.Subjects[i].Questions.length; j++) { for (j = 0; j < d.Subjects[i].Questions.length; j++) {
var currQ = d.Subjects[i].Questions[j]; var currQ = d.Subjects[i].Questions[j]
s.AddQuestion(new Question(currQ.Q, currQ.A, currQ.I)); s.AddQuestion(new Question(currQ.Q, currQ.A, currQ.I))
} }
rt.push({ rt.push({
name: d.Subjects[i].Name, name: d.Subjects[i].Name,
count: j count: j
}); })
r.AddSubject(s); r.AddSubject(s)
} }
return r; return r
} }
function MergeDatabases(dbs) { function MergeDatabases (dbs) {
var db = new QuestionDB(); var db = new QuestionDB()
for (var i = 0; i < dbs.length; i++) for (var i = 0; i < dbs.length; i++) {
for (var j = 0; j < dbs[i].length; j++) for (var j = 0; j < dbs[i].length; j++) { db.AddSubject(dbs[i].Subjects[j]) }
db.AddSubject(dbs[i].Subjects[j]); }
return db; return db
} }
/* /*
@ -303,150 +279,142 @@ function MergeDatabases(dbs) {
* Parameter should be raw read file in string with "\n"-s * Parameter should be raw read file in string with "\n"-s
* TODO: ??? -s are not listed as errors, tho works correctly * TODO: ??? -s are not listed as errors, tho works correctly
* */ * */
function ReadData(data) { function ReadData (data) {
const d = data.split('\n')
const r = new QuestionDB()
var logs = []
var currSubj = '' // the current subjects name
var ExpectedIdentifier = ['+', '?']
let currQuestion = new Question()
const d = data.split("\n"); var i = -1
const r = new QuestionDB();
var logs = [];
var currSubj = ""; // the current subjects name
var ExpectedIdentifier = ['+', '?'];
let currQuestion = new Question();
var i = -1;
while (i < d.length) { while (i < d.length) {
let currIdentifier; let currIdentifier
let skipped = 0; let skipped = 0
do { do {
if (skipped >= 1) if (skipped >= 1) { logs.push(i + ': ' + d[i]) }
logs.push(i + ": " + d[i]); i++
i++;
if (i >= d.length) { if (i >= d.length) {
if (currQuestion.IsComplete()) if (currQuestion.IsComplete()) { r.AddQuestion(currSubj, currQuestion) }
r.AddQuestion(currSubj, currQuestion);
return { return {
result: r, result: r,
logs: logs logs: logs
};
} }
currIdentifier = d[i][0]; }
skipped++; currIdentifier = d[i][0]
} while (!ExpectedIdentifier.includes(currIdentifier) && i < d.length); skipped++
} while (!ExpectedIdentifier.includes(currIdentifier) && i < d.length)
let currData = d[i].substring(1).trim(); let currData = d[i].substring(1).trim()
if (currIdentifier == '+') { if (currIdentifier == '+') {
if (currQuestion.IsComplete()) if (currQuestion.IsComplete()) { r.AddQuestion(currSubj, currQuestion) }
r.AddQuestion(currSubj, currQuestion); currQuestion = new Question()
currQuestion = new Question(); currSubj = currData
currSubj = currData; ExpectedIdentifier = ['?']
ExpectedIdentifier = ['?']; continue
continue;
} }
if (currIdentifier == '?') { if (currIdentifier == '?') {
if (currQuestion.IsComplete()) { if (currQuestion.IsComplete()) {
r.AddQuestion(currSubj, currQuestion); r.AddQuestion(currSubj, currQuestion)
currQuestion = new Question(); currQuestion = new Question()
} }
// overwriting is allowed here, bcus: // overwriting is allowed here, bcus:
// ?????!> // ?????!>
currQuestion.Q = currData; currQuestion.Q = currData
ExpectedIdentifier = ['!', '?']; ExpectedIdentifier = ['!', '?']
continue; continue
} }
if (currIdentifier == '!') { if (currIdentifier == '!') {
// if dont have question continue // if dont have question continue
if (!currQuestion.HasQuestion()) if (!currQuestion.HasQuestion()) { throw 'No question! (A)' }
throw "No question! (A)";
// dont allow overwriting // dont allow overwriting
// ?!!!! // ?!!!!
if (!currQuestion.HasAnswer()) { if (!currQuestion.HasAnswer()) {
currData = currData.replace("A helyes válaszok: ", ""); currData = currData.replace('A helyes válaszok: ', '')
currData = currData.replace("A helyes válasz: ", ""); currData = currData.replace('A helyes válasz: ', '')
currQuestion.A = currData; currQuestion.A = currData
} }
ExpectedIdentifier = ['?', '>', '+']; ExpectedIdentifier = ['?', '>', '+']
continue; continue
} }
if (currIdentifier == '>') { if (currIdentifier == '>') {
// if dont have question or answer continue // if dont have question or answer continue
if (!currQuestion.HasQuestion()) if (!currQuestion.HasQuestion()) { throw 'No question! (I)' }
throw "No question! (I)"; if (!currQuestion.HasAnswer()) { throw 'No asnwer! (I)' }
if (!currQuestion.HasAnswer())
throw "No asnwer! (I)";
// dont allow overwriting // dont allow overwriting
// ?!>>> // ?!>>>
if (!currQuestion.HasImage()) { if (!currQuestion.HasImage()) {
try { try {
currQuestion.I = JSON.parse(currData); currQuestion.I = JSON.parse(currData)
} catch (e) { } catch (e) {
currQuestion.I = currData.split(','); currQuestion.I = currData.split(',')
} }
} }
ExpectedIdentifier = ['?', '+']; ExpectedIdentifier = ['?', '+']
continue; continue
} }
} }
return { return {
result: r, result: r,
logs: logs logs: logs
}; }
} }
function RemoveDuplicates(dataObj) { function RemoveDuplicates (dataObj) {
for (var i = 0; i < dataObj.length; i++) for (var i = 0; i < dataObj.length; i++) { RemoveDuplFromSubject(dataObj.Subjects[i]) }
RemoveDuplFromSubject(dataObj.Subjects[i]); return dataObj
return dataObj;
} }
function RemoveDuplFromSubject(subj) { function RemoveDuplFromSubject (subj) {
var cp = subj.Questions; var cp = subj.Questions
subj.Questions = []; subj.Questions = []
for (var i = 0; i < cp.length; i++) { for (var i = 0; i < cp.length; i++) {
var j = 0; var j = 0
// Only removes 100% match! // Only removes 100% match!
while (j < subj.length && cp[i].Compare(subj.Questions[j]) != 100) { while (j < subj.length && cp[i].Compare(subj.Questions[j]) != 100) {
j++; j++
} }
if (j < subj.length) { if (j < subj.length) {
//console.log("----------------------------------------------------------"); // console.log("----------------------------------------------------------");
//console.log(cp[i].toString()); // console.log(cp[i].toString());
//console.log(" VS "); // console.log(" VS ");
//console.log(subj.Questions[j].toString()); // console.log(subj.Questions[j].toString());
//console.log(cp[i].Compare(subj.Questions[j])); // console.log(cp[i].Compare(subj.Questions[j]));
//console.log(j); // console.log(j);
//console.log("removed:"); // console.log("removed:");
//console.log(subj.Questions.splice(j, 1).toString()); // console.log(subj.Questions.splice(j, 1).toString());
//console.log("----------------------------------------------------------"); // console.log("----------------------------------------------------------");
} else { } else {
subj.AddQuestion(cp[i]); subj.AddQuestion(cp[i])
} }
} }
} }
function SimplifyStringForComparison(value) { function SimplifyStringForComparison (value) {
value = RemoveUnnecesarySpaces(value).toLowerCase(); value = RemoveUnnecesarySpaces(value).toLowerCase()
var removableChars = [",", ".", ":", "!"]; var removableChars = [',', '.', ':', '!']
for (var i = 0; i < removableChars.length; i++) { for (var i = 0; i < removableChars.length; i++) {
var regex = new RegExp(removableChars[i], "g"); var regex = new RegExp(removableChars[i], 'g')
value.replace(regex, ""); value.replace(regex, '')
} }
return value; return value
} }
function RemoveUnnecesarySpaces(toremove) { function RemoveUnnecesarySpaces (toremove) {
toremove = NormalizeSpaces(toremove); toremove = NormalizeSpaces(toremove)
while (toremove.includes(" ")) // while the text includes double spaces replaces all of them with a single one while (toremove.includes(' ')) // while the text includes double spaces replaces all of them with a single one
{ {
toremove = toremove.replace(/ /g, " "); toremove = toremove.replace(/ {2}/g, ' ')
} }
return toremove.trim(); return toremove.trim()
} }
function NormalizeSpaces(input) { function NormalizeSpaces (input) {
return input.replace(/\s/g, ' '); return input.replace(/\s/g, ' ')
} }

33
utils/motd.js
View file

@ -1,24 +1,23 @@
const utils = require('./utils.js'); const utils = require('../utils/utils.js')
const dataFile = "public/data.json"; const dataFile = '../public/data.json'
const versionFile = "public/version"; const versionFile = '../public/version'
const motdFile = "public/motd"; const motdFile = '../public/motd'
var p = GetParams(); var p = GetParams()
if (p.length <= 0) { if (p.length <= 0) {
console.log("no params!"); console.log('no params!')
process.exit(0); process.exit(0)
} }
var param = p.join(' ')
console.log('param: ' + param)
var d = utils.ReadFile(dataFile)
var parsed = JSON.parse(d)
parsed.motd = param
utils.WriteFile(JSON.stringify(parsed), dataFile)
var param = p.join(" "); utils.WriteFile(parsed.motd, motdFile)
console.log("param: " + param);
var d = utils.ReadFile(dataFile);
var parsed = JSON.parse(d);
parsed.motd = param;
utils.WriteFile(JSON.stringify(parsed), dataFile);
utils.WriteFile(parsed.motd, motdFile); function GetParams () {
return process.argv.splice(2)
function GetParams() {
return process.argv.splice(2);
} }