SimonGrad
diff --git a/‎README‎
Lines changed: 34 additions & 3 deletions b/‎README‎
Lines changed: 34 additions & 3 deletions
diff --git a/‎TODO.txt‎
Lines changed: 0 additions & 7 deletions b/‎TODO.txt‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎executable/jfs.jar‎
10.1 KB b/‎executable/jfs.jar‎
10.1 KB
diff --git a/‎src/net/quaa/jfs/Client.java‎
Lines changed: 7 additions & 2 deletions b/‎src/net/quaa/jfs/Client.java‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎src/net/quaa/jfs/Server.java‎
Lines changed: 4 additions & 0 deletions b/‎src/net/quaa/jfs/Server.java‎
Lines changed: 4 additions & 0 deletions
@@ -1,4 +1,35 @@
-A simple java file sync program I currently am developing for my 
-networking class
+Java File Sync
+Brian Tannous
+November 2010
 
-This program is very simple but effective.
+------------------------------About------------------------------
+Java File Sync is a simple directory tree synchronization program
+written in java.  Jfs is currently a command line only program
+and is can be ran anywhere.  It requires a sever to host the sync
+directories.  You can easily sync any directory with any machine
+on any network.  Jfs uses sockets to communicate back and forth
+and is fairly efficient.
+
+---------------------------How to Use----------------------------
+Usage is extremely simple, below are examples of both client and
+server arguments.  A pre-compiled .jar file is found in the
+executables directory.
+
+---Server
+The server is a vital part of Jfs as it is what hosts the syncing
+directories.  You will need to run Jfs server as:
+
+   java -jar jfs.jar -s
+
+The Jfs server will run until you choose to close it by CTL + C
+
+---Client
+The client is the machine you currently would like to sync any
+given directory with the server.  
+You will need to run Jfs client as:
+
+   java -jar jfs.jar -c Server.IP DirectoryToSync
+      ex: java -jar jfs.jar -c 192.168.1.100 ~/working/
+
+The Jfs client will connect to the given server and close when
+syncing is finished.
@@ -31,6 +31,7 @@ public Client(String dirName, String fullDirName, String serverIP, int port) {
 		System.out.println("Client Selected!");
 		System.out.println("Dir to sync: " + dirName);
 		System.out.println("Server IP: " + serverIP);
+		System.out.print("Syncing");
 	}
 
 	public void runClient() throws Exception {
@@ -61,10 +62,13 @@ public void runClient() throws Exception {
 		oos.close();
 		ois.close();
 		sock.close();
+		System.out.println();
+		System.out.println("Finished sync");
 	}
 
 	// Process all files and directories under dir
 	private static void visitAllDirsAndFiles(File dir) throws Exception{
+		System.out.print(".");
 		Vector<String> vec = new Vector<String>();
 		vec.add(dir.getName());
 		vec.add(dir.getAbsolutePath().substring((dir.getAbsolutePath().indexOf(fullDirName) + fullDirName.length())));
@@ -126,7 +130,7 @@ private static void sendFile(File dir) throws Exception {
 		oos.flush();
 		reinitConn();
 
-		printDebug(true, dir);
+//		printDebug(true, dir);
 	}
 
 	private static void receiveFile(File dir) throws Exception {
@@ -141,13 +145,14 @@ private static void receiveFile(File dir) throws Exception {
 
 		reinitConn();
 
-		printDebug(false, dir);
+//		printDebug(false, dir);
 	}
 
 	private static void updateFromServer() throws Exception {
 		Boolean isDone = false;
 		Boolean nAll = false;
 		while(!isDone) {
+			System.out.print(".");
 			String path = (String) ois.readObject();
 
 			if(path.equals(DONE)) {
 
@@ -29,12 +29,15 @@ public void startServer() throws Exception {
 		servsock = new ServerSocket(PORT_NUMBER);
 		while (true) {
 			sock = servsock.accept();
+
 			ois = new ObjectInputStream(sock.getInputStream());
 
 			baseDir = (String) ois.readObject();
 			File fBaseDir = new File(baseDir);
 			Boolean baseDirExists = fBaseDir.exists();
 
+			System.out.println("New client connected! IP: " + sock.getInetAddress().toString() + " Directory: " + baseDir);
+
 			if(!baseDirExists)
 				fBaseDir.mkdir();
 
@@ -113,6 +116,7 @@ public void startServer() throws Exception {
 			oos.close();
 			ois.close();
 			sock.close();
+			System.out.println("Finished sync");
 		}
 	}