Merge pull request #24 from kevbite/issue/23

Fixing issue with file paths including spaces

Author: kevbite

src/Kevsoft.PDFtk/PDFtk.cs

@@ -55,9 +55,16 @@ public async Task<IPDFtkResult<byte[]>> GetPagesAsync(string inputFile, params i
 
             var pageRanges = GetPageRangeArgs(pages);
 
-            var executeProcessResult = await _pdftkProcess.ExecuteAsync(inputFile, "cat",
-                string.Join(" ", pageRanges),
-                "output", outputFile.TempFileName);
+            var args = new List<string>(4 + pages.Length);
+            args.Add(inputFile);
+            args.Add("cat");
+
+            args.AddRange(pageRanges);
+            
+            args.Add("output");
+            args.Add(outputFile.TempFileName);
+
+            var executeProcessResult = await _pdftkProcess.ExecuteAsync(args.ToArray());
 
             return await ResolveSingleFileExecutionResultAsync(executeProcessResult, outputFile);
         }
@@ -117,10 +124,9 @@ public async Task<IPDFtkResult<byte[]>> ConcatAsync(IEnumerable<string> filePath
         {
             using var outputFile = TempPDFtkFile.Create();
 
-            var inputFileNames = string.Join(" ", filePaths);
-
             var executeProcessResult =
-                await _pdftkProcess.ExecuteAsync(inputFileNames, "cat", "output", outputFile.TempFileName);
+                await _pdftkProcess.ExecuteAsync(filePaths.Concat(new[] { "cat", "output", outputFile.TempFileName })
+                    .ToArray());
 
             return await ResolveSingleFileExecutionResultAsync(executeProcessResult, outputFile);
         }
@@ -142,8 +148,7 @@ public async Task<IPDFtkResult<IReadOnlyCollection<KeyValuePair<string, byte[]>>
         public async Task<IPDFtkResult<byte[]>> StampAsync(string pdfFilePath, string stampPdfFilePath)
         {
             using var outputFile = TempPDFtkFile.Create();
-
-
+            
             var executeProcessResult = await _pdftkProcess.ExecuteAsync(pdfFilePath,
                 "multistamp", stampPdfFilePath,
                 "output", outputFile.TempFileName);

src/Kevsoft.PDFtk/PDFtkProcess.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -14,12 +15,13 @@ public PDFtkProcess(PDFtkOptions options)
 
         internal async Task<ExecutionResult> ExecuteAsync(params string[] args)
         {
+            var arguments = BuildArguments(args);
             var process = new Process
             {
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = _options.PDFtkPath,
-                    Arguments = string.Join(" ", args),
+                    Arguments = arguments,
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
@@ -41,6 +43,15 @@ internal async Task<ExecutionResult> ExecuteAsync(params string[] args)
             return new ExecutionResult(process.ExitCode, standardOutput, standardError);
         }
 
+        private static string BuildArguments(string[] args)
+        {
+            return string.Join(" ", args.Select(x => x switch
+            {
+                { } value when value.Contains(" ") => $"\"{x}\"",
+                _ => x
+            }));
+        }
+
         private static async Task<string> GetAllStreamAsync(StreamReader stream)
         {
             var stringBuilder = new StringBuilder();

test/Kevsoft.PDFtk.Tests/NumberOfPagesTests.cs

@@ -16,30 +16,52 @@ public async Task ShouldReturnSuccessAndCorrectTotalNumberOfPages_ForInputFileAs
             var pdfFileBytes = await File.ReadAllBytesAsync(TestFiles.TestFile1Path);
 
             var result = await _pdFtk.GetNumberOfPagesAsync(pdfFileBytes);
-                
+
             result.Success.Should().BeTrue();
             result.Result.Should().Be(10);
         }
-        
+
         [Fact]
         public async Task ShouldReturnSuccessAndCorrectTotalNumberOfPages_ForInputFileFilePath()
         {
             var result = await _pdFtk.GetNumberOfPagesAsync(TestFiles.TestFile1Path);
-                
+
             result.Success.Should().BeTrue();
             result.Result.Should().Be(10);
         }
-        
+
+        [Fact]
+        public async Task ShouldReturnSuccessAndCorrectTotalNumberOfPages_ForInputFileFilePathWithSpaces()
+        {
+            var path = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+            try
+            {
+                Directory.CreateDirectory(path);
+
+                var pdfFilePath = Path.Combine(path, "file with spaces.pdf");
+                File.Copy(TestFiles.TestFile1Path, pdfFilePath);
+
+                var result = await _pdFtk.GetNumberOfPagesAsync(pdfFilePath);
+
+                result.Success.Should().BeTrue();
+                result.Result.Should().Be(10);
+            }
+            finally
+            {
+                Directory.Delete(path, true);
+            }
+        }
+
         [Fact]
         public async Task ShouldReturnSuccessAndCorrectTotalNumberOfPages_ForStream()
         {
             await using var stream = File.OpenRead(TestFiles.TestFile1Path);
             var result = await _pdFtk.GetNumberOfPagesAsync(stream);
-                
+
             result.Success.Should().BeTrue();
             result.Result.Should().Be(10);
         }
-        
+
         [Fact]
         public async Task ShouldReturnUnsuccessfulAndNullResult()
         {
@@ -49,4 +71,4 @@ public async Task ShouldReturnUnsuccessfulAndNullResult()
             result.Result.Should().BeNull();
         }
     }
-}
+}