Finish parse tool

api/models/war.js

@@ -10,19 +10,16 @@ const WarSchema = new Schema({
   },
   date: {
     type: Date,
-    required: true
   },
   ptBlufor: {
     type: Number,
     get: v => Math.round(v),
     set: v => Math.round(v),
-    required: true
   },
   ptOpfor: {
     type: Number,
     get: v => Math.round(v),
     set: v => Math.round(v),
-    required: true
   },
   playersBlufor: {
     type: Number,
@@ -38,8 +35,33 @@ const WarSchema = new Schema({
   },
   campaign: {
     type: mongoose.Schema.Types.ObjectId,
-    ref: 'Campaign'
+    ref: 'Campaign',
-  }
+    required: true
+  },
+  budgetBlufor: {
+    type: Number,
+    get: v => Math.round(v),
+    set: v => Math.round(v),
+    default: 0
+  },
+  budgetOpfor: {
+    type: Number,
+    get: v => Math.round(v),
+    set: v => Math.round(v),
+    default: 0
+  },
+  endBudgetBlufor: {
+    type: Number,
+    get: v => Math.round(v),
+    set: v => Math.round(v),
+    default: 0
+  },
+  endBudgetOpfor: {
+    type: Number,
+    get: v => Math.round(v),
+    set: v => Math.round(v),
+    default: 0
+  },
 }, {
   collection: 'war',
   timestamps: {createdAt: 'timestamp'}

api/routes/wars.js

@@ -64,20 +64,24 @@ wars.route('/')
 
   .post(apiAuthenticationMiddleware, checkMT, upload.single('log'), (req, res, next) => {
     let body = req.body;
-    const war = new WarModel(body);
+    const bodyWar = new WarModel(body);
 
     if (req.file) {
+      // bodyWar.save((err, war) => {
+      //   if (err) {
+      //     return next(err);
+      //   }
         fs.readFile(req.file.buffer, (file, err) => {
           if (err) {
             return next(err);
           }
+
           const lineArray = file.toString().split("\n");
-          parseWarLog(lineArray, {});
+          res.locals.items = parseWarLog(lineArray, bodyWar);
-
+          res.locals.processed = true;
+          next();
         });
-      res.locals.processed = true;
+      // })
-      return next();
-
     } else {
       const err = new Error('no Logfile provided');
       err.status = codes.wrongmediasend;

api/tools/log-parse-tool.js

@@ -1,146 +1,214 @@
-"use strict";
+'use strict';
 
-const arrayContains = require('../middleware/util').arrayContains;
+const arrayContains = require('./util').arrayContains;
 
 const parseWarLog = (lineArray, war) => {
-  const clean = [];
+  const stats = {
-  const budget = [];
+    war: war,
-  const points = [];
+    clean: [],
-  const kills = [];
+    budget: [],
-  const respawn = [];
+    points: [],
-  const revive = [];
+    kills: [],
-  const flag = [];
+    respawn: [],
-  const transport = [];
+    revive: [],
-  const playerNames = [];
+    flag: [],
+    transport: [],
+    players: []
+  };
 
-  const addPlayerIfNotExists = (playerName) => {
+  const addPlayersIfNotExists = (inputPlayers) => {
-    if (playerName !== 'Error: No unit' && !arrayContains(playerNames, playerName)) {
+    inputPlayers.forEach(player => {
-      playerNames.push(playerName);
+      if (player && !arrayContains(stats.players, player)) {
-    }
+        player['warId'] = war._id;
+        stats.players.push(player);
+      }
+    })
   };
 
   lineArray.forEach(line => {
-    if (line.includes("Abschuss")) {
+    /**
-      clean.push(line);
+     * KILLS
-      // const kill = line.split(" ");
+     */
-      // for (let i=0; i< kill.length; i++ ) {
+    if (line.includes('Abschuss') && !line.includes('Fahrzeug')) {
-      //   console.log(i + " +++ " +  kill[i]);
+      stats.clean.push(line);
-      // }
+      const shooterString = line.substring(line.lastIndexOf(' von: ') + 6, line.lastIndexOf('. :OPT LOG END'));
+      const shooter = getPlayerAndFractionFromString(shooterString);
 
+      const targetString = line.substring(line.lastIndexOf(' || ') + 4, line.lastIndexOf(' von:'));
+      const target = getPlayerAndFractionFromString(targetString);
+
+      stats.kills.push({
+        war: war._id,
+        time: getDateTime(line.split(' ')[5]),
+        shooter: shooter ? shooter.name : null,
+        target: target ? target.name : null,
+        friendlyFire: target && shooter ? target.fraction === shooter.fraction : false
+      });
+
+      addPlayersIfNotExists([shooter, target]);
     }
 
-    if (line.includes("Budget")) {
+    /**
-      clean.push(line);
+     * BUDGET
-      const budg = line.split(" ");
+     */
-      if (line.includes("Endbudget")) {
+    if (line.includes('Budget')) {
-        war["endBudgetBlufor"] = transformMoneyString(budg[11]);
+      stats.clean.push(line);
-        war['endBudgetOpfor'] = transformMoneyString(budg[14]);
+      const budg = line.split(' ');
-      } else if (line.includes("Startbudget")) {
+      if (line.includes('Endbudget')) {
-        war["budgetBlufor"] = transformMoneyString(budg[11]);
+        stats.war['endBudgetBlufor'] = transformMoneyString(budg[11]);
-        war["budgetOpfor"] = transformMoneyString(budg[14]);
+        stats.war['endBudgetOpfor'] = transformMoneyString(budg[14]);
+      } else if (line.includes('Startbudget')) {
+        stats.war['budgetBlufor'] = transformMoneyString(budg[11]);
+        stats.war['budgetOpfor'] = transformMoneyString(budg[14]);
       } else {
-        budget.push(getBudgetEntry(budg));
+        stats.budget.push(getBudgetEntry(budg, war._id));
       }
     }
 
-    if (line.includes("Fahne")) {
+    /**
-      clean.push(line);
+     * FLAG
+     */
+    if (line.includes('Fahne')) {
+      stats.clean.push(line);
+      const playerName = line.substring(line.lastIndexOf('t von ') + 6, line.lastIndexOf(' :OPT LOG END'));
+      const flagFraction = line.includes('NATO Flagge') ? 'BLUFOR' : 'OPFOR';
+      const capture = !!line.includes('Flagge erobert');
 
+      stats.flag.push({
+        war: war._id,
+        time: getDateTime(line.split(' ')[5]),
+        player: playerName,
+        flagFraction: flagFraction,
+        capture: capture
+      });
     }
 
-    if (line.includes("Punkte")) {
+    /**
-      clean.push(line);
+     * POINTS
-      const pt = line.split(" ");
+     */
+    if (line.includes('Punkte')) {
+      stats.clean.push(line);
+      const pt = line.split(' ');
 
-      if (line.includes("Endpunktestand")) {
+      if (line.includes('Endpunktestand')) {
-        war['ptBlufor'] = parseInt(pt[11]);
+        stats.war['ptBlufor'] = parseInt(pt[11]);
-        war['ptOpfor'] = parseInt(pt[14].slice(0, -1));
+        stats.war['ptOpfor'] = parseInt(pt[14].slice(0, -1));
       } else {
-        points.push(getPointsEntry(pt))
+        stats.points.push(getPointsEntry(pt, war._id))
       }
     }
 
-    if (line.includes("Respawn")) {
+    /**
-      clean.push(line);
+     * RESPAWN
-      const resp = line.split(" ");
+     */
-      const playerName = line.substring(line.lastIndexOf("Spieler:") + 9, line.lastIndexOf("-") - 1);
+    if (line.includes('Respawn')) {
-
+      stats.clean.push(line);
-      respawn.push(getRespawnEntry(resp, playerName));
+      const resp = line.split(' ');
-      addPlayerIfNotExists(playerName);
+      const playerName = line.substring(line.lastIndexOf('Spieler:') + 9, line.lastIndexOf('-') - 1);
+      stats.respawn.push(getRespawnEntry(resp, playerName, war._id));
     }
 
-    if (line.includes("Revive")) {
+    /**
-      clean.push(line);
+     * REVIVE
-      //console.log(line);
+     */
+    if (line.includes('Revive')) {
+      stats.clean.push(line);
+      const stabilized = !!line.includes('stabilisiert');
+      const medicName = line.substring(line.lastIndexOf('wurde von ') + 10, line.lastIndexOf(stabilized ? ' stabilisiert' : ' wiederbelebt'));
+      const medic = getPlayerAndFractionFromString(medicName);
+      const patientName = line.substring(line.lastIndexOf('|| ') + 3, line.lastIndexOf(' wurde von'));
+      const patient = getPlayerAndFractionFromString(patientName);
+
+      stats.revive.push({
+        war: war._id,
+        time: getDateTime(line.split(' ')[5]),
+        stabilized: stabilized,
+        medic: medic.name,
+        patient: patientName
+      });
+
+      addPlayersIfNotExists([medic, patient]);
     }
 
-    if (line.includes("Transport ||")) {
+    /**
-      clean.push(line);
+     * TRANSPORT
-      const driverName = line.substring(line.lastIndexOf("wurde von ") + 10, line.lastIndexOf(" eingeflogen"));
+     */
-      const driverNameArray = driverName.split(" ");
+    if (line.includes('Transport ||')) {
-      const driverFraction = driverNameArray[driverNameArray.length-1] === "(WEST)" ? "BLUFOR" : "OPFOR";
+      stats.clean.push(line);
-      const sanitizedDriverName =  driverName.substring(0, driverName.indexOf(driverNameArray[driverNameArray.length-1])-1);
+      const driverString = line.substring(line.lastIndexOf('wurde von ') + 10, line.lastIndexOf(' eingeflogen'));
+      const driver = getPlayerAndFractionFromString(driverString);
+      const passengerString = line.substring(line.lastIndexOf('|| ') + 3, line.lastIndexOf(' wurde von'));
+      const passenger = getPlayerAndFractionFromString(passengerString);
+      const distance = parseInt(line.substring(line.lastIndexOf('eingeflogen (') + 13, line.lastIndexOf('m)') - 1));
 
-      const passengerName = line.substring(line.lastIndexOf("|| ") + 3, line.lastIndexOf(" wurde von"));
+      stats.transport.push({
-      const passengerNameArray = passengerName.split(" ");
+        war: war._id,
-      const passengerFraction = passengerNameArray[passengerNameArray.length-1] === "(WEST)" ? "BLUFOR" : "OPFOR";
+        time: getDateTime(line.split(' ')[5]),
-      const sanitizedPassengerName =  passengerName.substring(0, passengerName.indexOf(passengerNameArray[passengerNameArray.length-1])-1);
+        driver: driver.name,
-      const distance = parseInt(line.substring(line.lastIndexOf("eingeflogen (") + 13, line.lastIndexOf("m)") - 1));
+        passenger: passenger.name,
-
-      transport.push({
-        war: "blablub7z8",
-        driver: sanitizedDriverName,
-        passenger: sanitizedPassengerName,
         distance: distance
       });
 
-      addPlayerIfNotExists(sanitizedDriverName);
+      addPlayersIfNotExists([driver, passenger]);
-      addPlayerIfNotExists(sanitizedPassengerName);
     }
   });
-  //
+
-  playerNames.forEach(budg => console.log(budg));
+  stats.war.playersBlufor = stats.players.filter(player => player.fraction === 'BLUFOR').length;
+  stats.war.playersOpfor = stats.players.filter(player => player.fraction === 'OPFOR').length;
+
+  return stats;
+
 };
 
-function getRespawnEntry(respawn, playerName) {
+const getRespawnEntry = (respawn, playerName, warId) => {
   return {
-    war: "1234567",
+    war: warId,
     time: getDateTime(respawn[5]),
     player: playerName
   }
-}
+};
 
-function getPointsEntry(pt) {
+const getPointsEntry = (pt, warId) => {
   return {
-    warId: "123-xyz-123",
+    warId: warId,
     time: getDateTime(pt[5]),
     ptBlufor: parseInt(pt[12]),
     ptOpfor: parseInt(pt[15].slice(0, -1))
   }
-}
+};
 
-function getBudgetEntry(budg) {
+const getBudgetEntry = (budg, warId) => {
   return {
-    warId: "123-xyz-123",
+    warId: warId,
     time: getDateTime(budg[5]),
-    fraction: budg[9] === "NATO" ? "BLUFOR" : "OPFOR",
+    fraction: budg[9] === 'NATO' ? 'BLUFOR' : 'OPFOR',
     oldBudget: transformMoneyString(budg[11]),
     newBudget: transformMoneyString(budg[14])
   }
-}
+};
+
+const getPlayerAndFractionFromString = (nameAndFractionString) => {
+  const nameArray = nameAndFractionString.split(' ');
+  const fraction = nameArray[nameArray.length - 1] === '(WEST)' ? 'BLUFOR' : 'OPFOR';
+  const name = nameAndFractionString.substring(0, nameAndFractionString.indexOf(nameArray[nameArray.length - 1]) - 1);
+  // do not return player for 'Selbstverschulden'
+  if (name || name === 'Error: No unit') {
+    return {name: name, fraction: fraction};
+  }
+};
 
 const transformMoneyString = (budgetString) => {
-  if (!budgetString.includes("e+")) {
+  if (!budgetString.includes('e+')) {
     return parseInt(budgetString);
   }
-  const budget = budgetString.split("e+");
+  const budget = budgetString.split('e+');
   return Math.round(parseFloat(budget[0]) * Math.pow(10, parseInt(budget[1])));
 
 };
 
-function getDateTime(timeString) {
+const getDateTime = (timeString) => {
   const timeZone = 'Z';
-  return new Date("1999-01-01T0" + timeString + timeZone);
+  return new Date('1999-01-01T0' + timeString + timeZone);
-}
+};
 
 module.exports = parseWarLog;

api/tools/util.js

@@ -11,11 +11,11 @@ const sortCollectionBy = (collection, key) => {
   return collection;
 };
 
-const arrayContains = (arr, user) => {
+const playerArrayContains = (arr, item) => {
   let i = 0, count = arr.length, matchFound = false;
 
   for(; i < count; i++) {
-    if (arr[i] === user) {
+    if (arr[i].name === item.name && arr[i].fraction === item.fraction) {
       matchFound = true;
       break;
     }
@@ -25,4 +25,4 @@ const arrayContains = (arr, user) => {
 };
 
 exports.sortCollection = sortCollectionBy;
-exports.arrayContains = arrayContains;
+exports.arrayContains = playerArrayContains;