Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-06-26 22:54:47 +02:00
Code Issues Projects Releases Wiki Activity

Fix parsing of old version's ongoing session csv files

Browse Source
This commit is contained in:
Aurora Lahtela 2022-05-24 21:43:22 +03:00
parent f6ece8333b
commit 92ed27a097
2 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/FinishedSession.java
View File

@ -20,6 +20,7 @@ import com.djrapitops.plan.delivery.domain.DateHolder;
import com.djrapitops.plan.gathering.domain.event.JoinAddress;
import com.djrapitops.plan.identification.ServerUUID;
import com.djrapitops.plan.storage.database.sql.tables.JoinAddressTable;
import com.djrapitops.plan.utilities.java.OptionalArray;
import com.google.gson.Gson;
import org.apache.commons.lang3.StringUtils;
@ -123,24 +124,25 @@ public class FinishedSession implements DateHolder {
* @throws com.google.gson.JsonSyntaxException if serialized format has a json syntax error
*/
public static Optional<FinishedSession> deserializeCSV(String serialized) {
String[] asArray = StringUtils.split(serialized, ';');
if (asArray.length < 9) return Optional.empty();
String[] array = StringUtils.split(serialized, ';');
OptionalArray<String> asOptionals = OptionalArray.of(array);
if (array.length < 5) return Optional.empty();
// Note for the future: Use length to determine version of serialized class
Gson gson = new Gson();
UUID playerUUID = UUID.fromString(asArray[0]);
ServerUUID serverUUID = ServerUUID.fromString(asArray[1]);
long start = Long.parseLong(asArray[2]);
long end = Long.parseLong(asArray[3]);
long afkTime = Long.parseLong(asArray[4]);
UUID playerUUID = UUID.fromString(array[0]);
ServerUUID serverUUID = ServerUUID.fromString(array[1]);
long start = Long.parseLong(array[2]);
long end = Long.parseLong(array[3]);
long afkTime = Long.parseLong(array[4]);
DataMap extraData = new DataMap();
extraData.put(WorldTimes.class, gson.fromJson(asArray[5], WorldTimes.class));
extraData.put(PlayerKills.class, gson.fromJson(asArray[6], PlayerKills.class));
extraData.put(MobKillCounter.class, gson.fromJson(asArray[7], MobKillCounter.class));
extraData.put(DeathCounter.class, gson.fromJson(asArray[8], DeathCounter.class));
extraData.put(JoinAddress.class, new JoinAddress(asArray[9]));
asOptionals.get(5).ifPresent(value -> extraData.put(WorldTimes.class, gson.fromJson(value, WorldTimes.class)));
asOptionals.get(6).ifPresent(value -> extraData.put(PlayerKills.class, gson.fromJson(value, PlayerKills.class)));
asOptionals.get(7).ifPresent(value -> extraData.put(MobKillCounter.class, gson.fromJson(value, MobKillCounter.class)));
asOptionals.get(8).ifPresent(value -> extraData.put(DeathCounter.class, gson.fromJson(value, DeathCounter.class)));
asOptionals.get(9).ifPresent(value -> extraData.put(JoinAddress.class, new JoinAddress(value)));
return Optional.of(new FinishedSession(playerUUID, serverUUID, start, end, afkTime, extraData));
}

39
Plan/common/src/main/java/com/djrapitops/plan/utilities/java/OptionalArray.java Normal file
View File

@ -0,0 +1,39 @@
/*
* This file is part of Player Analytics (Plan).
*
* Plan is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License v3 as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Plan is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.utilities.java;
import java.util.Optional;
public class OptionalArray<T> {
private final T[] array;
private OptionalArray(T[] array) {
this.array = array;
}
public static <T> OptionalArray<T> of(T[] array) {
return new OptionalArray<>(array);
}
public Optional<T> get(int index) {
if (index < array.length) {
return Optional.of(array[index]);
}
return Optional.empty();
}
}