Skip to content

Commit db616ea

Browse files
authored
dont create vrconfig.yml folder (#1229)
2 parents ab10629 + 8eaa59f commit db616ea

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

dev.slimevr.SlimeVR.metainfo.xml

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6565
</provides>
6666

6767
<releases>
68+
<release version="0.13.1" date="2024-11-05"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1</url></release>
69+
<release version="0.13.1~rc.3" type="development" date="2024-10-31"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.3</url></release>
70+
<release version="0.13.1~rc.2" type="development" date="2024-10-26"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.2</url></release>
71+
<release version="0.13.1~rc.1" type="development" date="2024-10-16"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.1</url></release>
6872
<release version="0.13.0" date="2024-09-20"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0</url></release>
6973
<release version="0.13.0~rc.4" type="development" date="2024-09-13"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0-rc.4</url></release>
7074
<release version="0.13.0~rc.3" type="development" date="2024-08-14"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0-rc.3</url></release>

server/core/src/main/java/dev/slimevr/config/ConfigManager.java

+24-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import java.io.FileNotFoundException;
1717
import java.io.IOException;
1818
import java.nio.file.*;
19+
import java.util.Comparator;
20+
import java.util.stream.Stream;
1921

2022

2123
public class ConfigManager {
@@ -115,8 +117,28 @@ public synchronized void saveConfig() {
115117

116118
// Serialize config
117119
try {
118-
var file = cfgFile.toFile();
119-
if (!file.getAbsoluteFile().getParentFile().exists() && !file.mkdirs()) {
120+
// delete accidental folder caused by PR
121+
// https://github.com/SlimeVR/SlimeVR-Server/pull/1176
122+
var cfgFileMaybeFolder = cfgFile.toFile();
123+
if (cfgFileMaybeFolder.isDirectory()) {
124+
try (Stream<Path> pathStream = Files.walk(cfgFile)) {
125+
var list = pathStream.sorted(Comparator.reverseOrder()).toList();
126+
for (var path : list) {
127+
Files.delete(path);
128+
}
129+
} catch (IOException e) {
130+
LogManager
131+
.severe(
132+
"Unable to delete folder that has same name as the config file on path \""
133+
+ cfgFile
134+
+ "\""
135+
);
136+
return;
137+
}
138+
139+
}
140+
var cfgFolder = cfgFile.toAbsolutePath().getParent().toFile();
141+
if (!cfgFolder.exists() && !cfgFolder.mkdirs()) {
120142
LogManager
121143
.severe("Unable to create folders for config on path \"" + cfgFile + "\"");
122144
return;

0 commit comments

Comments
 (0)