Quick fixes, relates to #205 #217

syncany · Sep 6, 2014 · c078197 · c078197
1 parent 3caa19f
commit c078197
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java
@@ -54,7 +54,7 @@
 import org.syncany.operations.daemon.messages.GetFileTreeFolderResponse;
 import org.syncany.operations.daemon.messages.RestoreFileFolderRequest;
 import org.syncany.operations.daemon.messages.RestoreFileFolderResponse;
-import org.syncany.operations.daemon.messages.WatchEventResponse;
+import org.syncany.operations.daemon.messages.WatchEventFolderResponse;
 import org.syncany.operations.daemon.messages.api.FolderRequest;
 import org.syncany.operations.daemon.messages.api.FolderRequestHandler;
 import org.syncany.operations.restore.RestoreOperation;
@@ -281,7 +281,7 @@ public void onUploadStart(int fileCount) {
 		String root = config.getLocalDir().getAbsolutePath();
 		String action = "UPLOAD_START";
 
-		eventBus.post(new WatchEventResponse(root, action));
+		eventBus.post(new WatchEventFolderResponse(root, action));
 	}
 
 	@Override
@@ -290,23 +290,23 @@ public void onUploadFile(String fileName, int fileNumber) {
 		String action = "UPLOAD_FILE";
 		String subject = fileName;
 
-		eventBus.post(new WatchEventResponse(root, action, subject));
+		eventBus.post(new WatchEventFolderResponse(root, action, subject));
 	}
 
 	@Override
 	public void onUploadEnd() {
 		String root = config.getLocalDir().getAbsolutePath();
 		String action = "UPLOAD_END";
 
-		eventBus.post(new WatchEventResponse(root, action));
+		eventBus.post(new WatchEventFolderResponse(root, action));
 	}
 
 	@Override
 	public void onIndexStart(int fileCount) {
 		String root = config.getLocalDir().getAbsolutePath();
 		String action = "INDEX_START";
 
-		eventBus.post(new WatchEventResponse(root, action));
+		eventBus.post(new WatchEventFolderResponse(root, action));
 	}
 
 	@Override
@@ -315,23 +315,23 @@ public void onIndexFile(String fileName, int fileNumber) {
 		String action = "INDEX_FILE";
 		String subject = fileName;
 
-		eventBus.post(new WatchEventResponse(root, action, subject));
+		eventBus.post(new WatchEventFolderResponse(root, action, subject));
 	}
 
 	@Override
 	public void onIndexEnd() {
 		String root = config.getLocalDir().getAbsolutePath();
 		String action = "INDEX_END";
 
-		eventBus.post(new WatchEventResponse(root, action));
+		eventBus.post(new WatchEventFolderResponse(root, action));
 	}
 
 	@Override
 	public void onDownloadStart(int fileCount) {
 		String root = config.getLocalDir().getAbsolutePath();
 		String action = "DOWNLOAD_START";
 
-		eventBus.post(new WatchEventResponse(root, action));
+		eventBus.post(new WatchEventFolderResponse(root, action));
 	}
 
 	@Override
@@ -340,6 +340,6 @@ public void onDownloadFile(String fileName, int fileNumber) {
 		String action = "DOWNLOAD_FILE";
 		String subject = fileName;
 
-		eventBus.post(new WatchEventResponse(root, action, subject));
+		eventBus.post(new WatchEventFolderResponse(root, action, subject));
 	}
 }
diff --git a/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchServer.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchServer.java
@@ -35,6 +35,7 @@
 import org.syncany.operations.daemon.messages.ListWatchesManagementRequest;
 import org.syncany.operations.daemon.messages.ListWatchesManagementResponse;
 import org.syncany.operations.daemon.messages.api.FolderRequest;
+import org.syncany.operations.daemon.messages.api.ManagementRequest;
 import org.syncany.operations.daemon.messages.api.Request;
 import org.syncany.operations.watch.WatchOperation;
 import org.syncany.operations.watch.WatchOperationOptions;
@@ -172,24 +173,23 @@ private Map<File, FolderTO> getFolderMap(List<FolderTO> watchedFolders) {
 	}
 
 	@Subscribe
-	public void onRequestReceived(Request request) {
+	public void onManagementRequestReceived(ManagementRequest request) {
 		if (request instanceof ListWatchesManagementRequest) {
 			processListWatchesRequest((ListWatchesManagementRequest) request);
-		}
-		else if (request instanceof FolderRequest) {
-			processWatchRequest((FolderRequest) request);
-		}
+		}		
 	}
 
-	private void processListWatchesRequest(ListWatchesManagementRequest request) {
-		eventBus.post(new ListWatchesManagementResponse(request.getId(), new ArrayList<File>(watchOperations.keySet())));
-	}
-
-	private void processWatchRequest(FolderRequest watchRequest) {
-		File rootFolder = new File(watchRequest.getRoot());
+	@Subscribe
+	public void onFolderRequestReceived(FolderRequest folderRequest) {
+		File rootFolder = new File(folderRequest.getRoot());
 
 		if (!watchOperations.containsKey(rootFolder)) {
-			eventBus.post(new BadRequestResponse(watchRequest.getId(), "Unknown root folder."));
+			eventBus.post(new BadRequestResponse(folderRequest.getId(), "Unknown root folder."));
 		}
 	}
+
+	private void processListWatchesRequest(ListWatchesManagementRequest request) {
+		eventBus.post(new ListWatchesManagementResponse(request.getId(), new ArrayList<File>(watchOperations.keySet())));
+	}
+
 }
diff --git a/...ib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementRequest.java b/...ib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesManagementRequest.java
@@ -17,8 +17,8 @@
  */
 package org.syncany.operations.daemon.messages;
 
-import org.syncany.operations.daemon.messages.api.Request;
+import org.syncany.operations.daemon.messages.api.ManagementRequest;
 
-public class ListWatchesManagementRequest extends Request {
+public class ListWatchesManagementRequest extends ManagementRequest {
 	// Nothing here.
 }
diff --git a/...s/daemon/messages/WatchEventResponse.java → ...on/messages/WatchEventFolderResponse.java b/...s/daemon/messages/WatchEventResponse.java → ...on/messages/WatchEventFolderResponse.java
@@ -20,7 +20,7 @@
 import org.simpleframework.xml.Element;
 import org.syncany.operations.daemon.messages.api.Response;
 
-public class WatchEventResponse extends Response {
+public class WatchEventFolderResponse extends Response {
 	@Element(required = true)
 	private String root;
 
@@ -30,11 +30,11 @@ public class WatchEventResponse extends Response {
 	@Element(required = false)
 	private String subject;
 
-	public WatchEventResponse(String root, String action) {
+	public WatchEventFolderResponse(String root, String action) {
 		this(root, action, null);
 	}	
 
-	public WatchEventResponse(String root, String action, String subject) {
+	public WatchEventFolderResponse(String root, String action, String subject) {
 		super(200, null, null);
 
 		this.root = root;