4.6.3

Author: syd711

RELEASE_NOTES.md

@@ -1,9 +1,10 @@
 ## Release Notes 4.6.3
 
-## Changes
+## Changes (including a breaking one!)
 
 - **Server Startup**: Handled possible error in the screen resolving which caused the server not to start for some users. 
 - **File Uploads** Fixed issue that various files have been locked from the Studio client after uploading.
+- **Monitor Detection**: Fixed possible issue where the order of monitors changed. **Unfortunately this is a breaking change and you might need to reconfigure the monitor for the overlay, pause menu and notifications!**
 
 --- 
 

resources/vpsdb.json

@@ -36,10 +36,13 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PreDestroy;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -52,6 +55,9 @@
 public class ManiaService implements InitializingBean, FrontendStatusChangeListener, PreferenceChangedListener, TableStatusChangeListener, GameDataChangedListener, GameLifecycleListener, ApplicationListener<ApplicationReadyEvent> {
   private final static Logger LOG = LoggerFactory.getLogger(ManiaService.class);
 
+  //the file contains the UUID of the cabinet
+  public static final String VPIN_MANIA_ID_TXT = ".vpin-mania-id.txt";
+
   @Value("${vpinmania.server.host}")
   private String maniaHost;
 
@@ -493,6 +499,9 @@ public void preferenceChanged(String propertyName, Object oldValue, Object newVa
     if (propertyName.equals(PreferenceNames.MANIA_SETTINGS)) {
       maniaSettings = preferencesService.getJsonPreference(PreferenceNames.MANIA_SETTINGS, ManiaSettings.class);
       cabinet = maniaClient.getCabinetClient().getCabinet();
+      if (cabinet != null) {
+        updateIdFile(cabinet.getUuid());
+      }
     }
   }
 
@@ -577,6 +586,11 @@ public void afterPropertiesSet() throws Exception {
 
         preferencesService.addChangeListener(this);
         maniaSettings = preferencesService.getJsonPreference(PreferenceNames.MANIA_SETTINGS, ManiaSettings.class);
+
+        if (cabinet != null) {
+          updateIdFile(cabinet.getUuid());
+        }
+
         new Thread(() -> {
           setOnline(cabinet);
         }).start();
@@ -589,6 +603,23 @@ public void afterPropertiesSet() throws Exception {
     LOG.info("{} initialization finished.", this.getClass().getSimpleName());
   }
 
+  private static void updateIdFile(@NonNull String uuid) {
+    try {
+      String localAppData = System.getenv("LOCALAPPDATA");
+      Path appDataPath = Paths.get(localAppData, "VPin-Studio");
+      Files.createDirectories(appDataPath);
+      File idFile = new File(appDataPath.toFile(), VPIN_MANIA_ID_TXT);
+      if (idFile.exists() && !idFile.delete()) {
+        LOG.error("Failed to delete mania id file");
+        return;
+      }
+      Files.writeString(idFile.toPath(), uuid);
+    }
+    catch (Exception e) {
+      LOG.error("Failed to write mania id file: {}", e.getMessage());
+    }
+  }
+
   public Cabinet getCabinet() {
     return this.cabinet;
   }