From c14b33f9c597f34a7c42fe9a12fa3a237d98f38a Mon Sep 17 00:00:00 2001 From: HardiReady Date: Mon, 4 Jun 2018 20:34:17 +0200 Subject: [PATCH] Fix parsing for vehicle info --- api/tools/log-parse-tool.js | 7 ++++--- package.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api/tools/log-parse-tool.js b/api/tools/log-parse-tool.js index 0431350..17309c3 100644 --- a/api/tools/log-parse-tool.js +++ b/api/tools/log-parse-tool.js @@ -78,7 +78,7 @@ const parseWarLog = (lineArray, war) => { }); } } else { - const targetString = line.substring(line.lastIndexOf(' --- ') + 5, line.lastIndexOf(' von:')); + const targetString = line.substring(line.lastIndexOf(' --- Einheit: ') + 14, line.lastIndexOf(' von:')); const target = getPlayerAndFractionFromString(targetString); stats.kills.push({ war: war._id, @@ -277,11 +277,12 @@ const getPlayerAndFractionFromString = (nameAndFractionString) => { const getVehicleAndFractionFromString = (nameClassFractionString) => { const nameArray = nameClassFractionString.trim().split(WHITESPACE); - - const vehicleFraction = nameArray[nameArray.length - 1]; + const vehicleFraction = nameArray[nameArray.length - 1].slice(0,-1); + nameArray.pop(); nameArray.pop(); const vehicleClassString = nameArray[nameArray.length - 1].replace('(', '').replace(')', ''); nameArray.pop(); + nameArray.pop(); const vehicleName = nameArray.join(WHITESPACE); // skip logging here - this is some basic equipment identifier (i.e. parachute) diff --git a/package.json b/package.json index 68b3332..0dc3b8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opt-cc", - "version": "1.7.4", + "version": "1.7.5", "author": "Florian Hartwich ", "private": true, "scripts": {