From b77a6bc0adc1be5855543bc2ccc547736f09e31b Mon Sep 17 00:00:00 2001
From: mrfry <mrfry@airmail.cc>
Date: Thu, 8 Oct 2020 16:39:31 +0200
Subject: [PATCH] Saving all/new questions added to idstats

---
 src/utils/actions.js |  2 +-
 src/utils/ids.js     | 42 +++++++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/utils/actions.js b/src/utils/actions.js
index 2171d3c..76deb9d 100755
--- a/src/utils/actions.js
+++ b/src/utils/actions.js
@@ -142,7 +142,7 @@ function ProcessIncomingRequest(recievedData, qdb, infos, dryRun, user) {
           let subjRow = '\t' + data.subj
           if (data.id) {
             subjRow += ' ( CID: ' + logger.logHashed(data.id) + ')'
-            idStats.LogId(user.id, data.subj)
+            idStats.LogId(user.id, data.subj, allQuestions.length, allQLength)
           }
           logger.Log(subjRow)
           if (data.version !== undefined) {
diff --git a/src/utils/ids.js b/src/utils/ids.js
index 9052285..4783574 100755
--- a/src/utils/ids.js
+++ b/src/utils/ids.js
@@ -38,29 +38,29 @@ function Load() {
   try {
     var prevData = utils.ReadFile(idStatFile)
     data = JSON.parse(prevData)
-  } catch (e) {
+  } catch (err) {
     logger.Log(
       'Error at loading id logs! (@ first run its normal)',
       logger.GetColor('redbg')
     )
-    console.log(e)
+    console.error(err)
   }
 
   try {
     var prevVData = utils.ReadFile(idVStatFile)
     vData = JSON.parse(prevVData)
-  } catch (e) {
+  } catch (err) {
     logger.Log(
       'Error at loading id logs! (@ first run its normal)',
       logger.GetColor('redbg')
     )
-    console.log(e)
+    console.error(err)
   }
 }
 
-function LogId(id, subj) {
-  Inc(id, subj)
-  AddVisitStat(id, subj)
+function LogId(id, subj, newQuestions, allQuestions) {
+  Inc(id, subj, newQuestions, allQuestions)
+  AddVisitStat(id, subj, newQuestions, allQuestions)
   Save()
 }
 
@@ -71,35 +71,43 @@ function AddSubjToList(list, subj) {
   list[subj]++
 }
 
-function Inc(value, subj) {
+function Inc(value, subj, newQuestions, allQuestions) {
   if (data[value] === undefined) {
     data[value] = {
       count: 0,
+      newQuestions: 0,
+      allQLength: 0,
       subjs: {},
     }
   }
   data[value].count++
+  data[value].newQuestions += newQuestions
+  data[value].allQuestions += allQuestions
   AddSubjToList(data[value].subjs, subj)
 }
 
-function AddVisitStat(name, subj) {
-  var m = new Date()
+function AddVisitStat(name, subj, newQuestions, allQuestions) {
+  var date = new Date()
   const now =
-    m.getFullYear() +
+    date.getFullYear() +
     '/' +
-    ('0' + (m.getMonth() + 1)).slice(-2) +
+    ('0' + (date.getMonth() + 1)).slice(-2) +
     '/' +
-    ('0' + m.getDate()).slice(-2)
+    ('0' + date.getDate()).slice(-2)
   if (vData[now] === undefined) {
     vData[now] = {}
   }
   if (vData[now][name] === undefined) {
     vData[now][name] = {
       count: 0,
+      newQuestions: 0,
+      allQLength: 0,
       subjs: {},
     }
   }
   vData[now][name].count++
+  vData[now][name].newQuestions += newQuestions
+  vData[now][name].allQuestions += allQuestions
   AddSubjToList(vData[now][name].subjs, subj)
 }
 
@@ -109,16 +117,16 @@ function Save() {
     try {
       utils.WriteFile(JSON.stringify(data), idStatFile)
       // Log("Stats wrote.");
-    } catch (e) {
+    } catch (err) {
       logger.Log('Error at writing logs!', logger.GetColor('redbg'))
-      console.log(e)
+      console.error(err)
     }
     try {
       utils.WriteFile(JSON.stringify(vData), idVStatFile)
       // Log("Stats wrote.");
-    } catch (e) {
+    } catch (err) {
       logger.Log('Error at writing visit logs!', logger.GetColor('redbg'))
-      console.log(e)
+      console.error(err)
     }
     writes = 0
   }