Merge pull request #7 from easymorph/ver.1.3

Ver.1.3
easymorph · Oct 16, 2018 · 3ed9d6f · 3ed9d6f
2 parents 2eac160 + be99fdf
commit 3ed9d6f
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 23 deletions.
diff --git a/src/Client/IMorphServerApiClient.cs b/src/Client/IMorphServerApiClient.cs
@@ -25,6 +25,7 @@ public interface IMorphServerApiClient
         Task<RunningTaskStatus> StartTaskAsync(ApiSession apiSession, Guid taskId, CancellationToken cancellationToken, IEnumerable<TaskParameterBase> taskParameters = null);
         Task StopTaskAsync(ApiSession apiSession, Guid taskId, CancellationToken cancellationToken);
         Task UploadFileAsync(ApiSession apiSession, Stream inputStream, string fileName, long fileSize, string destFolderPath, CancellationToken cancellationToken, bool overwriteFileifExists = false);
+        Task UploadFileAsync(ApiSession apiSession, string localFilePath, string destFolderPath, string destFileName, CancellationToken cancellationToken, bool overwriteFileifExists = false);        
         Task UploadFileAsync(ApiSession apiSession, string localFilePath, string destFolderPath, CancellationToken cancellationToken, bool overwriteFileifExists = false);
         Task<ValidateTasksResult> ValidateTasksAsync(ApiSession apiSession, string projectPath, CancellationToken cancellationToken);
         Task<SpacesList> GetSpacesListAsync(CancellationToken cancellationToken);

diff --git a/src/Client/MorphServerApiClient.cs b/src/Client/MorphServerApiClient.cs
@@ -190,7 +190,7 @@ public async Task<RunningTaskStatus> StartTaskAsync(ApiSession apiSession, Guid
             using (var response = await GetHttpClient().SendAsync(BuildHttpRequestMessage(HttpMethod.Post, url, request, apiSession), cancellationToken))
             {
                 var info = await HandleResponse<RunningTaskStatusDto>(response);
-                return RunningTaskStatusMapper.RunningTaskStatusFromDto(info);                
+                return RunningTaskStatusMapper.RunningTaskStatusFromDto(info);
             }
 
         }
@@ -363,6 +363,13 @@ public async Task DownloadFileAsync(ApiSession apiSession, string remoteFilePath
 
                             while (true)
                             {
+                                // cancel download if cancellation token triggered
+                                if (cancellationToken.IsCancellationRequested)
+                                {
+                                    fileProgress.ChangeState(FileProgressState.Cancelled);
+                                    throw new OperationCanceledException();
+                                }
+
                                 var length = await streamToReadFrom.ReadAsync(buffer, 0, buffer.Length);
                                 if (length <= 0) break;
                                 await streamToWriteTo.WriteAsync(buffer, 0, length);
@@ -373,6 +380,7 @@ public async Task DownloadFileAsync(ApiSession apiSession, string remoteFilePath
                                     fileProgress.ChangeState(FileProgressState.Processing);
                                     lastUpdate = DateTime.Now;
                                 }
+
                             }
 
                             fileProgress.ChangeState(FileProgressState.Finishing);
@@ -420,6 +428,38 @@ public async Task UploadFileAsync(ApiSession apiSession, string localFilePath, s
         }
 
 
+        /// <summary>
+        /// Uploads local file to the server folder. 
+        /// </summary>
+        /// <param name="apiSession">api session</param>
+        /// <param name="localFilePath">path to the local file</param>
+        /// <param name="destFolderPath">destination folder like /path/to/folder </param>
+        /// <param name="destFileName">destination filename. If it's empty then original file name will be used</param>
+        /// <param name="cancellationToken">cancellation token</param>
+        /// <param name="overwriteFileifExists">overwrite file</param>
+        /// <returns></returns>
+        public async Task UploadFileAsync(ApiSession apiSession, string localFilePath, string destFolderPath, string destFileName, CancellationToken cancellationToken, bool overwriteFileifExists = false)
+        {
+            if (apiSession == null)
+            {
+                throw new ArgumentNullException(nameof(apiSession));
+            }
+
+            if (!File.Exists(localFilePath))
+            {
+                throw new FileNotFoundException(string.Format("File '{0}' not found", localFilePath));
+            }
+            var fileName = String.IsNullOrWhiteSpace(destFileName)? Path.GetFileName(localFilePath):  destFileName;
+            var fileSize = new FileInfo(localFilePath).Length;            
+            using (var fsSource = new FileStream(localFilePath, FileMode.Open, FileAccess.Read))
+            {
+                await UploadFileAsync(apiSession, fsSource, fileName, fileSize, destFolderPath, cancellationToken, overwriteFileifExists);
+                return;
+            }
+
+        }
+
+
         protected HttpRequestMessage BuildHttpRequestMessage(HttpMethod httpMethod, string url, HttpContent content, ApiSession apiSession)
         {
             var requestMessage = new HttpRequestMessage()
@@ -464,20 +504,21 @@ public async Task UploadFileAsync(ApiSession apiSession, Stream inputStream, str
                 {
                     var downloadProgress = new FileProgress(fileName, fileSize);
                     downloadProgress.StateChanged += DownloadProgress_StateChanged;
-                    using (var streamContent = new ProgressStreamContent(inputStream, downloadProgress))
+                    using (cancellationToken.Register(() => downloadProgress.ChangeState(FileProgressState.Cancelled)))
                     {
-                        content.Add(streamContent, "files", Path.GetFileName(fileName));
-
-                        var requestMessage = BuildHttpRequestMessage(overwriteFileifExists ? HttpMethod.Put : HttpMethod.Post, url, content, apiSession);
-                        using (requestMessage)
+                        using (var streamContent = new ProgressStreamContent(inputStream, downloadProgress))
                         {
-                            using (var response = await GetHttpClient().SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, cancellationToken))
+                            content.Add(streamContent, "files", Path.GetFileName(fileName));
+
+                            var requestMessage = BuildHttpRequestMessage(overwriteFileifExists ? HttpMethod.Put : HttpMethod.Post, url, content, apiSession);
+                            using (requestMessage)
                             {
-                                await HandleResponse(response);
+                                using (var response = await GetHttpClient().SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, cancellationToken))
+                                {
+                                    await HandleResponse(response);
+                                }
                             }
                         }
-
-
                     }
                 }
             }

diff --git a/src/Helper/FileProgress.cs b/src/Helper/FileProgress.cs
@@ -22,18 +22,15 @@ internal class FileProgress : IFileProgress
         public void ChangeState(FileProgressState state)
         {
             State = state;
-            if (StateChanged != null)
+            StateChanged?.Invoke(this, new FileEventArgs
             {
-                StateChanged(this, new FileEventArgs
-                {
-                    ProcessedBytes = ProcessedBytes,
-                    State = state,
-                    Guid = _guid,
-                    FileName = FileName,
-                    FileSize = FileSize
+                ProcessedBytes = ProcessedBytes,
+                State = state,
+                Guid = _guid,
+                FileName = FileName,
+                FileSize = FileSize
 
-                });
-            }
+            });
         }
         public void SetProcessedBytes(long np)
         {

diff --git a/src/Model/FileProgressState.cs b/src/Model/FileProgressState.cs
@@ -10,6 +10,7 @@ public enum FileProgressState
     {
         Starting,
         Processing,
-        Finishing
+        Finishing,
+        Cancelled
     }
 }
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -21,5 +21,5 @@
 [assembly: Guid("72ecc66f-62fe-463f-afad-e1ff5cc19cd9")]
 
 
-[assembly: AssemblyVersion("1.3.2.3")]
-[assembly: AssemblyFileVersion("1.3.2.3")]
+[assembly: AssemblyVersion("1.3.4.1")]
+[assembly: AssemblyFileVersion("1.3.4.1")]