From 68c6b2b636ed0004c1e039274ac83a1ea3814854 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Wed, 9 Oct 2019 17:18:07 +0200
Subject: [PATCH 1/2] Added merger.sh, and minor logging improvement

---
 utils/logger.js |  3 ++-
 utils/merge.sh  | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100755 utils/merge.sh

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

From e863893ecccb2a0c76c0fac54291b2ab7e4441a6 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Fri, 11 Oct 2019 12:02:19 +0200
Subject: [PATCH 2/2] Added classes git link

---
 .gitmodules                   | 3 +++
 modules/qmining.js            | 6 ++++++
 public/moodle-test-userscript | 1 +
 utils/actions.js              | 1 +
 views/qmining/main.ejs        | 1 +
 5 files changed, 12 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 public/moodle-test-userscript

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..4aaa75d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[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 dd75f52..29e02be 100644
--- a/utils/actions.js
+++ b/utils/actions.js
@@ -272,6 +272,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/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</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>