Cache random faction image

FAForever · Jun 8, 2023 · bd7da67 · bd7da67
1 parent bec19fc
commit bd7da67
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/com/faforever/client/config/CacheConfig.java b/src/main/java/com/faforever/client/config/CacheConfig.java
@@ -29,6 +29,7 @@
 import static com.faforever.client.config.CacheNames.FEATURED_MODS;
 import static com.faforever.client.config.CacheNames.FEATURED_MOD_FILES;
 import static com.faforever.client.config.CacheNames.GLOBAL_LEADERBOARD;
+import static com.faforever.client.config.CacheNames.IMAGES;
 import static com.faforever.client.config.CacheNames.LADDER_1V1_LEADERBOARD;
 import static com.faforever.client.config.CacheNames.LEADERBOARD;
 import static com.faforever.client.config.CacheNames.LEAGUE;
@@ -109,6 +110,7 @@ public CacheManager cacheManager() {
         new CaffeineCache(COUNTRY_FLAGS, newBuilder().weakValues().build()),
         new CaffeineCache(COUNTRY_NAMES, newBuilder().weakValues().build()),
         new CaffeineCache(THEME_IMAGES, newBuilder().weakValues().build()),
+        new CaffeineCache(IMAGES, newBuilder().weakValues().build()),
         new CaffeineCache(MOD_THUMBNAIL, newBuilder().weakValues().build()
         )));
     return simpleCacheManager;

diff --git a/src/main/java/com/faforever/client/config/CacheNames.java b/src/main/java/com/faforever/client/config/CacheNames.java
@@ -28,6 +28,7 @@ public final class CacheNames {
   public static final String MAP_GENERATOR = "mapGenerator";
   public static final String MAP_GENERATOR_STYLES = "mapGeneratorStyles";
   public static final String THEME_IMAGES = "themeImages";
+  public static final String IMAGES = "images";
   public static final String MOD_THUMBNAIL = "modThumbnail";
   public static final String COOP_MAPS = "coopMaps";
   public static final String AVAILABLE_AVATARS = "availableAvatars";

diff --git a/src/main/java/com/faforever/client/game/PlayerCardController.java b/src/main/java/com/faforever/client/game/PlayerCardController.java
@@ -29,7 +29,6 @@
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
@@ -78,7 +77,7 @@ public void initialize() {
 
     ObservableValue<Boolean> showing = uiService.createShowingProperty(getRoot());
 
-    factionImage.setImage(new Image(UiService.RANDOM_FACTION_IMAGE));
+    factionImage.setImage(uiService.getImage(UiService.RANDOM_FACTION_IMAGE));
     factionImage.visibleProperty().bind(faction.map(value -> value == Faction.RANDOM));
     factionIcon.visibleProperty().bind(faction.map(value -> value != Faction.RANDOM && value != Faction.CIVILIAN));
 

diff --git a/src/main/java/com/faforever/client/remote/FafServerAccessor.java b/src/main/java/com/faforever/client/remote/FafServerAccessor.java
@@ -103,7 +103,7 @@ private void onInternalLoginFailed(Throwable throwable) {
   }
 
   public <T extends ServerMessage> Flux<T> getEvents(Class<T> type) {
-    return lobbyClient.getEvents().filter(message -> type.isAssignableFrom(message.getClass())).cast(type);
+    return lobbyClient.getEvents().ofType(type);
   }
 
   /**
@@ -112,8 +112,7 @@ public <T extends ServerMessage> Flux<T> getEvents(Class<T> type) {
   @Deprecated
   public <T extends ServerMessage> void addEventListener(Class<T> type, Consumer<T> listener) {
     lobbyClient.getEvents()
-        .filter(serverMessage -> type.isAssignableFrom(serverMessage.getClass()))
-        .cast(type)
+        .ofType(type)
         .flatMap(message -> Mono.fromRunnable(() -> listener.accept(message)).onErrorResume(throwable -> {
           log.error("Could not process listener for `{}`", message, throwable);
           return Mono.empty();

diff --git a/src/main/java/com/faforever/client/theme/UiService.java b/src/main/java/com/faforever/client/theme/UiService.java
@@ -316,6 +316,14 @@ public Image getThemeImage(String relativeImage) {
     }
   }
 
+  /**
+   * Loads an image with caching.
+   */
+  @Cacheable(value = CacheNames.IMAGES, sync = true)
+  public Image getImage(String relativeImage) {
+    return new Image(relativeImage, true);
+  }
+
 
   public URL getThemeFileUrl(String relativeFile) throws IOException {
     String themeFile = getThemeFile(relativeFile);