Merge pull request #6 from easymorph/ver.1.3

Ver.1.3.4

Author: strongtigerman

src/BusinessLogic/Commands/BaseCommand.cs

@@ -19,6 +19,7 @@ internal abstract class BaseCommand
         protected readonly IInputEndpoint _input;
         protected readonly IMorphServerApiClient _apiClient;
         protected readonly CancellationTokenSource _cancellationTokenSource;
+        public CancellationTokenSource CancellationTokenSource { get => _cancellationTokenSource; }
 
         public BaseCommand(IOutputEndpoint output, IInputEndpoint input, IMorphServerApiClient apiClient)
         {

src/BusinessLogic/Commands/DownloadFileCommand.cs

@@ -62,6 +62,12 @@ public async Task Execute(Parameters parameters)
                         progress.Dispose();
                         progress = null;
                     }
+                    else if (e.State == FileProgressState.Cancelled)
+                    {                        
+                        progress.Dispose();
+                        progress = null;
+                        _output.WriteError("File download canceled.");
+                    }
 
                 };
 

src/BusinessLogic/Commands/RunTaskAndWaitCommand.cs

@@ -21,6 +21,7 @@ public RunTaskAndWaitCommand(IOutputEndpoint output, IInputEndpoint input, IMorp
         }
 
         public bool IsApiSessionRequired => true;
+        
 
         public async Task Execute(Parameters parameters)
         {            

src/BusinessLogic/Commands/UploadFileCommand.cs

@@ -64,7 +64,12 @@ public async Task Execute(Parameters parameters)
                     progress.Dispose();
                     progress = null;
                 }
-
+                else if(e.State == FileProgressState.Cancelled)
+                {                    
+                    progress.Dispose();
+                    progress = null;
+                    _output.WriteError("File upload canceled.");
+                }
             };
 
             using (var apiSession = await OpenSession(parameters))

src/BusinessLogic/CommandsHandler.cs

@@ -46,16 +46,25 @@ public async Task Handle(Parameters parameters)
                     parameters.SpaceName = "default";
                 }
 
+#if DEBUG
+                await Task.Factory.StartNew (async () => { try { await cmd.Execute(parameters); } catch (Exception ex) { Console.WriteLine(ex.Message); } });
+                Console.ReadLine();
+                cmd.CancellationTokenSource.Cancel();
+                Console.ReadLine();
+#else
                 await cmd.Execute(parameters);
+#endif
+
             }
+            
             catch (WrongCommandFormatException)
             {
                 _output.WriteError("Wrong command format");
 
                 RunUsageSamples.WriteCommadUsage(parameters.Command, _output);
 
                 throw;
-            }
+            }            
             finally
             {
                 apiSession?.Dispose();

src/Interfaces/ICommand.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace MorphCmd.Interfaces
@@ -12,6 +13,7 @@ namespace MorphCmd.Interfaces
     internal interface ICommand
     {
         Task Execute(Parameters parameters);
+        CancellationTokenSource CancellationTokenSource { get; }
 
     }
 }

src/Properties/AssemblyInfo.cs

@@ -8,7 +8,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ems-cmd")]
-[assembly: AssemblyCopyright("Copyright © EasyMorph Inc. 2017")]
+[assembly: AssemblyCopyright("Copyright © EasyMorph Inc. 2017-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -18,5 +18,5 @@
 [assembly: Guid("6e61eac0-2957-415d-89af-ea675fc244cb")]
 
 
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]