Clean up profile code (#6503)

Author: crosby-moe

src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/ProfilesTab.java

@@ -28,6 +28,7 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
+import org.apache.commons.io.FilenameUtils;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.system.MemoryUtil;
@@ -41,6 +42,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import static meteordevelopment.meteorclient.MeteorClient.mc;
 
@@ -98,12 +100,12 @@ public void initWidgets() {
                     if (imported != null)
                         MeteorClient.LOG.info("Successfully imported profile '{}'.", imported.name.get());
                     reload();
-                } catch (IOException e) {
+                } catch (Exception e) {
                     MeteorClient.LOG.error("Error importing profile", e);
                     OkPrompt.create()
                         .title("Failure importing profile")
                         .message("There was an error importing the profile.")
-                        .message("Error: %d", e.getMessage())
+                        .message("Error: %s", e.getMessage())
                         .dontShowAgainCheckboxVisible(false)
                         .show();
                 }
@@ -146,15 +148,25 @@ private Profile importProfile() throws IOException {
             File profileFile = new File(file);
 
             CompoundTag nbt = NbtIo.read(profileFile.toPath());
+            if (nbt == null) return null;
 
             Profile p = new Profile();
-            if (!p.name.set(nbt.getStringOr("name", profileFile.getName()))) return null;
-            File profileFolder = p.getSafeFile();
-            if (profileFolder == null) return null;
+            Optional<String> parsedName = nbt.getString("name").filter(n -> !n.isEmpty());
+
+            if (parsedName.filter(p.name::set).isEmpty() && !p.name.set(FilenameUtils.removeExtension(profileFile.getName()))) {
+                throw new IllegalStateException("Imported profile does not have a valid name.");
+            }
+
+            File profileFolder = p.getFile().getCanonicalFile();
+            if (!profileFolder.getParentFile().equals(Profiles.FOLDER.getCanonicalFile())) {
+                throw new IllegalStateException("Imported profile does not have a valid location.");
+            }
+
             //noinspection ResultOfMethodCallIgnored
             profileFolder.mkdirs();
-
             nbt.remove("name");
+
+            boolean valid = false;
             for (var entry : nbt.entrySet()) {
                 String filename = entry.getKey();
                 if (!filename.endsWith(".nbt")) continue;
@@ -172,9 +184,14 @@ private Profile importProfile() throws IOException {
                 File f = new File(profileFolder, filename).getCanonicalFile();
                 if (!f.toPath().startsWith(profileFolder.toPath())) continue;
 
+                valid = true;
                 NbtIo.writeUnnamedTagWithFallback(entry.getValue(), new DataOutputStream(new FileOutputStream(f)));
             }
 
+            if (!valid) {
+                throw new IllegalStateException("Imported file is not a profile.");
+            }
+
             Profiles.get().getAll().add(p);
             Profiles.get().save();
 
@@ -215,7 +232,7 @@ public void initWidgets() {
 
             WButton save = add(theme.button(isNew ? "Create" : "Save")).expandX().widget();
             save.action = () -> {
-                if (profile.getSafeFile() == null) return;
+                if (profile.name.get().isEmpty()) return;
 
                 if (isNew) {
                     for (Profile p : Profiles.get()) {

src/main/java/meteordevelopment/meteorclient/systems/profiles/Profile.java

@@ -31,7 +31,7 @@ public class Profile implements ISerializable<Profile> {
     public Setting<String> name = sgGeneral.add(new StringSetting.Builder()
         .name("name")
         .description("The name of the profile.")
-        .filter(Utils::nameFilter)
+        .filter(Utils::fileNameFilter)
         .build()
     );
 
@@ -78,8 +78,7 @@ public Profile(Tag tag) {
     }
 
     public void load() {
-        File folder = getSafeFile();
-        if (folder == null) return;
+        File folder = getFile();
 
         if (hud.get()) Hud.get().load(folder);
         if (macros.get()) Macros.get().load(folder);
@@ -88,8 +87,7 @@ public void load() {
     }
 
     public void save() {
-        File folder = getSafeFile();
-        if (folder == null) return;
+        File folder = getFile();
 
         if (hud.get()) Hud.get().save(folder);
         if (macros.get()) Macros.get().save(folder);
@@ -99,8 +97,7 @@ public void save() {
 
     public void delete() {
         try {
-            File folder = getSafeFile();
-            if (folder != null) FileUtils.deleteDirectory(folder);
+            FileUtils.deleteDirectory(getFile());
         } catch (IOException e) {
             MeteorClient.LOG.error("Error deleting profile {}", name.get(), e);
         }
@@ -110,20 +107,6 @@ public File getFile() {
         return new File(Profiles.FOLDER, name.get());
     }
 
-    public File getSafeFile() {
-        try {
-            File folder = getFile().getCanonicalFile();
-            File profilesFolder = Profiles.FOLDER.getCanonicalFile();
-
-            if (name.get().isEmpty() || !profilesFolder.equals(folder.getParentFile())) return null;
-
-            return folder;
-        } catch (IOException e) {
-            MeteorClient.LOG.error("Error resolving profile {}", name.get(), e);
-            return null;
-        }
-    }
-
     @Override
     public CompoundTag toTag() {
         CompoundTag tag = new CompoundTag();

src/main/java/meteordevelopment/meteorclient/utils/Utils.java

@@ -672,6 +672,10 @@ public static boolean nameFilter(String text, char character) {
         return (character >= 'a' && character <= 'z') || (character >= 'A' && character <= 'Z') || (character >= '0' && character <= '9') || character == '_' || character == '-' || character == '.' || character == ' ';
     }
 
+    public static boolean fileNameFilter(String text, char character) {
+        return (character >= 'a' && character <= 'z') || (character >= 'A' && character <= 'Z') || (character >= '0' && character <= '9') || character == '_' || character == '-' || character == ' ';
+    }
+
     public static boolean ipFilter(String text, char character) {
         if (text.contains(":") && character == ':') return false;
         return (character >= 'a' && character <= 'z') || (character >= 'A' && character <= 'Z') || (character >= '0' && character <= '9') || character == '.' || character == '-' || character == ':';