github catchup

.gitignore

@@ -3,6 +3,9 @@ out/
 !**/src/main/**/out/
 !**/src/test/**/out/
 
+in/
+write/
+
 ### Eclipse ###
 .apt_generated
 .classpath

out-ihaveafile.txt

@@ -0,0 +1 @@
+this is a test file which i can check for errors with

src/client/Client.java

@@ -1,10 +1,12 @@
 package client;
 
 import server.Server;
+import shared.ExceptionLogger;
 import shared.FileHeader;
 
 import java.io.*;
 import java.net.Socket;
+import java.util.*;
 
 public class Client {
 
@@ -32,12 +34,20 @@ public class Client {
         try {
             out.flush();
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            ExceptionLogger.log(e);
         }
     }
 
     void sendDir(String path){
-
+        File p = new File(path);
+        ArrayDeque<File> filesToCheck = new ArrayDeque<>(Arrays.asList(Objects.requireNonNull(p.listFiles())));
+        while (!filesToCheck.isEmpty()) {
+            File f = filesToCheck.remove();
+            if (f.isDirectory()){
+                filesToCheck.add(f);
+            } else
+                sendFile(f.getPath());
+        }
     }
 
     void close(){
@@ -45,14 +55,16 @@ public class Client {
             in.close();
             out.close();
             serverConnection.close();
-        } catch (Exception ignored){}
+        } catch (Exception e){
+            ExceptionLogger.log(e);
+        }
     }
 
     public static void main(String[] args) {
         try {
-            new Client("localhost", Server.SERVER_PORT).sendFile("ihaveafile.txt");
+            new Client("localhost", Server.SERVER_PORT).sendDir("in/");
         } catch (Exception e){
-            e.printStackTrace();
+            ExceptionLogger.log(e);
         }
     }
 

src/server/Server.java

@@ -1,5 +1,6 @@
 package server;
 
+import shared.ExceptionLogger;
 import java.io.IOException;
 import java.net.ServerSocket;
 
@@ -7,12 +8,11 @@ public class Server {
 
     public static final int SERVER_PORT = 42069;
 
-    private ServerSocket serverSocket;
     private volatile boolean running = true;
 
     public Server() {
         try {
-            serverSocket = new ServerSocket(SERVER_PORT);
+            ServerSocket serverSocket = new ServerSocket(SERVER_PORT);
 
             while (running) {
                 new Connection(this, serverSocket.accept()).start();
@@ -20,7 +20,7 @@ public class Server {
 
             serverSocket.close();
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            ExceptionLogger.log(e);
         }
     }
 

src/shared/ExceptionLogger.java

@@ -0,0 +1,15 @@
+package shared;
+
+public class ExceptionLogger {
+
+    public static void log(Exception e){
+        System.err.println("We have caught an exception:");
+        System.err.println("\tCaused by: ");
+        System.err.println("\t\t" + e.getLocalizedMessage());
+        System.err.println("\tStack trace:");
+        StackTraceElement[] stack = e.getStackTrace();
+        for (StackTraceElement s : stack)
+            System.err.println("\t\tAt " + s.toString());
+    }
+
+}

src/shared/FileHeader.java

@@ -3,6 +3,8 @@ package shared;
 import client.Client;
 
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 public class FileHeader {
 
@@ -34,7 +36,7 @@ public class FileHeader {
 
     public void write(DataOutputStream writer) {
         try {
-            DataInputStream reader = new DataInputStream(new BufferedInputStream(new FileInputStream(full_path)));
+            DataInputStream reader = new DataInputStream(new BufferedInputStream(Files.newInputStream(Paths.get(full_path))));
 
             writer.writeByte(COMMAND.WRITE.type);
             writer.writeUTF(relative_path);
@@ -53,23 +55,35 @@ public class FileHeader {
             reader.close();
             writer.writeInt(0);
             writer.flush();
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            ExceptionLogger.log(e);
         }
     }
 
     public static void receive(DataInputStream reader) {
         try {
-            String path = System.getProperty("user.dir") + "/out-" + reader.readUTF();
+            String userFile = reader.readUTF();
+            String[] pathParts = userFile.split("/");
+            String userDirectory = userFile.replace(pathParts[pathParts.length-1], "");
+
+            File ld = new File(System.getProperty("user.dir") + "/write/" + userDirectory);
+            if (!ld.exists())
+                if(!ld.mkdirs())
+                    System.out.println("Failed to create directory");
+
+            String path = System.getProperty("user.dir") + "/write/" + userFile;
             System.out.println("Writing to file: " + path);
 
-            DataOutputStream writer = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(path)));
+            DataOutputStream writer = new DataOutputStream(new BufferedOutputStream(Files.newOutputStream(Paths.get(path))));
             int size = 0;
             while ((size = reader.readInt()) > 0) {
                 byte[] data = new byte[size];
                 int amount = reader.read(data, 0, size);
                 writer.write(data, 0, amount);
             }
-        } catch (Exception ignored){
+            writer.flush();
+        } catch (Exception e){
+            ExceptionLogger.log(e);
         }
     }