Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introducing the new replay container #3194

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Introducing the new replay container #3194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ dependencies {
implementation("io.projectreactor.addons:reactor-extra")
implementation("io.projectreactor:reactor-tools")

def commonsVersion = "1013d75fc9"
def commonsVersion = "82d50dfcbc"

implementation("com.github.FAForever.faf-java-commons:faf-commons-data:${commonsVersion}") {
exclude module: 'guava'
Expand Down
41 changes: 29 additions & 12 deletions src/main/java/com/faforever/client/replay/ReplayService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.faforever.client.game.KnownFeaturedMod;
import com.faforever.client.i18n.I18n;
import com.faforever.client.map.MapService;
import com.faforever.client.map.MapSize;
import com.faforever.client.mapstruct.ReplayMapper;
import com.faforever.client.notification.Action;
import com.faforever.client.notification.NotificationService;
Expand All @@ -32,8 +33,12 @@
import com.faforever.commons.api.elide.ElideNavigator;
import com.faforever.commons.api.elide.ElideNavigatorOnCollection;
import com.faforever.commons.api.elide.ElideNavigatorOnId;
import com.faforever.commons.replay.ReplayContainer;
import com.faforever.commons.replay.ReplayDataParser;
import com.faforever.commons.replay.ReplayLoader;
import com.faforever.commons.replay.ReplayMetadata;
import com.faforever.commons.replay.ReplaySemantics;
import com.faforever.commons.replay.header.GameScenario;
import com.google.common.annotations.VisibleForTesting;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -58,6 +63,7 @@
import java.nio.file.attribute.FileTime;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
Expand Down Expand Up @@ -283,18 +289,29 @@ public CompletableFuture<Path> downloadReplay(int id) {
* Reads the specified replay file in order to add more information to the specified replay instance.
*/
public ReplayDetails loadReplayDetails(Path path) throws CompressorException, IOException {
ReplayDataParser replayDataParser = replayFileReader.parseReplay(path);
List<ChatMessage> chatMessages = replayDataParser.getChatMessages().stream().map(replayMapper::map).toList();
List<GameOption> gameOptions = Stream.concat(
Stream.of(new GameOption("FAF Version", String.valueOf(parseSupComVersion(replayDataParser)))),
replayDataParser.getGameOptions().stream().map(replayMapper::map).sorted(Comparator.comparing(GameOption::key, String.CASE_INSENSITIVE_ORDER))).toList();

String mapFolderName = parseMapFolderName(replayDataParser);
Map map = new Map(null, mapFolderName, 0, null, false, null, null);
MapVersion mapVersion = new MapVersion(null, mapFolderName, 0, null, 0, null, null, false, false, null, null, null,
map, null);

return new ReplayDetails(chatMessages, gameOptions, mapVersion);

// the new replay container construct
ReplayContainer replayContainer = ReplayLoader.loadFAFReplayFromDisk(path);

// get the chat message
List<ChatMessage> chatMessages = ReplaySemantics.getChatMessages(replayContainer.header().sources(),
replayContainer.registeredEvents())
.stream()
.map(replayMapper::map)
.toList();

// get mod options
List<GameOption> modOptions = new ArrayList<>();
replayContainer.header().scenario().modOptions().forEach((k, v) -> modOptions.add(new GameOption(k, v)));

// get scenario related information
GameScenario gameScenario = replayContainer.header().scenario();
Map map = new Map(null, ReplaySemantics.getMapFolder(replayContainer), 0, null, false, null, null);
MapVersion mapVersion = new MapVersion(null, gameScenario.mapScenarioPath(), 0, gameScenario.mapDescription(), 0,
new MapSize(gameScenario.mapSizeX(), gameScenario.mapSizeZ()), null, false,
false, null, null, null, map, null);

return new ReplayDetails(chatMessages, modOptions, mapVersion);
}

public CompletableFuture<Integer> getFileSize(Replay replay) {
Expand Down