Handling old data

utils/actions.js

@@ -54,6 +54,9 @@ function ProcessIncomingRequest (data) {
   try {
     var d = JSON.parse(data)
     var allQuestions = []
+
+    d = ConvertToNewFormat(d)
+
     for (let i = 0; i < d.allData.length; i++) {
       allQuestions.push(new classes.Question(d.allData[i].Q, d.allData[i].A, d.allData[i].data))
     }
@@ -152,3 +155,40 @@ function ProcessQA () {
 
   return r
 }
+
+function ConvertToNewFormat (d) {
+  if (d.allData.length < 0) {
+    return d
+  }
+
+  try {
+    if (!d.allData[0].data) {
+      logger.Log('\tConverting old data to new...')
+      d.allData = d.allData.map((x) => {
+        if (x.I) {
+          x.data = {
+            type: 'image',
+            images: JSON.parse(x.I)
+          }
+          delete x.I
+        }
+        return x
+      })
+      d.data = d.data.map((x) => {
+        if (x.I) {
+          x.data = {
+            type: 'image',
+            images: JSON.parse(x.I)
+          }
+          delete x.I
+        }
+        return x
+      })
+    }
+  } catch (e) {
+    console.log(e)
+    logger.Log('Couldnt convert old data to new!', logger.GetColor('redbg'))
+  }
+
+  return d
+}

utils/merger.js

@@ -41,8 +41,7 @@ function Main () {
       console.log('JSON data added')
     } catch (e) {
       console.log(e)
-      console.log('Trying with old format...')
-      dbs.push(ReadData(utils.ReadFile(params[i])).result)
+      return
     }
   }
   PrintLN()
@@ -155,98 +154,6 @@ function MergeDatabases (dbs) {
   return db
 }
 
-/*
- * Returns a question database from the given data.
- * Parameter should be raw read file in string with "\n"-s
- * TODO: ??? -s are not listed as errors, tho works correctly
- * */
-function ReadData (data) {
-  const d = data.split('\n')
-  const r = new classes.QuestionDB((x) => true, (x, y) => console.log(x, y))
-  var logs = []
-  var currSubj = '' // the current subjects name
-  var ExpectedIdentifier = ['+', '?']
-  let currQuestion = new classes.Question()
-
-  var i = -1
-  while (i < d.length) {
-    let currIdentifier
-    let skipped = 0
-    do {
-      if (skipped >= 1) { logs.push(i + ': ' + d[i]) }
-      i++
-      if (i >= d.length) {
-        if (currQuestion.IsComplete()) { r.AddQuestion(currSubj, currQuestion) }
-        return {
-          result: r,
-          logs: logs
-        }
-      }
-      currIdentifier = d[i][0]
-      skipped++
-    } while (!ExpectedIdentifier.includes(currIdentifier) && i < d.length)
-
-    let currData = d[i].substring(1).trim()
-
-    if (currIdentifier === '+') {
-      if (currQuestion.IsComplete()) { r.AddQuestion(currSubj, currQuestion) }
-      currQuestion = new classes.Question()
-      currSubj = currData
-      ExpectedIdentifier = ['?']
-      continue
-    }
-
-    if (currIdentifier === '?') {
-      if (currQuestion.IsComplete()) {
-        r.AddQuestion(currSubj, currQuestion)
-        currQuestion = new classes.Question()
-      }
-      // overwriting is allowed here, bcus:
-      // ?????!>
-      currQuestion.Q = currData
-      ExpectedIdentifier = ['!', '?']
-      continue
-    }
-
-    if (currIdentifier === '!') {
-      // if dont have question continue
-      if (!currQuestion.HasQuestion()) { throw new Error('No question! (A)') }
-      // dont allow overwriting
-      // ?!!!!
-      if (!currQuestion.HasAnswer()) {
-        currData = currData.replace('A helyes válaszok: ', '')
-        currData = currData.replace('A helyes válasz: ', '')
-
-        currQuestion.A = currData
-      }
-      ExpectedIdentifier = ['?', '>', '+']
-      continue
-    }
-
-    if (currIdentifier === '>') {
-      // if dont have question or answer continue
-      if (!currQuestion.HasQuestion()) { throw new Error('No question! (I)') }
-      if (!currQuestion.HasAnswer()) { throw new Error('No asnwer! (I)') }
-      // dont allow overwriting
-      // ?!>>>
-      if (!currQuestion.HasImage()) {
-        try {
-          currQuestion.I = JSON.parse(currData)
-        } catch (e) {
-          currQuestion.I = currData.split(',')
-        }
-      }
-      ExpectedIdentifier = ['?', '+']
-      continue
-    }
-  }
-
-  return {
-    result: r,
-    logs: logs
-  }
-}
-
 function RemoveDuplicates (dataObj) {
   for (var i = 0; i < dataObj.length; i++) { RemoveDuplFromSubject(dataObj.Subjects[i]) }
   return dataObj