Piscal processing work

Core/Remote/PiscalSshClient.cs

@@ -4,6 +4,7 @@ using System.Data.Common;
 using System.IO;
 using System.Linq;
 using LeafWeb.Core.Utility;
+using NLog;
 using Renci.SshNet;
 
 namespace LeafWeb.Core.Remote
@@ -14,10 +15,11 @@ namespace LeafWeb.Core.Remote
 		private const string RemoteScriptPath = BaseDirectory + "/piscal_manager.sh";
 		private readonly PasswordConnectionInfo _connectionInfo;
 
-		private const string StatusSuccess = "success";
+		private const string StatusComplete = "complete";
 		private const string StatusRunning = "running";
 		private const string StatusNotStarted = "not started";
-		private const string StatusError = "error";
+
+		Logger _logger = LogManager.GetCurrentClassLogger();
 
 		public PiscalSshClient(string connectionString)
 		{
@@ -45,10 +47,10 @@ namespace LeafWeb.Core.Remote
 			using (var scp = GetScpClient())
 			foreach (var file in leafInput.InputFiles)
 			{
-				var inputPath = $"{directory}/{file.Filename}";
+				var inputPath = $"{directory}/input/{file.Filename}";
 				using (var stream = new MemoryStream(file.Contents))
 				{
-					Console.WriteLine(inputPath);
+					_logger.Trace("Copying " + inputPath);
 					scp.Connect();
 					scp.Upload(stream, inputPath);
 					scp.Disconnect();
@@ -66,8 +68,7 @@ namespace LeafWeb.Core.Remote
 			using (var ssh = GetSshClient())
 			{
 				ssh.Connect();
-				var commandText = $"{RemoteScriptPath} -d {leafInput.DirectoryName} -p {leafInput.PhotosyntheticType}";
-				Console.Write(commandText);
+				var commandText = $"{RemoteScriptPath} -d {leafInput.DirectoryName} -p {leafInput.PhotosyntheticType} -s";
 				var command = ssh.CreateCommand(commandText);
 				command.Execute();
 				ssh.Disconnect();
@@ -75,7 +76,7 @@ namespace LeafWeb.Core.Remote
 				if (command.ExitStatus != 0)
 					throw new PiscalClientException(command.Result);
 
-				Console.Write(command.Result);
+				_logger.Debug(command.Result);
 			}
 		}
 
@@ -87,12 +88,12 @@ namespace LeafWeb.Core.Remote
 			{
 				case StatusRunning:
 					return PiscalStatus.Running;
-				case StatusSuccess:
-					return PiscalStatus.Success;
+				case StatusComplete:
+					return PiscalStatus.Complete;
 				case StatusNotStarted:
 					return PiscalStatus.NotStarted;
 				default:
-					return PiscalStatus.Error;
+					throw new PiscalClientException("Unknown status: " + statusRaw[0]);
 			}
 		}
 
@@ -101,7 +102,7 @@ namespace LeafWeb.Core.Remote
 			using (var ssh = GetSshClient())
 			{
 				ssh.Connect();
-				var commandText = $"{RemoteScriptPath} -d {leafInput.DirectoryName} -s";
+				var commandText = $"{RemoteScriptPath} -d {leafInput.DirectoryName}";
 				var command = ssh.CreateCommand(commandText);
 				command.Execute();
 				ssh.Disconnect();
@@ -123,7 +124,7 @@ namespace LeafWeb.Core.Remote
 		{
 			// get output files
 			var status = GetLeafInputStatusRaw(leafInput);
-			if (status[0] != StatusSuccess)
+			if (status[0] != StatusComplete)
 				throw new PiscalClientException("output not available, status is " + status[0]);
 
 			var filePaths = status.Skip(1);
@@ -149,23 +150,9 @@ namespace LeafWeb.Core.Remote
 				scp.Disconnect();
 			}
 		}
-
-		public string GetErrorMessage(PiscalLeafInput leafInput)
-		{
-			var status = GetLeafInputStatusRaw(leafInput);
-			if (status[0] != StatusError)
-				return string.Empty;
-
-			var errorLines = status.Skip(1).ToArray();
-			return errorLines.Join(Environment.NewLine);
-		}
-
+		
 		public void CleanupLeafProcess(PiscalLeafInput leafInput)
 		{
-			var status = GetLeafInputStatusRaw(leafInput);
-			if (status[0] == StatusRunning)
-				throw new PiscalClientException("Trying to cleanup a running process");
-
 			using (var ssh = GetSshClient())
 			{
 				ssh.Connect();