Fixed bugs

src/main/java/org/cametendo/FilePathAdd.java

@@ -1,4 +1,5 @@
 package org.cametendo;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -11,29 +12,31 @@ import org.jline.terminal.TerminalBuilder;
 
 /**
  * Handles file path input and validation for disk image files.
- * 
- * <p>This class provides functionality to interactively prompt users for image file paths
- * with tab completion support, validate that files exist and are regular files, and
- * validate file paths from command-line arguments.</p>
- * 
- * @author Cametendo
- * @version 1.0
+ * * <p>This class provides functionality to interactively prompt users for image file paths
+ * with tab completion support via JLine. It handles Unix-style tilde (~) expansion 
+ * to the user's home directory and validates that paths point to existing regular files.</p>
+ * * @author Cametendo
+ * @version 1.1
  */
 public class FilePathAdd {
 
     /**
-     * Stores the validated path to the selected image file.
+     * Stores the validated absolute path to the selected image file.
      */
     public static String ImagePath = "";
+    
+    /**
+     * Constant representing the current user's home directory path.
+     */
+    public static final String Home = System.getProperty("user.home");
 
     /**
      * Interactively prompts the user to select an image file path.
-     * 
-     * <p>Uses JLine for enhanced terminal interaction with tab completion support.
-     * Validates that the selected path points to an existing regular file.</p>
-     * 
-     * @return The validated path to the selected image file
-     * @throws IOException If there are I/O errors during terminal setup or file validation
+     * * <p>Uses JLine for enhanced terminal interaction with {@link FileNameCompleter}.
+     * The method expands the tilde (~) character if present at the start of the string
+     * and validates that the resulting path is a regular file before returning.</p>
+     * * @return The validated absolute path to the selected image file
+     * @throws IOException If there are I/O errors during terminal setup or file resolution
      */
     protected static String filePath() throws IOException {
         fileQuestion();
@@ -42,37 +45,48 @@ public class FilePathAdd {
         LineReader reader = LineReaderBuilder.builder().terminal(terminal).completer(new FileNameCompleter()).build();
 
         while (true) {
-            ImagePath = reader.readLine("Path: ").trim();
+            String input = reader.readLine("Path: ").trim();
 
-            if (ImagePath.isBlank()) {
+            if (input.isBlank()) {
                 System.out.println("Oops... You didn't specify a file!");
                 continue;
             }
 
-            Path path = Path.of(ImagePath);
+            // Expand tilde to the full home directory path
+            if (input.startsWith("~")) {
+                input = Home + input.substring(1);
+            }
+
+            Path path = Path.of(input);
 
             if (!Files.exists(path) || !Files.isRegularFile(path)) {
                 System.out.println("Invalid file! Please ensure the path points to an ISO / image file.");
                 continue;
             }
 
+            // Convert to a real, absolute path and return
+            ImagePath = path.toRealPath().toString();
             System.out.println("Using File: " + ImagePath);
             return ImagePath;
         }
     }
 
     /**
-     * Validates and returns the full path to an image file.
-     * 
-     * <p>Takes a file path, validates that it exists and is a regular file,
-     * and returns the real path. Used for command-line argument validation.</p>
-     * 
-     * @param ImagePath Path to the image file to validate
-     * @return Full validated path to the file, or null if invalid
+     * Validates and returns the full path to an image file from a provided string.
+     * * <p>This is primarily used for validating command-line arguments. It supports
+     * tilde expansion and verifies file existence and type.</p>
+     * * @param inputPath Raw path string to validate
+     * @return Full validated absolute path, or {@code null} if the path is invalid or inaccessible
      */
-    public static String validateAndGetFile(String ImagePath) {
+    public static String validateAndGetFile(String inputPath) {
+        if (inputPath == null) return null;
+        
         try {
-            Path path = Path.of(ImagePath);
+            if (inputPath.startsWith("~")) {
+                inputPath = Home + inputPath.substring(1);
+            }
+
+            Path path = Path.of(inputPath);
             if (Files.exists(path) && Files.isRegularFile(path)) {
                 return path.toRealPath().toString();
             } else {
@@ -86,12 +100,9 @@ public class FilePathAdd {
     }
 
     /**
-     * Displays the prompt for file path input.
-     * 
-     * <p>Informs the user that they should enter the full path to their ISO/image file
-     * and mentions that tab completion is supported for convenience.</p>
+     * Displays the prompt for file path input to the standard output.
      */
     protected static void fileQuestion() {
         System.out.println("Please enter the FULL Path of your ISO / Image. (Tab-completion supported)");
     }
-}
+}