Basic client layout, client to server talking added in pseudocode

quaa · quaa · commit fc3ca1233006 · 2010-11-21T11:48:29.000-06:00
diff --git a/pseudocode.txt b/pseudocode.txt
@@ -25,3 +25,69 @@ if does not exist
      do nothing
 move to next file
 end
+
+
+
+2 way talking:
+
+CLIENT: dirName
+Server: EXISTS or NOEXISTS
+   
+if directory
+   CLIENT: dirName DiR
+   SERVER: OK
+else
+   CLIENT: fileName lastModified
+   SERVER: OK or NO
+   if OK
+      CLIENT: SEND FILE
+      SERVER: OK
+   else
+      CLIENT: OK
+      SERVER: SEND FILE
+      CLIENT: OK
+      SERVER: SEND LAST MODIFIED
+   end
+end
+
+CLIENT: DONE
+
+if EXISTS
+   if directory
+      SERVER: dirName DiR
+      CLIENT: OK or NO
+      if NO
+         SERVER: OK
+         CLIENT: ask user if he/she would like to delete servers copy
+                 reply YE (delete) or NO (get servers copy)
+                 or DN (do nothing)
+         if YE
+            SERVER: delete directory
+         if NO
+            CLIENT: make directory
+         if DN
+            do nothing
+         end
+      end
+   else
+      SERVER: fileName
+      CLIENT: OK or NO
+      if NO
+         SERVER: OK
+         CLIENT: ask user if he/she would like to delete servers copy
+                 reply YE (delete) or NO (get servers copy)
+                 or DN (do nothing)
+         if YE
+            SERVER: delete file
+         if NO
+            SERVER: SEND FILE
+            CLIENT: OK
+            SERVER: SEND LASTMODIFIED
+            CLIENT: OK
+         if DN
+            do nothing
+         end
+      end
+   end
+end
+
diff --git a/src/net/quaa/jfs/Client.java b/src/net/quaa/jfs/Client.java
@@ -1,5 +1,7 @@
 package net.quaa.jfs;
 
+import java.io.File;
+import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.Socket;
 
@@ -44,10 +46,19 @@ public void runClient() throws Exception {
 		}
 		
 		Socket sock = new Socket(serverIP, PORT_NUMBER);
-		ObjectOutputStream oos = new ObjectOutputStream(sock.getOutputStream());
+		ObjectOutputStream oos = new ObjectOutputStream(sock.getOutputStream()); // send directory name to server
 		oos.writeObject(localDirName);
 		oos.flush();
 		
+		ObjectInputStream ois = new ObjectInputStream(sock.getInputStream()); // receive if this directory exists
+		String fExists = (String) ois.readObject();
+		
+		visitAllDirsAndFiles(new File(dirName), sock);
+
+		if(fExists.equals("EXISTS")) {
+			updateFromServer(sock);
+		}
+		
 /*		//check to see if file exists on server
 		ObjectInputStream ois = new ObjectInputStream(sock.getInputStream());
 		String fExists = (String) ois.readObject();
@@ -74,6 +85,23 @@ public void runClient() throws Exception {
 			System.out.println("Server replied that " + fileName + " does not exist, closing connection.");
 		}
 */		oos.close();
+		ois.close();
 		sock.close();
 	}
+	
+	// Process all files and directories under dir
+	public static void visitAllDirsAndFiles(File dir, Socket sock) {
+		// DO WORK HERE
+		System.out.println("Name: " + dir.getName() + " Modified: " + dir.lastModified() + " Size: " + dir.length());
+	    if (dir.isDirectory()) {
+	        String[] children = dir.list();
+	        for (int i=0; i<children.length; i++) {
+	            visitAllDirsAndFiles(new File(dir, children[i]), sock);	            	
+	        }
+	    }
+	}
+	
+	public static void updateFromServer(Socket sock) {
+		
+	}
 }
