Cleanup and small bug on delete

rafaelribeiro1510 · Apr 12, 2021 · dcd5532 · dcd5532
1 parent 051cee1
commit dcd5532
Show file tree

Hide file tree

Showing 7 changed files with 880 additions and 10 deletions.
diff --git a/proj1/files/deb.txt b/proj1/files/deb.txt
diff --git a/proj1/src/Channel.java b/proj1/src/Channel.java
@@ -46,7 +46,6 @@ public void run() {
     }
 
     private void processPacket(DatagramPacket receivedPacket) {
-
         int size = receivedPacket.getLength();
         byte[] data = Arrays.copyOf(receivedPacket.getData(), size);
 
@@ -81,12 +80,12 @@ private void processPacket(DatagramPacket receivedPacket) {
                 Peer.getExec().execute(() ->Delete.processDELETE(fileID));
                 break;
             case "GETCHUNK":
-                Peer.getExec().execute(() ->Restore.processPacketGETCHUNK(splitHeader));
+                Peer.getExec().execute(() ->Restore.processGETCHUNK(splitHeader));
                 break;
             case "CHUNK":
                 byte[] content = Arrays.copyOfRange(data, i + 4, data.length);
                 newChunk.setContent(content);
-                Peer.getExec().execute(() ->Restore.processPacketCHUNK(newChunk, splitHeader));
+                Peer.getExec().execute(() ->Restore.processCHUNK(newChunk, splitHeader));
                 break;
             case "REMOVED":
                 Peer.getExec().execute(() ->Reclaim.processREMOVED(splitHeader));

diff --git a/proj1/src/Delete.java b/proj1/src/Delete.java
@@ -17,8 +17,10 @@ public static void processDELETE(String fileIdToDelete) {
         }
 
         if (filesChunks.size() > 0) {
-            byte[] deletedMessage = ("1.1 DELETED " + Peer.getId() + " " + fileIdToDelete + " " + "\r\n" + "\r\n").getBytes();
-            Peer.getMC().sendMessage(deletedMessage);
+            if (Peer.protocolVersion.equals("1.1")){
+                byte[] deletedMessage = ("1.1 DELETED " + Peer.getId() + " " + fileIdToDelete + " " + "\r\n" + "\r\n").getBytes();
+                Peer.getMC().sendMessage(deletedMessage);
+            }
             FileStorage.saveToDisk();
         }
     }

diff --git a/proj1/src/FileObject.java b/proj1/src/FileObject.java
@@ -86,7 +86,7 @@ private String getFileIdHashed() {
                     hexString.append('0');
                 hexString.append(hex);
             }
-            return hexString.toString();
+            return hexString.toString().toUpperCase();
 
         } catch (Exception e) {
             e.printStackTrace();

diff --git a/proj1/src/Peer.java b/proj1/src/Peer.java
@@ -188,7 +188,7 @@ public void delete(String filepath) {
             int finalI = i;
             futures.add(exec.schedule(() -> {
                 byte[] messageBytes = ("1.0 DELETE " + peerID + " " + fileObject.getFileID() + " " + "\r\n" + "\r\n").getBytes();
-                System.out.println("Sending Message to MC: Try " + finalI);
+                System.out.println("Sending Delete: Try " + finalI);
                 MC.sendMessage(messageBytes);
             }, timeInterval, TimeUnit.SECONDS));
         }

diff --git a/proj1/src/Restore.java b/proj1/src/Restore.java
@@ -14,7 +14,7 @@ public class Restore {
     public static final Set<Integer> chunksAlreadySent = new HashSet<>();
     public static ScheduledFuture<?> t;
 
-    public static void processPacketGETCHUNK(String[] splitHeader) {
+    public static void processGETCHUNK(String[] splitHeader) {
         if (Peer.getId() == Integer.parseInt(splitHeader[2])) {
             return ;
         }
@@ -48,7 +48,7 @@ private static void sendCHUNKMessage(byte[] chunkMessage, int chunkNumber){
         Peer.getMDR().sendMessage(chunkMessage);
     }
 
-    public static void processPacketCHUNK(Chunk newChunk, String[] splitHeader) {
+    public static void processCHUNK(Chunk newChunk, String[] splitHeader) {
         if (!chunksAlreadySent.add(Integer.parseInt(splitHeader[4])) || // If chunk was already sent by someone else
                 Peer.getId() == Integer.parseInt(splitHeader[2]) ||     // Or this peer sent this message
                 !isRestoreTarget) {                                     // Or this peer isn't the one who requested the RESTORE

diff --git a/proj1/src/TestApp.java b/proj1/src/TestApp.java
@@ -1,7 +1,6 @@
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 
-
 public class TestApp {
 
     public static void main(String[] args) {