diff --git a/.gitmodules b/.gitmodules index 39d1f16..1a8feb6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "utils/question-classes"] path = utils/question-classes url = git@gitlab.com:MrFry/question-classes.git +[submodule "public/moodle-test-userscript"] + path = public/moodle-test-userscript + url = git@gitlab.com:MrFry/moodle-test-userscript.git diff --git a/modules/qmining.js b/modules/qmining.js index bafd10e..f80ce65 100644 --- a/modules/qmining.js +++ b/modules/qmining.js @@ -153,6 +153,12 @@ app.get('/greasy', function (req, res) { logger.LogReq(req) }) +app.get('/scriptgit', function (req, res) { + res.redirect('https://gitlab.com/MrFry/question-classes') + res.end() + logger.LogReq(req) +}) + app.get('/scriptgit', function (req, res) { res.redirect('https://gitlab.com/MrFry/moodle-test-userscript') res.end() diff --git a/public/moodle-test-userscript b/public/moodle-test-userscript new file mode 160000 index 0000000..cd87437 --- /dev/null +++ b/public/moodle-test-userscript @@ -0,0 +1 @@ +Subproject commit cd874374630d9bbff4b9941b293ccec7899727d9 diff --git a/utils/actions.js b/utils/actions.js index c48a290..f82688f 100644 --- a/utils/actions.js +++ b/utils/actions.js @@ -97,6 +97,7 @@ function ProcessIncomingRequest (data) { logger.Log('\t' + d.subj) var msg = 'All / new count: ' + allQuestions.length + ' / ' + questions.length if (d.version !== undefined) { msg += '. Version: ' + d.version } + var color = logger.GetColor('green') try { diff --git a/utils/logger.js b/utils/logger.js index 44d0994..abee18a 100644 --- a/utils/logger.js +++ b/utils/logger.js @@ -74,8 +74,9 @@ function LogReq (req, toFile, sc) { if (sc !== undefined && sc === 404) { logEntry += dl + sc } + logEntry += C() if (!toFile) { - Log(logEntry + C()) + Log(logEntry) } else { let defLogs = GetDateString() + dl + logEntry diff --git a/utils/merge.sh b/utils/merge.sh new file mode 100755 index 0000000..b3289ae --- /dev/null +++ b/utils/merge.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +p="/home/qminer/nodeServ" + +cp -v $p/public/data.json /tmp/data.json +node $p/utils/merger.js /tmp/data.json + +mv -v $p/public/data.json "$p/public/backs/data.json $(date)" +mv -v $p/utils/newData $p/public/data.json + +echo Done diff --git a/views/qmining/main.ejs b/views/qmining/main.ejs index 202dc57..93814c3 100644 --- a/views/qmining/main.ejs +++ b/views/qmining/main.ejs @@ -40,6 +40,7 @@ greasyforkon | Összes kérdés (JSON) | Szerver repó | Userscript repó + Classes repó