merge

.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

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()

public/moodle-test-userscript

@@ -0,0 +1 @@
+Subproject commit cd874374630d9bbff4b9941b293ccec7899727d9

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 {

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
 

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

views/qmining/main.ejs

@@ -40,6 +40,7 @@ greasyforkon</a> |
 		<a href="<%= siteurl %>/data.json">Összes kérdés (JSON)</a> |
 		<a href="<%= siteurl %>/servergit">Szerver repó</a> |
 		<a href="<%= siteurl %>/scriptgit">Userscript repó</a>
+		<a href="<%= siteurl %>/classesgit">Classes repó</a>
 	</h2>
 
 	<hr>