fixed subfolders dmd

syd711 · Dec 29, 2024 · d1c10db · d1c10db
1 parent fb991d7
commit d1c10db
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,12 @@
+## Release Notes 3.11.3
+
+## Bugfixes
+
+- **Tables / Uploads**: Fixed uploads of DMD packages for tables that are installed into subfolders.
+
+
+---
+
 ## Release Notes 3.11.2
 
 ## Bugfixes

diff --git a/resources/vpsdb.json b/resources/vpsdb.json
diff --git a/vpin-studio-server/src/main/java/de/mephisto/vpin/server/dmd/DMDService.java b/vpin-studio-server/src/main/java/de/mephisto/vpin/server/dmd/DMDService.java
@@ -107,9 +107,9 @@ else if (folderName.contains(DMDPackageTypes.UltraDMD.name().toLowerCase())) {
     return null;
   }
 
-  public void installDMDPackage(@NonNull File archive, @Nullable String dmdPath, int emulatorId) {
+  public void installDMDPackage(@NonNull File archive, @Nullable String dmdPath, @NonNull File gameFile) {
     if (dmdPath != null) {
-      File tablesFolder = frontendService.getGameEmulator(emulatorId).getTablesFolder();
+      File tablesFolder = gameFile.getParentFile();
       String extension = FilenameUtils.getExtension(archive.getName()).toLowerCase();
       if (extension.equals(PackageUtil.ARCHIVE_ZIP)) {
         DMDInstallationUtil.unzip(archive, tablesFolder, dmdPath);

diff --git a/vpin-studio-server/src/main/java/de/mephisto/vpin/server/games/UniversalUploadService.java b/vpin-studio-server/src/main/java/de/mephisto/vpin/server/games/UniversalUploadService.java
@@ -166,7 +166,7 @@ public void importArchiveBasedAssets(@NonNull UploadDescriptor uploadDescriptor,
       }
       case DMD_PACK: {
         if (!validateAssetType || analysis.validateAssetTypeInArchive(AssetType.DMD_PACK) == null) {
-          dmdService.installDMDPackage(tempFile, analysis.getDMDPath(), uploadDescriptor.getEmulatorId());
+          dmdService.installDMDPackage(tempFile, analysis.getDMDPath(), game.getGameFile());
         }
         break;
       }