Merge pull request #389 from Mindgamesnl/feature/qol-chores

Minor fixes (logging during backups, backup compatibility on windows servers, fixes to datafiles on windows servers, errors when empty sources are used)
Mindgamesnl · Jan 31, 2024 · add57d3 · add57d3
2 parents 4934d01 + ed6ecd4
commit add57d3
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 12 deletions.
diff --git a/plugin/src/main/bash/data.bin b/plugin/src/main/bash/data.bin
@@ -1 +1 @@
-BUILD_NUM="1063"
+BUILD_NUM="1067"
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/backups/BackupService.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/backups/BackupService.java
@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
+import java.time.Instant;
 
 public class BackupService extends Service {
 
@@ -26,11 +27,13 @@ public void makeBackup(boolean force) {
             backupRootDirectory.mkdir();
         }
 
-        long unixTime = System.currentTimeMillis() / 1000L;
+        long unixTime = Instant.now().getEpochSecond();
         // create current backup dir
-        File backupDir = new File(backupRootDirectory, "/backup-" + unixTime);
+        File backupDir = new File(backupRootDirectory, File.pathSeparator + "backup-" + unixTime);
         if (!backupDir.exists()) {
             backupDir.mkdir();
+        } else {
+            OpenAudioLogger.toConsole("Backup directory already exists");
         }
 
         try {
@@ -39,31 +42,42 @@ public void makeBackup(boolean force) {
                     new File(backupDir, "config.yml").toPath(),
                     StandardCopyOption.REPLACE_EXISTING
             );
-        } catch (IOException e) {}
+        } catch (IOException e) {
+            OpenAudioLogger.toConsole("Failed to backup config.yml");
+            e.printStackTrace();
+        }
 
         try {
             Files.copy(
                     new File(MagicValue.STORAGE_DIRECTORY.get(File.class), "data.yml").toPath(),
                     new File(backupDir, "data.yml").toPath(),
                     StandardCopyOption.REPLACE_EXISTING
             );
-        } catch (IOException e) {}
+        } catch (IOException e) {
+            OpenAudioLogger.toConsole("Failed to backup data.yml");
+            e.printStackTrace();
+        }
 
         try {
             Files.copy(
                     new File(MagicValue.STORAGE_DIRECTORY.get(File.class), "database.db").toPath(),
                     new File(backupDir, "database.db").toPath(),
                     StandardCopyOption.REPLACE_EXISTING
             );
-        } catch (IOException e) {}
+        } catch (IOException e) {
+            // legacy, allowed to fail
+        }
 
         try {
             Files.copy(
                     new File(MagicValue.STORAGE_DIRECTORY.get(File.class), "storm.db").toPath(),
                     new File(backupDir, "storm.db").toPath(),
                     StandardCopyOption.REPLACE_EXISTING
             );
-        } catch (IOException e) {}
+        } catch (IOException e) {
+            OpenAudioLogger.toConsole("Failed to backup storm.db");
+            e.printStackTrace();
+        }
 
     }
 

diff --git a/.../src/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/PlaySubCommand.java b/.../src/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/PlaySubCommand.java
@@ -4,13 +4,16 @@
 
 import com.craftmend.openaudiomc.api.interfaces.Client;
 import com.craftmend.openaudiomc.generic.client.objects.ClientConnection;
+import com.craftmend.openaudiomc.generic.commands.objects.CommandError;
 import com.craftmend.openaudiomc.generic.media.objects.OptionalError;
+import com.craftmend.openaudiomc.generic.media.utils.Validation;
 import com.craftmend.openaudiomc.generic.platform.OaColor;
 import com.craftmend.openaudiomc.generic.user.User;
 import com.craftmend.openaudiomc.generic.commands.interfaces.SubCommand;
 import com.craftmend.openaudiomc.generic.commands.objects.Argument;
 import com.craftmend.openaudiomc.generic.media.objects.Media;
 import com.craftmend.openaudiomc.generic.media.objects.MediaOptions;
+import lombok.SneakyThrows;
 
 import java.util.Optional;
 
@@ -27,13 +30,18 @@ public PlaySubCommand() {
     }
 
     @Override
+    @SneakyThrows
     public void onExecute(User sender, String[] args) {
         if (args.length == 0) {
             sender.makeExecuteCommand("oa help " + getCommand());
             return;
         }
 
         if (args.length == 2) {
+            if (Validation.isStringInvalid(args[1])) {
+                throw new CommandError("Invalid source url.");
+            }
+
             Media media = new Media(args[1]);
             int affected = 0;
 
@@ -59,6 +67,10 @@ public void onExecute(User sender, String[] args) {
                     return;
                 }
 
+                if (Validation.isStringInvalid(args[1])) {
+                    throw new CommandError("Invalid source url.");
+                }
+
                 Media media = new Media(args[1]).applySettings(mediaOptions);
 
                 for (User<?> user : resolveSelector(sender, args[0])) {

diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/media/utils/Validation.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/media/utils/Validation.java
@@ -0,0 +1,12 @@
+package com.craftmend.openaudiomc.generic.media.utils;
+
+public class Validation {
+
+    public static boolean isStringInvalid(String s) {
+        if (s == null) return true;
+        if (s.isEmpty()) return true;
+        if (s.equalsIgnoreCase("set")) return true;
+        return s.trim().isEmpty();
+    }
+
+}
diff --git a/...raftmend/openaudiomc/spigot/modules/commands/middleware/CommandTranslationMiddleware.java b/...raftmend/openaudiomc/spigot/modules/commands/middleware/CommandTranslationMiddleware.java
@@ -55,6 +55,12 @@ public void onCommand(ServerCommandEvent event) {
         spigotPlayerSelector.setSender(new SpigotUserAdapter(event.getSender()));
         spigotPlayerSelector.setString(selector);
 
+        if (spigotPlayerSelector.getResults().isEmpty()) {
+            event.getSender().sendMessage(MagicValue.COMMAND_PREFIX.get(String.class) + "No players found for selector " + selector);
+            event.setCancelled(true);
+            return;
+        }
+
         // process the selector, build a new command and re-run
         for (User<?> target : spigotPlayerSelector.getResults()) {
             String playerCommand = commandPreset.replaceAll("%%player%%", target.getName());

diff --git a/...ftmend/openaudiomc/spigot/modules/commands/subcommands/region/RegionCreateSubCommand.java b/...ftmend/openaudiomc/spigot/modules/commands/subcommands/region/RegionCreateSubCommand.java
@@ -2,11 +2,14 @@
 
 import com.craftmend.openaudiomc.OpenAudioMc;
 import com.craftmend.openaudiomc.generic.commands.interfaces.SubCommand;
+import com.craftmend.openaudiomc.generic.commands.objects.CommandError;
 import com.craftmend.openaudiomc.generic.database.DatabaseService;
+import com.craftmend.openaudiomc.generic.media.utils.Validation;
 import com.craftmend.openaudiomc.generic.user.User;
 import com.craftmend.openaudiomc.spigot.OpenAudioMcSpigot;
 import com.craftmend.openaudiomc.spigot.modules.regions.objects.RegionProperties;
 import com.craftmend.openaudiomc.spigot.modules.regions.registry.WorldRegionManager;
+import lombok.SneakyThrows;
 import org.bukkit.ChatColor;
 
 public class RegionCreateSubCommand extends SubCommand {
@@ -19,6 +22,7 @@ public RegionCreateSubCommand(OpenAudioMcSpigot openAudioMcSpigot) {
     }
 
     @Override
+    @SneakyThrows
     public void onExecute(User sender, String[] args) {
         args[1] = args[1].toLowerCase();
 
@@ -43,6 +47,10 @@ public void onExecute(User sender, String[] args) {
             return;
         }
 
+        if (Validation.isStringInvalid(args[2])) {
+            throw new CommandError("Invalid source url.");
+        }
+
         RegionProperties rp = new RegionProperties(args[2], volume, 1000, true, args[1], sender.getWorld());
         OpenAudioMc.getService(DatabaseService.class).getRepository(RegionProperties.class)
                 .save(rp);

diff --git a/...ftmend/openaudiomc/spigot/modules/commands/subcommands/speaker/SpeakerGiveSubCommand.java b/...ftmend/openaudiomc/spigot/modules/commands/subcommands/speaker/SpeakerGiveSubCommand.java
@@ -2,10 +2,13 @@
 
 import com.craftmend.openaudiomc.OpenAudioMc;
 import com.craftmend.openaudiomc.generic.commands.interfaces.SubCommand;
+import com.craftmend.openaudiomc.generic.commands.objects.CommandError;
 import com.craftmend.openaudiomc.generic.media.MediaService;
+import com.craftmend.openaudiomc.generic.media.utils.Validation;
 import com.craftmend.openaudiomc.generic.user.User;
 import com.craftmend.openaudiomc.spigot.modules.commands.subcommands.SpeakersSubCommand;
 import com.craftmend.openaudiomc.spigot.modules.speakers.utils.SpeakerUtils;
+import lombok.SneakyThrows;
 import org.bukkit.entity.Player;
 
 public class SpeakerGiveSubCommand extends SubCommand {
@@ -18,6 +21,7 @@ public SpeakerGiveSubCommand(SpeakersSubCommand parent) {
     }
 
     @Override
+    @SneakyThrows
     public void onExecute(User sender, String[] args) {
         if (!(sender.getOriginal() instanceof Player)) {
             message(sender, "Only players can receive a speaker item.");
@@ -29,6 +33,10 @@ public void onExecute(User sender, String[] args) {
             radius = Integer.valueOf(args[1]);
         }
 
+        if (Validation.isStringInvalid(args[0])) {
+            throw new CommandError("Invalid source url.");
+        }
+
         Player player = (Player) sender.getOriginal();
         player.getInventory().addItem(SpeakerUtils.getSkull(OpenAudioMc.getService(MediaService.class).process(args[0]), radius));
         message(sender, "Speaker media created! You've received a Speaker skull in your inventory. Placing it anywhere in the world will add the configured sound in the are.");

diff --git a/...main/java/com/craftmend/openaudiomc/spigot/modules/configuration/SpigotConfiguration.java b/...main/java/com/craftmend/openaudiomc/spigot/modules/configuration/SpigotConfiguration.java
@@ -284,7 +284,7 @@ public void saveAll(boolean includeConfig) {
             if (includeConfig) {
                 mainConfig.save(new File(OpenAudioMcSpigot.getInstance().getDataFolder(), "config.yml"));
             }
-            dataConfig.save("plugins/OpenAudioMc/data.yml");
+            dataConfig.save("plugins"+ File.pathSeparator + "OpenAudioMc" + File.pathSeparator + "data.yml");
         } catch (IOException e) {
             OpenAudioLogger.handleException(e);
             e.printStackTrace();
@@ -298,7 +298,7 @@ public void overwriteConfigFile() {
 
     @Override
     public boolean hasDataFile() {
-        File dataFile = new File("plugins/OpenAudioMc/data.yml");
+        File dataFile = new File("plugins" + File.pathSeparator + "OpenAudioMc" + File.pathSeparator + "data.yml");
         return dataFile.exists();
     }
 

diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin
@@ -1 +1 @@
-BUILD_NUM="1063"
+BUILD_NUM="1067"
diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties
@@ -1,3 +1,3 @@
-BUILD_VERSION="1063"
-BUILD_COMMIT="e67dacf726aa8734e913de2babe6e8c711e77023"
+BUILD_VERSION="1067"
+BUILD_COMMIT="230b9271da8d2e6945e2c7604cffb036a6be048c"
 BUILD_AUTHOR="Mats"