Lesson4

Lesson 3

@@ -0,0 +1 @@
+По проекту еще ничего не сделал. Время уходит на ДЗ. Постараюсь сделать максимум к первому CodeReview

src/main/java/client/Client.java

@@ -1,11 +1,18 @@
 package client;
 
+import server.ClientHandler;
+
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.*;
+import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.SocketException;
+import java.util.Scanner;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * Swing client - File Storage
@@ -36,10 +43,12 @@ public Client() throws IOException {
                 sendFile(cmd[1]);
             } else if ("download".equals(cmd[0])) {
                 getFile(cmd[1]);
+            }else{
+                sendMessage(cmd[0]);
             }
-
         });
 
+
         addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosing(WindowEvent e) {
@@ -58,12 +67,45 @@ public void windowClosing(WindowEvent e) {
     }
 
     private void getFile(String filename) {
-        // TODO: 13.05.2021 downloading
+        try {
+            File file = new File("C:\\Program Files\\Java\\Java4\\src\\main\\java\\server\\" + filename);
+
+            File downloadFile = new File("C:\\Program Files\\Java\\Java4\\src\\main\\java\\client\\" + filename);
+            if (!downloadFile.exists()) {
+                downloadFile.createNewFile();
+            }
+
+            if (!file.exists()) {
+                throw new FileNotFoundException();
+            }
+
+            long fileLength = file.length();
+            FileInputStream fis = new FileInputStream(file);
+
+            out.writeUTF("download");
+            out.writeUTF(filename);
+            out.writeLong(fileLength);
+
+            int read = 0;
+            byte[] buffer = new byte[8 * 1024];
+            while ((read = fis.read(buffer)) != -1) {
+                out.write(buffer, 0, read);
+            }
+
+            out.flush();
+
+            String status = in.readUTF();
+            System.out.println("Sending status: " + status);
+        } catch (FileNotFoundException e) {
+            System.err.println("File not found - /client/" + filename);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     private void sendFile(String filename) {
         try {
-            File file = new File("client/" + filename);
+            File file = new File("C:\\Program Files\\Java\\Java4\\src\\main\\java\\client\\" + filename);
             if (!file.exists()) {
                 throw new FileNotFoundException();
             }
@@ -113,6 +155,6 @@ private void sendMessage(String message) {
     }
 
     public static void main(String[] args) throws IOException {
-        new Client();
+        new client.Client();
     }
 }

src/main/java/server/ClientHandler.java

@@ -23,7 +23,7 @@ public void run() {
                     uploading(out, in);
                 }
                 if ("download".equals(command)) {
-                    // TODO: 13.05.2021 downloading
+                    downloading(out,in,command);
                 }
                 if ("exit".equals(command)) {
                     out.writeUTF("DONE");
@@ -42,9 +42,40 @@ public void run() {
         }
     }
 
+    private void downloading(DataOutputStream out, DataInputStream in,String filename) throws IOException{
+        try {
+            File file = new File("C:\\Program Files\\Java\\Java4\\src\\main\\java\\server\\" + filename); // read file name
+            if (!file.exists()) {
+                throw new FileNotFoundException();
+            }
+
+            long fileLength = file.length();
+            FileInputStream fis = new FileInputStream(file);
+
+            out.writeUTF("download");
+            out.writeUTF(filename);
+            out.writeLong(fileLength);
+
+            int read = 0;
+            byte[] buffer = new byte[8 * 1024];
+            while ((read = fis.read(buffer)) != -1) {
+                out.write(buffer, 0, read);
+            }
+
+            out.flush();
+
+            String status = in.readUTF();
+            System.out.println("Sending status: " + status);
+        } catch (FileNotFoundException e) {
+            System.err.println("File not found - /server/" + filename);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     private void uploading(DataOutputStream out, DataInputStream in) throws IOException {
         try {
-            File file = new File("server/" + in.readUTF()); // read file name
+            File file = new File("C:\\Program Files\\Java\\Java4\\src\\main\\java\\server\\" + in.readUTF()); // read file name
             if (!file.exists()) {
                 file.createNewFile();
             }
@@ -70,4 +101,4 @@ private void disconnected() {
             e.printStackTrace();
         }
     }
-}
+}