Added UI

Fixed some errors
Optimized conditionals
Added more functionality to FileMover to give a more "verbose" experience for developers
Added some JavaDoc

.idea/vcs.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
-
+</project>

destination/SymmieTest.txt

@@ -1 +0,0 @@
-Hello Symmie!

destination/adsfasdfasdf/TestFile.txt

@@ -1,38 +0,0 @@
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf

source/SymmieTest.txt

@@ -1 +0,0 @@
-Hello Symmie!

source/adsfasdfasdf/TestFile.txt

@@ -1,38 +0,0 @@
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf
-asdfasdfasdfadf

src/net/tofvesson/symlinker/Controller.java

@@ -1,4 +0,0 @@
-package net.tofvesson.symlinker;
-
-public class Controller {
-}

src/net/tofvesson/symlinker/FileMover.java

@@ -13,52 +13,118 @@ public class FileMover {
     protected volatile BigInteger currentTransferSize = BigInteger.ZERO;
     protected final Thread moveOp;
     protected final FileMoveErrorHandler handler;
+    protected final OnMoveCompletedListener perFile;
     protected final BigInteger totalSize;
     protected final int bufferSize;
+    protected final boolean verbose;
 
-    public FileMover(File source, File destination, int bufferSize, FileMoveErrorHandler errorHandler){
+    /**
+     * Initiates a file transfer operation from the specified source (be it a single file or an entire folder) to the given destination.
+     * @param source Source location to move file(s)/folder(s) from.
+     * @param destination Location to move file(s)/folder(s) to.
+     * @param bufferSize File transfer data buffer (in bytes).
+     * @param verbose Whether or not to print errors in standard error stream.
+     * @param errorHandler A callback interface whenever an error with moving is encountered.
+     * @param listener A callback for when the move operation is completed.
+     * @param perFile A callback called whenever a file transfer is completed.
+     */
+    public FileMover(File source, File destination, int bufferSize, boolean verbose, FileMoveErrorHandler errorHandler, OnMoveCompletedListener listener, OnMoveCompletedListener perFile){
         handler = errorHandler;
+        this.verbose = verbose;
+        this.perFile = perFile;
         this.bufferSize = bufferSize < MINIMUM_BUFFER_SIZE ? bufferSize : DEFAULT_BUFFER_SIZE;
         totalSize = enumerate(source, BigInteger.ZERO);
         moveOp = new Thread(()->{
-            if(!destination.isDirectory()) if(!destination.mkdirs()){
-                if(handler!=null) handler.onMoveError(source, destination);
-                System.err.println("Couldn't create necessary directories!");
-                return;
-            }
-            if(totalSize.subtract(BigInteger.valueOf(destination.getUsableSpace())).toString().charAt(0)!='-'){
-                if(handler!=null) handler.onMoveError(source, destination);
-                System.err.println("Not enough space in destination to accommodate move operation!");
+            boolean error;
+            // Proactive error handling
+            if((error=!destination.isDirectory() && !destination.mkdirs()) ||
+                    totalSize.subtract(BigInteger.valueOf(destination.getUsableSpace())).toString().charAt(0)!='-') // Reasons for error
+            {
+                if(handler!=null) handler.onMoveError(source, destination); // Notify error
+                if(verbose) System.err.println(error?"Couldn't create necessary directories!":"Not enough space in destination to accommodate move operation!"); // Print reason for error
+                if(listener!=null) listener.onMoveComplete(source, destination, MoveState.FAILED, this);
                 return;
             }
+
+            // Move files
             moveAll(source, destination, true);
-            if(!destroyDirs(source)) System.err.println("Could not delete source directories!");
-            System.out.println("Done!");
+
+            // Clean up residual folders :)
+            boolean b = !cancel && destroyDirs(source); // Will short-circuit to false if cancel was requested (won't destroy dirs)
+            if(b) currentTransferSize = new BigInteger(totalSize.toString()); // If success, just make sure the numbers match :)
+            if(listener!=null) listener.onMoveComplete(source, destination, b ? MoveState.COMPLETED : MoveState.PARTIAL, this); // Report move completion status
         });
         moveOp.setPriority(Thread.MAX_PRIORITY);
         moveOp.start();
     }
 
+    /**
+     * Initiates a file transfer operation from the specified source (be it a single file or an entire folder) to the given destination.
+     * @param source Source location to move file(s)/folder(s) from.
+     * @param destination Location to move file(s)/folder(s) to.
+     */
+    public FileMover(File source, File destination){ this(source, destination, DEFAULT_BUFFER_SIZE, true, null, null, null); }
+
+    /**
+     * Get the size (in bytes) of the data to be transferred. (Here to allow for tracking of progress)
+     * @param f Top file to enumerate from.
+     * @param b Value of already enumerated data.
+     * @return Enumerated value from file(s)/folder(s)/subfolder(s) plus the original size passed as a parameter.
+     */
     private static BigInteger enumerate(File f, BigInteger b){
         if(f.isFile()) return b.add(BigInteger.valueOf(f.length()));
         if(f.isDirectory()) for(File f1 : f.listFiles()) b = enumerate(f1, b);
         return b;
     }
 
+    /**
+     * Determines if the move operation is still ongoing.
+     * @return True if operation is still alive (still moving data), otherwise false.
+     */
     public boolean isAlive(){ return moveOp.isAlive(); }
+
+    /**
+     * Total size (in bytes) of data to move.
+     * @return Data size in bytes.
+     */
     public BigInteger getTotalSize(){ return totalSize; }
+
+    /**
+     * Current data transfer progress.
+     * @return Amount of transferred bytes.
+     */
     public BigInteger getCurrentTransferSize(){ return currentTransferSize; }
-    public void cancel(){ cancel = true; }
+
+    /**
+     * Cancel the transfer operation.
+     */
+    public void cancel(){ cancel = moveOp.isAlive(); } // Only set the value of the process is still alive
+
+    /**
+     * Check if operation is still alive but cancelling.
+     * @return True if cancelling. False if not cancelling or if successfully cancelled.
+     */
     public boolean isCanceling(){ return cancel && moveOp.isAlive(); }
+
+    /**
+     * Check if the operation has been successfully cancelled.
+     * @return True if process has been stopped due to cancellation. False if process is still alive or a cancellation hasn't been requested.
+     */
     public boolean isCanceled(){ return cancel && !moveOp.isAlive(); }
 
+    /**
+     * Move any and all files from the source if it's a directory. Just move the file if source is a file.
+     * @param source File/folder to move.
+     * @param destDir Directory to move source into.
+     * @param first Whether or not this is the first move operation of the move process.
+     */
     protected void moveAll(File source, File destDir, boolean first)
     {
         if(cancel) return; // Cancel requested: don't initiate more move operations
         File f = first ? destDir : new File(destDir.getAbsolutePath()+File.separatorChar+source.getName());
         if(source.isFile()) moveFile(source, f);
         else if(source.isDirectory()){ // If-statement is here is safeguard in case something goes wrong and we try to move a non-existent file/folder
-            if(!f.mkdir() && handler!=null) handler.onMoveError(source, destDir);
+            if(!f.isDirectory() && !f.mkdir() && handler!=null) handler.onMoveError(source, destDir);
             for(File f1 : source.listFiles()){
                 if(cancel) break;
                 moveAll(f1, f, false);
@@ -66,25 +132,35 @@ public class FileMover {
         }
     }
 
+    /**
+     * Destroy residual directories.
+     * @param top Top directory/file to start from.
+     * @return True if deletion succeeded, otherwise false.
+     */
     protected boolean destroyDirs(File top){
         boolean canDestroyMe = true;
         if(top.isDirectory()) for(File f : top.listFiles()) canDestroyMe = destroyDirs(f) && canDestroyMe; // Must attempt to destroy directory!
-        return top.delete() && canDestroyMe;
+        return canDestroyMe && top.delete(); // Short-circuit conditional if we can't delete folder to save time. This will not short-circuit for files, only folders
     }
 
+    /**
+     * Move a file from a given source file to a given destination file.
+     * @param sourceFile File to move data from.
+     * @param destFile File to move data to.
+     */
     protected void moveFile(File sourceFile, File destFile)
     {
         InputStream read = null;
         OutputStream write = null;
+        boolean error = false;
         try{
-            // ---- Error Handling ----
-            if(destFile.isFile() && !destFile.delete()){
-                if(handler!=null) handler.onMoveError(sourceFile, destFile);
-                throw new Exception("Can't delete existing file: "+destFile.getAbsolutePath());
-            }
-            if(!destFile.createNewFile()){ // Make sure we actually have a file to write to
-                if(handler!=null) handler.onMoveError(sourceFile, destFile);
-                throw new Exception("Can't create file: "+destFile.getAbsolutePath());
+            { // boolean isn't needed if we get past this check, so we remove it from the local variable array after the check
+                boolean b;
+                // ---- Error Handling ----
+                if ((b=destFile.isFile() && !destFile.delete()) || !destFile.createNewFile()) { // Make sure we actually have a file to write to
+                    if (handler != null) handler.onMoveError(sourceFile, destFile);
+                    throw new Exception(b?"Can't delete existing file: " + destFile.getAbsolutePath():"Can't create file: " + destFile.getAbsolutePath());
+                }
             }
 
             // ---- Prepare move operation ----
@@ -100,14 +176,46 @@ public class FileMover {
                 currentTransferSize = currentTransferSize.add(BigInteger.valueOf(readLen));
                 if(cancel) throw new Exception("Move operation from \""+sourceFile.getAbsolutePath()+"\" to \""+destFile.getAbsolutePath()+"\" was canceled!"); // Handle cancel
             }
-        }catch(Throwable t){ t.printStackTrace(); if(!cancel && handler!=null) handler.onMoveError(sourceFile, destFile); } // Don't consider cancellation an error
+        }catch(Throwable t){ error = true; t.printStackTrace(); if(!cancel && handler!=null) handler.onMoveError(sourceFile, destFile); } // Don't consider cancellation an error
         finally {
             if(read!=null) try { read.close(); } catch (IOException e) { e.printStackTrace(); } // Ultimate errors are happening if this is thrown
             if(write!=null) try { write.close(); } catch (IOException e) { e.printStackTrace(); } // Ultimate errors are happening if this is thrown
-            if(!cancel && !sourceFile.delete()) System.err.println("Can't delete source file: "+sourceFile.getAbsolutePath()); // Handle regular move event
-            if(cancel && !destFile.delete()) System.err.println("Can't delete destination file: "+destFile.getAbsolutePath()); // Handle cancel event
+            if(!cancel && !sourceFile.delete() && verbose) System.err.println("Can't delete source file: "+sourceFile.getAbsolutePath()); // Handle regular move event
+            if(cancel && !destFile.delete() && verbose) System.err.println("Can't delete destination file: "+destFile.getAbsolutePath()); // Handle cancel event
+            if(perFile != null)
+                perFile.onMoveComplete(
+                    sourceFile,
+                    destFile, read == null || write == null || (error && !cancel) ? MoveState.FAILED : cancel ? MoveState.PARTIAL : MoveState.COMPLETED,
+                    this
+                );
         }
     }
 
+    /**
+     * Callback interface whenever an error with moving is encountered.
+     */
     public interface FileMoveErrorHandler { void onMoveError(File sourceFile, File destinationFile); }
+
+    /**
+     * Callback for when a move operation is completed.
+     */
+    public interface OnMoveCompletedListener { void onMoveComplete(File source, File destination, MoveState success, FileMover instance); }
+
+    /**
+     * Move state discriminator. Used to determine the nature of a finished move operation.
+     */
+    public enum MoveState{
+        /**
+         * Move was a complete success. No files remain in the original location.
+         */
+        COMPLETED,
+        /**
+         * Partial success. Certain files may not have been moved or may still reside in the original location.
+         */
+        PARTIAL,
+        /**
+         * Critical failure. No files were moved.
+         */
+        FAILED
+    }
 }

src/net/tofvesson/symlinker/Main.java

@@ -1,9 +1,15 @@
 package net.tofvesson.symlinker;
 
 import javafx.application.Application;
+import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
+import javafx.scene.control.ProgressBar;
+import javafx.scene.control.TextField;
+import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
 
 import java.io.File;
@@ -14,45 +20,102 @@ import java.util.prefs.Preferences;
 
 public class Main extends Application {
 
+    protected FileMover currentOperation;
+    protected File fSource, fDestination;
+
     @Override
     public void start(Stage primaryStage) throws Exception{
-        Parent root = FXMLLoader.load(getClass().getResource("sample.fxml"));
-        primaryStage.setTitle("Hello World");
-        primaryStage.setScene(new Scene(root, 300, 275));
+        // Load layout file
+        Parent root = FXMLLoader.load(getClass().getResource("symmie.fxml"));
+
+        TextField source = (TextField) root.lookup("#source"), destination = (TextField) root.lookup("#destination");
+        Button b = (Button) root.lookup("#startstop");
+        ProgressBar p = (ProgressBar) root.lookup("#progress");
+        source.setOnMouseClicked(mouseEvent -> {
+            DirectoryChooser chooser = new DirectoryChooser();
+            fSource = chooser.showDialog(null);
+            source.setText(fSource==null?"":fSource.getAbsolutePath());
+        });
+        destination.setOnMouseClicked(mouseEvent -> {
+            DirectoryChooser chooser = new DirectoryChooser();
+            fDestination = chooser.showDialog(null);
+            destination.setText(fDestination==null?"":fDestination.getAbsolutePath());
+        });
+        b.setOnMouseClicked(mouseEvent -> {
+            if(currentOperation!=null && currentOperation.isAlive()){
+                currentOperation.cancel();
+                b.setText("Start");
+            }
+            else{
+                b.setText("Cancel");
+                p.setVisible(true);
+                currentOperation = new FileMover(
+                        fSource = new File(source.getText()),
+                        fDestination = new File(destination.getText()),
+                        FileMover.DEFAULT_BUFFER_SIZE,
+                        true,
+                        (s, d) -> System.out.println("Couldn't move \""+s.getAbsolutePath()+"\" to \""+d.getAbsolutePath()+"\"!"),
+                        (s, d, success, m) -> Platform.runLater(() -> {
+                            if(success== FileMover.MoveState.COMPLETED)
+                                try {
+                                    Runtime.getRuntime().exec("cmd /c \"mklink /J \""+fSource.getAbsolutePath()+"\" \""+fDestination.getAbsolutePath()+"\"\"");
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                }
+                            else if(success== FileMover.MoveState.PARTIAL){
+                                Alert alert = new Alert(Alert.AlertType.WARNING);
+                                alert.setTitle("Move problems");
+                                alert.setHeaderText("Some files couldn't be moved.");
+                                alert.setContentText("Some or all files/folders could not be moved from the original location. " +
+                                        "This is usually due to a lack of permissions or data corruption to the partition! " +
+                                        "All files that could be moved were moved. Symbolic link was not created.");
+                                alert.showAndWait();
+                            }else{
+                                Alert alert = new Alert(Alert.AlertType.ERROR);
+                                alert.setTitle("Move error");
+                                alert.setHeaderText("No files were moved");
+                                alert.setContentText("After assessing the state of the source partition and destination partition, " +
+                                        "it was determined there might not be enough space to accommodate the new files, " +
+                                        "therefore no files were moved. " +
+                                        "Please ensure you have enough disk space.");
+
+                                alert.showAndWait();
+                            }
+                            p.setVisible(false);
+                            b.setText("Start");
+                        }),
+                        (s, d, success, m) -> {
+                            System.out.println(wordify(success.name()) + " " + (success == FileMover.MoveState.FAILED ? "to move" : "move from")
+                                    + " \"" + s.getAbsolutePath() + "\" to \"" + d.getAbsolutePath() + "\"");
+                            Platform.runLater(() -> p.setProgress(m.getTotalSize().doubleValue()==0?1:m.getCurrentTransferSize().divide(m.getTotalSize()).doubleValue()));
+                        }
+                );
+            }
+        });
+
+        // Set up display stuff and show
+        primaryStage.setTitle("Symmie: Symlinker tool");
+        primaryStage.setScene(new Scene(root, root.prefWidth(-1.0D), root.prefHeight(-1.0D)));
         primaryStage.show();
+
+        // TODO: Add error message if not run as admin
     }
 
 
     public static void main(String[] args) throws Throwable {
-
-        if(!isAdmin()){
-            System.out.println("Not admin");
+        if(!isAdmin()){ // TODO: Move
+            System.err.println("Not admin");
             System.exit(-1);
         }
 
-        File source = new File(System.getProperty("user.dir")+File.separatorChar+"source"+File.separatorChar),
-                destination = new File(System.getProperty("user.dir")+File.separatorChar+"destination"+File.separatorChar);
-
-        moveAndLink(source, destination);
-
+        // Start JavaFX application
         launch(args);
     }
 
-    protected static void moveAndLink(File source, File destination) throws IOException, InterruptedException {
-        boolean dir = source.isDirectory();
-
-        FileMover mover = new FileMover(source, destination, FileMover.DEFAULT_BUFFER_SIZE, null);
-
-        while(mover.isAlive()){
-            System.out.println("Move progress: "+(mover.getCurrentTransferSize().doubleValue()/mover.getTotalSize().doubleValue())*100+"%");
-            try { Thread.sleep(1); }catch(InterruptedException ignored){}
-        }
-        System.out.println("Move progress: 100%");
-        //try { Thread.sleep(25); }catch(InterruptedException ignored){} // Shouldn't be necessary
-
-        Runtime.getRuntime().exec("cmd /c \"mklink "+(dir ? "/J " : "")+"\""+source.getAbsolutePath()+"\" \""+destination.getAbsolutePath()+"\"\"");
-    }
+    // Just for console output. Technically obsolete at this point
+    static String wordify(String s){ return s.length()==0?s:s.length()==1?s.toUpperCase():s.toUpperCase().substring(0, 1)+s.toLowerCase().substring(1, s.length()); }
 
+    // Important
     public static boolean isAdmin(){
         PrintStream o = System.err;
         // Silent error stream because not explicitly printing errors isn't enough to stop errors from being printed

src/net/tofvesson/symlinker/sample.fxml

@@ -1,8 +0,0 @@
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.layout.GridPane?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<GridPane fx:controller="net.tofvesson.symlinker.Controller"
-          xmlns:fx="http://javafx.com/fxml" alignment="center" hgap="10" vgap="10">
-</GridPane>

src/net/tofvesson/symlinker/symmie.fxml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressBar?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.text.Font?>
+
+<Pane maxHeight="-Infinity"
+        maxWidth="-Infinity"
+        minHeight="-Infinity"
+        minWidth="-Infinity"
+        prefHeight="170.0"
+        prefWidth="392.0"
+        xmlns="http://javafx.com/javafx/8.0.112"
+        xmlns:fx="http://javafx.com/fxml/1">
+    <TextField fx:id="source" layoutX="16.0" layoutY="59.0" prefWidth="360.0" promptText="Folder to move file(s) from" />
+    <TextField fx:id="destination" layoutX="16.0" layoutY="90.0" prefHeight="25.0" prefWidth="360.0" promptText="Folder to move file(s) to" />
+   <Button fx:id="startstop" layoutX="16.0" layoutY="125.0" mnemonicParsing="false" text="Start" />
+   <Label layoutX="143.0" layoutY="10.0" text="Symmie">
+      <font>
+         <Font size="30.0" />
+      </font>
+   </Label>
+   <ProgressBar fx:id="progress" visible="false" layoutX="175.0" layoutY="129.0" prefWidth="200.0" progress="0.0" />
+</Pane>