Correctly handle windows file separator

EtienneLamoureux · EtienneLamoureux · commit 75253d8da180 · 2024-11-27T15:30:29.000-05:00
diff --git a/src/main/java/tools/sctrade/companion/domain/gamelog/GameLogService.java b/src/main/java/tools/sctrade/companion/domain/gamelog/GameLogService.java
@@ -24,11 +24,11 @@ public void updateStarCitizenLivePath(String starCitizenLivePath) {
     }
 
     starCitizenLivePath = starCitizenLivePath.strip();
-    settings.set(Setting.STAR_CITIZEN_LIVE_PATH, starCitizenLivePath);
+    settings.set(Setting.STAR_CITIZEN_LIVE_PATH, starCitizenLivePath.replace("\\", "\\\\"));
   }
 
   public Optional<String> getStarCitizenLivePath() {
-    return Optional.ofNullable(settings.get(Setting.STAR_CITIZEN_LIVE_PATH));
+    return Optional.ofNullable(settings.get(Setting.STAR_CITIZEN_LIVE_PATH).toString());
   }
 
 }
diff --git a/src/main/java/tools/sctrade/companion/gui/SettingsTab.java b/src/main/java/tools/sctrade/companion/gui/SettingsTab.java
@@ -63,8 +63,7 @@ private void updateUsername() {
 
   private void buildStarCitizenLivePathField(GameLogService gameLogService) {
     var starCitizenLivePathLabel = buildLabel(3, LocalizationUtil.get("labelStarCitizenLivePath"));
-    var starCitizenLivePathField =
-        buildTextField(3, gameLogService.getStarCitizenLivePath().orElse(null));
+    var starCitizenLivePathField = buildTextField(3, gameLogService.getStarCitizenLivePath().get());
     starCitizenLivePathField.putClientProperty("JTextField.placeholderText",
         LocalizationUtil.get("textFieldStarCitizenLivePathPlaceholder"));
     starCitizenLivePathLabel.setLabelFor(starCitizenLivePathField);
diff --git a/src/main/resources/bundles/localization.properties b/src/main/resources/bundles/localization.properties
@@ -11,7 +11,7 @@ textFieldStarCitizenLivePathPlaceholder = ...\\StarCitizen\\LIVE
 labelUsername = Username: 
 labelStarCitizenLivePath = Star Citizen LIVE folder: 
 tooltipUsername = Used for the website's leaderboard
-tooltipStarCitizenLivePath = Used for the fully-automated data acquisition
+tooltipStarCitizenLivePath = <html><body style="text-align: right;">Only used to read the game's log file<br />We NEVER temper with the game's executable process</body></html>
 labelMyData = CSV folder: 
 labelMyImages = Screenshot folder: 
 tabLogs = Logs

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ public void updateStarCitizenLivePath(String starCitizenLivePath) {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`starCitizenLivePath = starCitizenLivePath.strip();`
`27`		`- settings.set(Setting.STAR_CITIZEN_LIVE_PATH, starCitizenLivePath);`
	`27`	`+ settings.set(Setting.STAR_CITIZEN_LIVE_PATH, starCitizenLivePath.replace("\\", "\\\\"));`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public Optional<String> getStarCitizenLivePath() {`
`31`		`- return Optional.ofNullable(settings.get(Setting.STAR_CITIZEN_LIVE_PATH));`
	`31`	`+ return Optional.ofNullable(settings.get(Setting.STAR_CITIZEN_LIVE_PATH).toString());`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`}`