Changed to a faster way to comm, but DONE is not working. Need to fix

quaa · quaa · commit beb078981ef9 · 2010-11-25T16:25:57.000-06:00
diff --git a/src/net/quaa/jfs/Client.java b/src/net/quaa/jfs/Client.java
@@ -7,6 +7,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.Socket;
+import java.util.Vector;
 
 public class Client {
 	private static String dirName;
@@ -43,12 +44,17 @@ public void runClient() throws Exception {
 		String[] children = baseDir.list();
 		
 	    for (int i=0; i<children.length; i++) {
-	    	visitAllDirsAndFiles(new File(baseDir, children[i]));	            	
+	    	visitAllDirsAndFiles(new File(baseDir, children[i]));	
+	    	System.out.print(i);
 	    }
-	    
-		oos.writeObject(new String(DONE));
+	    System.out.print("Setting done");
+	    Vector<String> vecDONE = new Vector<String>();
+	    vecDONE.add(DONE);
+		oos.writeObject(vecDONE);
 		oos.flush();
-		
+		System.out.println(DONE);
+
+	
 		if(fExists) 
 			updateFromServer(sock, fullDirName);
 		
@@ -59,7 +65,7 @@ public void runClient() throws Exception {
 	
 	// Process all files and directories under dir
 	public static void visitAllDirsAndFiles(File dir) throws Exception{
-		oos.writeObject(new String(dir.getName()));
+/*		oos.writeObject(new String(dir.getName()));
 		oos.flush();
 		
 		ois.readObject();
@@ -74,10 +80,34 @@ public static void visitAllDirsAndFiles(File dir) throws Exception{
 		
 		ois.readObject();
 		
-		if(!dir.isDirectory()) {
-			oos.writeObject(new Long(dir.lastModified()));
+*/		
+		Vector<String> vec = new Vector<String>();
+		vec.add(dir.getName());
+		vec.add(dir.getAbsolutePath().substring((dir.getAbsolutePath().indexOf(fullDirName) + fullDirName.length())));
+		
+		if(dir.isDirectory()) {
+			oos.writeObject(vec);
 			oos.flush();
+			oos.close();
+			ois.close();
+			sock = new Socket(serverIP, PORT_NUMBER);
+			oos = new ObjectOutputStream(sock.getOutputStream());
+			ois = new ObjectInputStream(sock.getInputStream());
 			
+			ois.readObject();
+		} else {
+//			oos.writeObject(new Long(dir.lastModified()));
+//			oos.flush();
+
+			vec.add(new Long(dir.lastModified()).toString());
+			oos.writeObject(vec);
+			oos.flush();
+			oos.close();
+			ois.close();
+			sock.close();
+			sock = new Socket(serverIP, PORT_NUMBER);
+			oos = new ObjectOutputStream(sock.getOutputStream());
+			ois = new ObjectInputStream(sock.getInputStream());
 			// receive SEND or RECEIVE
 			Integer updateToServer = (Integer) ois.readObject(); //if true update server, else update from server
 
diff --git a/src/net/quaa/jfs/Server.java b/src/net/quaa/jfs/Server.java
@@ -8,6 +8,7 @@
 import java.io.ObjectOutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.Vector;
 
 public class Server {
 	private int PORT_NUMBER;
@@ -27,6 +28,7 @@ public void startServer() throws Exception {
 		servsock = new ServerSocket(PORT_NUMBER);
 		
 		while (true) {
+			System.out.println("NEW CLIENT");
 			sock = servsock.accept();
 
 			ois = new ObjectInputStream(sock.getInputStream());
@@ -46,7 +48,7 @@ public void startServer() throws Exception {
 			Boolean isClientDone = false;
 			
 			while (!isClientDone) {
-				String fName = (String) ois.readObject();
+/*				String fName = (String) ois.readObject();
 				
 				if(fName.equals(DONE)) { // check if we are done
 					isClientDone = true;
@@ -57,21 +59,36 @@ public void startServer() throws Exception {
 				oos.flush();
 				
 				Boolean isDirectory = (Boolean) ois.readObject();
+*/				
+				Vector<String> vec = (Vector<String>) ois.readObject();
 				
-				if(isDirectory) {
-					oos.writeObject(new Boolean(true));
+				oos.close();
+				ois.close();
+				sock.close();
+				sock = servsock.accept();
+				oos = new ObjectOutputStream(sock.getOutputStream());
+				ois = new ObjectInputStream(sock.getInputStream());
+				System.out.println(vec.elementAt(0));
+				if(vec.elementAt(0).equals(DONE)) {
+					System.out.println(DONE);
+					isClientDone = true;
+					break;
+				}
+
+				if(vec.size() == 2) { // if the size is 2 then this is a directory
+/*					oos.writeObject(new Boolean(true));
 					oos.flush();
 					
 					String path = (String) ois.readObject();
-					
-					File newDir = new File(baseDir, path);
+*/					
+					File newDir = new File(baseDir, vec.elementAt(1));
 					if (!newDir.exists())
 						newDir.mkdir();
 					
 					oos.writeObject(new Boolean(true));
 					oos.flush();
 				} else {
-					oos.writeObject(new Boolean(true));
+/*					oos.writeObject(new Boolean(true));
 					oos.flush();
 					
 					String path = (String) ois.readObject();
@@ -80,10 +97,11 @@ public void startServer() throws Exception {
 					oos.flush();
 					
 					Long lastModified = (Long) ois.readObject();
-					
-					File newFile = new File(baseDir, path);
+*/					
+					File newFile = new File(baseDir, vec.elementAt(1));
 					Integer updateFromClient = 2; // default = do nothing
 					
+					Long lastModified = new Long(vec.elementAt(2));
 					if (!newFile.exists() || (newFile.lastModified() <= lastModified))
 						updateFromClient = 1;
 					else
