Add configuration option to hide server commands from console and his…

…tory.
paulscherrerinstitute · Mar 18, 2019 · b9f5941 · b9f5941
1 parent 4c152e2
commit b9f5941
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/main/java/ch/psi/pshell/core/CommandSource.java b/src/main/java/ch/psi/pshell/core/CommandSource.java
@@ -25,4 +25,8 @@ public boolean isLocal() {
     public boolean isRemote() {
         return (this == terminal) || (this == server);
     }
+
+    public boolean isDisplayable(){
+     return !this.isRemote() || !Context.getInstance().getConfig().hideServerMessages;
+    }
 }
diff --git a/src/main/java/ch/psi/pshell/core/Configuration.java b/src/main/java/ch/psi/pshell/core/Configuration.java
@@ -33,6 +33,7 @@ public class Configuration extends Config {
     public boolean dataScanPreserveTypes = false;
     public boolean commandExecutionEvents = false;
     public String hostName;
+    public boolean hideServerMessages = false;
     public String logPath = TOKEN_LOGS + "/" + TOKEN_DATE + "_" + TOKEN_TIME;
     public int logDaysToLive = -1;
     public LogLevel logLevel = LogLevel.Info;

diff --git a/src/main/java/ch/psi/pshell/core/Context.java b/src/main/java/ch/psi/pshell/core/Context.java
@@ -1254,7 +1254,9 @@ Object evalLine(final CommandSource source, final String command) throws ScriptE
         } finally {
             try {
                 if (!command.trim().isEmpty()) {
-                    history.put(command);
+                    if (source.isDisplayable()){      
+                        history.put(command);
+                    }
                 }
             } catch (Exception ex) {
             }

diff --git a/src/main/java/ch/psi/pshell/swing/Shell.java b/src/main/java/ch/psi/pshell/swing/Shell.java
@@ -87,16 +87,20 @@ public boolean getPropagateVariableEvaluation() {
     final ContextListener contextListener = new ContextAdapter() {
         @Override
         public void onShellCommand(CommandSource source, String command) {
-            output.append(Context.getInstance().getCursor(command) + command + "\n", (source == CommandSource.ui) ? INPUT_COLOR : REMOTE_COLOR);
+            if (source.isDisplayable()){
+                output.append(Context.getInstance().getCursor(command) + command + "\n", (source == CommandSource.ui) ? INPUT_COLOR : REMOTE_COLOR);
+            }
         }
 
         @Override
         public void onShellResult(CommandSource source, Object result) {
             if (result != null) {
-                if (result instanceof Throwable) {
-                    output.append(Console.getPrintableMessage((Throwable) result) + "\n", ERROR_COLOR);
-                } else {
-                    output.append(String.valueOf(result) + "\n", OUTPUT_COLOR);
+                if (source.isDisplayable()){               
+                    if (result instanceof Throwable) {
+                        output.append(Console.getPrintableMessage((Throwable) result) + "\n", ERROR_COLOR);
+                    } else {
+                        output.append(String.valueOf(result) + "\n", (source == CommandSource.ui) ? OUTPUT_COLOR : REMOTE_COLOR);
+                    }
                 }
             }
         }