Merge pull request #16 from easymorph/development/5.5.0

 server-cmd 5.5.0

Author: strongtigerman

src/BusinessLogic/Commands/BrowseFilesCommand.cs

@@ -2,10 +2,6 @@
 using Morph.Server.Sdk.Model;
 using MorphCmd.Interfaces;
 using MorphCmd.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace MorphCmd.BusinessLogic.Commands

src/BusinessLogic/Commands/CommandsFactory.cs

@@ -27,6 +27,8 @@ public static ICommand Construct(Command command, IOutputEndpoint output, IInput
                     return new UploadFileCommand(output, input, apiClient);
                 case Command.Browse:
                     return new BrowseFilesCommand(output, input, apiClient);
+                case Command.FilesSearch:
+                    return new QuickFilesSearchCommand(output, input, apiClient);
                 case Command.Del:
                     return new DeleteFileCommand(output, input, apiClient);
                 case Command.Download:

src/BusinessLogic/Commands/DownloadFileCommand.cs

@@ -55,7 +55,10 @@ public async Task Execute(Parameters parameters)
                     }
                     else if (e.State == FileProgressState.Processing)
                     {
-                        progress.Report(e.Percent / 100);
+                        if (e.Percent.HasValue)
+                        {
+                            progress.Report(e.Percent.Value / 100);
+                        }
                     }
                     else if (e.State == FileProgressState.Finishing)
                     {

src/BusinessLogic/Commands/QuickFilesSearchCommand.cs

@@ -0,0 +1,67 @@
+using Morph.Server.Sdk.Client;
+using Morph.Server.Sdk.Model;
+using MorphCmd.Interfaces;
+using MorphCmd.Models;
+using System.Threading.Tasks;
+
+namespace MorphCmd.BusinessLogic.Commands
+{
+    internal class QuickFilesSearchCommand : BaseCommand, ICommand
+    {
+        public QuickFilesSearchCommand(IOutputEndpoint output, IInputEndpoint input, IMorphServerApiClient apiClient) : base(output, input, apiClient)
+        {
+
+        }
+
+        public bool IsApiSessionRequired => true;
+
+        public async Task Execute(Parameters parameters)
+        {
+            if (string.IsNullOrWhiteSpace(parameters.Location))
+            {
+                _output.WriteInfo("Searching in the root folder of the space " + parameters.SpaceName);
+            }
+            else
+            {
+                _output.WriteInfo("Searching in the folder '" + parameters.Location + "' of the space " + parameters.SpaceName);
+            }
+
+            using (var apiSession = await OpenSession(parameters))
+            {
+
+                var request = new SpaceFilesQuickSearchRequest
+                {
+                    FolderPath = parameters.Location,
+                    LookupString = parameters.LookupString,
+                    FileExtensions = parameters.FileExtensions == null ?
+                                      null :
+                                        (parameters.FileExtensions).Split(';')
+                };
+                var data = await _apiClient.SpaceFilesQuickSearchAsync(
+                    apiSession,
+                    request,
+                    _cancellationTokenSource.Token,
+                    parameters.Offset,
+                    parameters.Limit
+                    );
+
+
+                foreach (var folder in data.Values)
+                {
+                    _output.WriteInfo(folder.Path);
+                    _output.WriteInfo(string.Format("{0}{1} {2}", folder.LastModified.ToLocalTime().ToString("MM/dd/yyyy hh:mm:ss tt").PadRight(30), "<DIR>".PadRight(16), folder.Name));
+
+                    foreach (var file in folder.Files)
+                    {
+                        _output.WriteInfo(string.Format("{0}{1} {2}", file.LastModified.ToLocalTime().ToString("MM/dd/yyyy hh:mm:ss tt").PadRight(30), file.FileSizeBytes.ToString("n0").PadLeft(16), file.Name));
+                    }
+                }
+
+                _output.WriteInfo(data.HasMore ? "Has more data" : "Has no more data");
+
+                _output.WriteInfo("Listing done");
+            }
+
+        }
+    }
+}

src/BusinessLogic/Commands/UploadFileCommand.cs

@@ -57,7 +57,10 @@ public async Task Execute(Parameters parameters)
                 }
                 else if (e.State == FileProgressState.Processing)
                 {
-                    progress.Report(e.Percent / 100);
+                    if (e.Percent.HasValue)
+                    {
+                        progress.Report(e.Percent.Value / 100);
+                    }
                 }
                 else if (e.State == FileProgressState.Finishing)
                 {

src/BusinessLogic/ParametersHelper.cs

@@ -27,6 +27,24 @@ public static Parameters ExtractParameters(string command, string host, Dictiona
 
             if (paramsDict.ContainsKey("location"))
                 parameters.Location = paramsDict["location"];
+            if (paramsDict.ContainsKey("lookup-string"))
+                parameters.LookupString = paramsDict["lookup-string"];
+            if (paramsDict.ContainsKey("file-extensions"))
+                parameters.FileExtensions = paramsDict["file-extensions"];
+            if (paramsDict.ContainsKey("offset"))
+            {
+                if(int.TryParse(paramsDict["offset"], out var offset)){
+                    parameters.Offset = offset;
+                }
+            }
+
+            if (paramsDict.ContainsKey("limit"))
+            {
+                if (int.TryParse(paramsDict["limit"], out var limit)){
+                    parameters.Limit = limit;
+                }
+            }
+
 
             if (paramsDict.ContainsKey("y"))
                 parameters.YesToAll = true;

src/Models/Command.cs

@@ -14,6 +14,7 @@ public enum Command
         Status,
         Upload,
         Browse,
+        FilesSearch,
         Download,
         Del,
         ValidateTasks,

src/Models/Parameters.cs

@@ -14,8 +14,14 @@ public class Parameters
         public string SpaceName { get; set; }
         public string Source { get; set; }
         public string Target { get; set; }
+
+        public string LookupString { get; set; }
+        public string FileExtensions { get; set; }
         public string Location { get; set; }
-        
+
+        public int? Offset { get; set; }
+        public int? Limit { get; set; }
+
         public Guid? TaskId { get; set; }
         public bool YesToAll { get; set; }
         public string Host { get; set; }