add clean messages to statusReponse

syncany · Sep 5, 2014 · cfc5172 · cfc5172
1 parent 37f4aad
commit cfc5172
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 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
@@ -213,18 +213,37 @@ private void handleStatusRequest(StatusRequest statusRequest) {
 
 			StatusOperation statusOperation = new StatusOperation(config, statusOperationOption);
 			StatusOperationResult statusOperationResult = statusOperation.execute();
-			StatusResponse statusResponse = new StatusResponse(statusRequest.getId());
 
-			for (String f : statusOperationResult.getChangeSet().getChangedFiles()) {
-				statusResponse.addChangedFile(f);
-			}
-			for (String f : statusOperationResult.getChangeSet().getDeletedFiles()) {
-				statusResponse.addDeletedFile(f);
+			StringBuilder messageBuilder = new StringBuilder();
+
+			ArrayList<String> changedFilesList = new ArrayList<>();
+			ArrayList<String> deletedFilesList = new ArrayList<>();
+			ArrayList<String> newFilesList = new ArrayList<>(); 
+
+			if (statusOperationResult.getChangeSet().hasChanges()) {
+				for (String f : statusOperationResult.getChangeSet().getChangedFiles()) {
+					changedFilesList.add(f);
+					messageBuilder.append(" M").append(f).append(System.getProperty("line.separator"));
+				}
+				for (String f : statusOperationResult.getChangeSet().getDeletedFiles()) {
+					deletedFilesList.add(f);
+					messageBuilder.append(" M").append(f).append(System.getProperty("line.separator"));
+				}
+				for (String f : statusOperationResult.getChangeSet().getNewFiles()) {
+					newFilesList.add(f);
+					messageBuilder.append(" M").append(f).append(System.getProperty("line.separator"));
+				}
 			}
-			for (String f : statusOperationResult.getChangeSet().getNewFiles()) {
-				statusResponse.addNewFile(f);
+			else {
+				messageBuilder.append("No Changes");
 			}
 
+			StatusResponse statusResponse = new StatusResponse(statusRequest.getId(), messageBuilder.toString());
+
+			statusResponse.setChangedFiles(changedFilesList);
+			statusResponse.setDeletedFiles(deletedFilesList);
+			statusResponse.setNewFiles(newFilesList);
+
 			eventBus.post(statusResponse);
 		}
 		catch (Exception e) {

diff --git a/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/StatusResponse.java
@@ -17,7 +17,6 @@
  */
 package org.syncany.operations.daemon.messages;
 
-import java.io.File;
 import java.util.ArrayList;
 
 import org.simpleframework.xml.ElementList;
@@ -36,8 +35,8 @@ public StatusResponse() {
 		// Required default constructor!
 	}
 
-	public StatusResponse(int requestId) {
-		super(200, requestId, null);
+	public StatusResponse(int requestId, String message) {
+		super(200, requestId, message);
 	}	
 
 	public ArrayList<String> getNewFiles() {
@@ -58,17 +57,4 @@ public ArrayList<String> getDeletedFiles() {
 	public void setDeletedFiles(ArrayList<String> deletedFiles) {
 		this.deletedFiles = deletedFiles;
 	}
-
-	public void addNewFile(String file){
-		if (newFiles == null) newFiles = new ArrayList<>();
-		newFiles.add(file);
-	}
-	public void addChangedFile(String file){
-		if (changedFiles == null) changedFiles = new ArrayList<>();
-		changedFiles.add(file);
-	}
-	public void addDeletedFile(String file){
-		if (deletedFiles == null) deletedFiles = new ArrayList<>();
-		deletedFiles.add(file);
-	}
 }