(d) This part prevents any management requests to be run on the daemo…

…n: boolean sendToRest = daemonRunning & localDirHandledInDaemonScope && needsToRunInInitializedScope;. The if/then/else block inside sendToRest is obsolete by that. (e) Do we want to run ManagementRequests in the daemon scope? Installing plugins? I don't think so... (f) I am not a big fan of hardcoded strings in the source code. Can you move the thisPackage descriptions to a constant or better yet, derive it from a class name? Same for + "FolderRequest". ad (c): Maybe commands should have a "canExecuteInDaemonScope()" method to allow/prevent "remote" execution. Just thinking out loud ...
syncany · Sep 8, 2014 · 45ab17e · 45ab17e
1 parent 512a45a
commit 45ab17e
Show file tree

Hide file tree

Showing 16 changed files with 83 additions and 31 deletions.
diff --git a/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java b/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java
@@ -176,5 +176,9 @@ public void printResults(OperationResult operationResult) {
 		}	
 	}
 
-
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		// TODO [low] : right now only read commands in daemon scope
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/Command.java b/syncany-cli/src/main/java/org/syncany/cli/Command.java
@@ -80,6 +80,8 @@ public abstract class Command {
 	public abstract OperationOptions parseOptions(String[] operationArgs) throws Exception;
 	public abstract void printResults(OperationResult result);
 
+	public abstract boolean canExecuteInDaemonScope();
+
 	public void setLocalDir(File localDir) {
 		this.localDir = localDir;
 	}

diff --git a/syncany-cli/src/main/java/org/syncany/cli/CommandLineClient.java b/syncany-cli/src/main/java/org/syncany/cli/CommandLineClient.java
@@ -324,7 +324,7 @@ private int runCommand(Command command, String commandName, String[] commandArgs
 		boolean localDirHandledInDaemonScope = portFile != null && portFile.exists();
 		boolean daemonRunning = PidFileUtil.isProcessRunning(PIDFile);
 		boolean needsToRunInInitializedScope = command.getRequiredCommandScope() == CommandScope.INITIALIZED_LOCALDIR;
-		boolean sendToRest = daemonRunning & localDirHandledInDaemonScope && needsToRunInInitializedScope;
+		boolean sendToRest = daemonRunning & localDirHandledInDaemonScope && needsToRunInInitializedScope && command.canExecuteInDaemonScope();
 
 		command.setOut(out);
 
@@ -385,12 +385,7 @@ private int sendToRest(Command command, String commandName, String[] commandArgs
 
 			// Create and send HTTP/REST request
 
-			if (command.getRequiredCommandScope() == CommandScope.INITIALIZED_LOCALDIR) {
-				request = buildFolderRequestFromCommand(command, commandName, config.getLocalDir().getAbsolutePath());
-			}
-			else {
-				request = buildManagementRequestFromCommand(command, commandName);
-			}
+			request = buildFolderRequestFromCommand(command, commandName, config.getLocalDir().getAbsolutePath());
 
 			post.setEntity(new StringEntity(MessageFactory.toRequest(request)));
 
@@ -422,27 +417,8 @@ else if (response instanceof BadRequestResponse) {
 		}		
 	}
 
-	private Request buildManagementRequestFromCommand(Command command, String commandName) throws Exception {
-		String thisPackage = "org.syncany.operations.daemon.messages";
-		String camelCaseMessageType = StringUtil.toCamelCase(commandName) + "ManagementRequest";
-		String fqMessageClassName = thisPackage + "." + camelCaseMessageType;
-
-		// Try to load!
-		try {		
-			Class<? extends FolderRequest> message = Class.forName(fqMessageClassName).asSubclass(FolderRequest.class);
-			FolderRequest request = message.newInstance();
-			request.setId(new Random().nextInt());
-			request.setOptions(command.parseOptions(args));
-			return request;
-		} 
-		catch (Exception e) {
-			logger.log(Level.INFO, "Could not find FQCN " + fqMessageClassName, e);
-			throw new Exception("Cannot read request class from request type: " + commandName, e);
-		}		
-	}
-
 	private Request buildFolderRequestFromCommand(Command command, String commandName, String root) throws Exception {
-		String thisPackage = "org.syncany.operations.daemon.messages";
+		String thisPackage = Request.class.getName().replaceAll(".api", "");
 		String camelCaseMessageType = StringUtil.toCamelCase(commandName) + "FolderRequest";
 		String fqMessageClassName = thisPackage + "." + camelCaseMessageType;
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/ConnectCommand.java b/syncany-cli/src/main/java/org/syncany/cli/ConnectCommand.java
@@ -178,4 +178,9 @@ public OperationOptions parseOptions(String[] operationArgs) throws Exception {
 		// TODO Auto-generated method stub
 		return null;
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/DaemonCommand.java b/syncany-cli/src/main/java/org/syncany/cli/DaemonCommand.java
@@ -44,4 +44,9 @@ public void printResults(OperationResult result) {
 		// TODO Auto-generated method stub
 
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/DebugCommand.java b/syncany-cli/src/main/java/org/syncany/cli/DebugCommand.java
@@ -104,6 +104,10 @@ public OperationOptions parseOptions(String[] operationArgs) throws Exception {
 	@Override
 	public void printResults(OperationResult result) {
 		// TODO Auto-generated method stub
-
+	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		return false;
 	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java b/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java
@@ -112,4 +112,10 @@ public void printResults(OperationResult operationResult) {
 		}
 
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		// TODO [low] : right now only read commands in daemon scope
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/GenlinkCommand.java b/syncany-cli/src/main/java/org/syncany/cli/GenlinkCommand.java
@@ -65,4 +65,10 @@ public void printResults(OperationResult operationResult) {
 
 		printLink(concreteOperationREsut, commandOptions.isShortOutput());			
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		// TODO [low] : right now only read commands in daemon scope
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/InitCommand.java b/syncany-cli/src/main/java/org/syncany/cli/InitCommand.java
@@ -367,4 +367,9 @@ public String getString(CipherSpec cipherSpec) {
 
 		return cipherTransformerTO;
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/LsCommand.java b/syncany-cli/src/main/java/org/syncany/cli/LsCommand.java
@@ -235,4 +235,10 @@ private int calculateLongestValue(Map<String, FileVersion> fileVersions, Functio
 
 		return result;	
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		// TODO [low] : right now only read commands in daemon scope
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/LsRemoteCommand.java b/syncany-cli/src/main/java/org/syncany/cli/LsRemoteCommand.java
@@ -56,6 +56,11 @@ public OperationOptions parseOptions(String[] operationArgs) throws Exception {
 	@Override
 	public void printResults(OperationResult result) {
 		// TODO Auto-generated method stub
-
+	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		// TODO [low] : right now only read commands in daemon scope
+		return false;
 	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/PluginCommand.java b/syncany-cli/src/main/java/org/syncany/cli/PluginCommand.java
@@ -284,4 +284,10 @@ public void printResults(OperationResult result) {
 		// TODO Auto-generated method stub
 
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		// TODO [low] : right now only read commands in daemon scope
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/RestoreCommand.java b/syncany-cli/src/main/java/org/syncany/cli/RestoreCommand.java
@@ -98,4 +98,10 @@ public void printResults(OperationResult operationResult) {
 			throw new RuntimeException("Invalid result code: " + concreteOperationResult.getResultCode());	
 		}
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		// TODO [low] : right now only read commands in daemon scope
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/StatusCommand.java b/syncany-cli/src/main/java/org/syncany/cli/StatusCommand.java
@@ -80,4 +80,9 @@ public void printResults(OperationResult operationResult) {
 			out.println("No local changes.");
 		}
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		return true;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/UpCommand.java b/syncany-cli/src/main/java/org/syncany/cli/UpCommand.java
@@ -96,4 +96,10 @@ else if (concreteOperationResult.getResultCode() == UpResultCode.OK_CHANGES_UPLO
 			out.println("Sync up skipped, no local changes.");
 		}
 	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		// TODO [low] : right now only read commands in daemon scope
+		return false;
+	}
 }
diff --git a/syncany-cli/src/main/java/org/syncany/cli/WatchCommand.java b/syncany-cli/src/main/java/org/syncany/cli/WatchCommand.java
@@ -111,6 +111,11 @@ public OperationOptions parseOptions(String[] operationArgs) throws Exception {
 	@Override
 	public void printResults(OperationResult result) {
 		// TODO Auto-generated method stub
-
+	}
+
+	@Override
+	public boolean canExecuteInDaemonScope() {
+		// TODO [low] : right now only read commands in daemon scope
+		return false;
 	}
 }