Merge pull request #133 from dotnet/client-fixes

Client fixes
dotnet · Oct 31, 2019 · 0ffbafb · 0ffbafb
2 parents 497d23c + dfc1346
commit 0ffbafb
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/src/SignClient/SignCommand.cs b/src/SignClient/SignCommand.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -90,7 +91,9 @@ CommandOption maxConcurrency
                 List<FileInfo> inputFiles;
                 // If we're going to glob, we can't be fully rooted currently (fix me later)
 
-                if(inputFile.Value().Contains('*'))
+                var isGlob = inputFile.Value().Contains('*');
+
+                if (isGlob)
                 {
                     if(Path.IsPathRooted(inputFile.Value()))
                     {
@@ -169,14 +172,25 @@ CommandOption maxConcurrency
                 {
                     FileInfo output;
 
+                    var sw = Stopwatch.StartNew();
+
                     // Special case if there's only one input file and the output has a value, treat it as a file
                     if(inputFiles.Count == 1 && outputFile.HasValue())
-                    {                        
-                        output = new FileInfo(ExpandFilePath(outputFile.Value()));
+                    {
+                        // See if it has a file extension and if not, treat as a directory and use the input file name
+                        var outFileValue = outputFile.Value();
+                        if(Path.HasExtension(outFileValue))
+                        {
+                            output = new FileInfo(ExpandFilePath(outputFile.Value()));
+                        }
+                        else
+                        {
+                            output = new FileInfo(Path.Combine(ExpandFilePath(outFileValue), inputFiles[0].Name));
+                        }                        
                     }
                     else
                     {
-                        // if the output is speciied, treat it as a directory, if not, overwrite the current file
+                        // if the output is specified, treat it as a directory, if not, overwrite the current file
                         if(!outputFile.HasValue())
                         {
                             output = new FileInfo(input.FullName);
@@ -226,7 +240,7 @@ CommandOption maxConcurrency
                     using var fs = new FileStream(output.FullName, FileMode.Create);
                     str.CopyTo(fs);
 
-                    signCommandLineApplication.Out.WriteLine($"Successfully signed '{input.FullName}'");
+                    signCommandLineApplication.Out.WriteLine($"Successfully signed '{output.FullName}' in {sw.ElapsedMilliseconds} ms");
                 });