Fixed file parameters handling.

Author: paulius-petkus

ConvertApi.Cli.Tests/DirectCallTests.cs

@@ -20,7 +20,7 @@ public void Setup()
     [Test]
     public async Task TestConvertPdfToDocx()
     {
-        var outputFile = Path.Combine(TestOutputDir, "simple.docx");
+        var outputFile = Path.Combine(TestOutputDir, "simple2.docx");
         var inputFile = Path.Combine(Directory.GetCurrentDirectory(), "../../../../", "test_files", "simple.pdf");
 
         await Program.Main([ApiToken, outputFile, inputFile]);
@@ -65,6 +65,18 @@ public async Task TestAddWatermarkToPdf()
         Assert.IsTrue(File.Exists(outputFile), "Output file was not created.");
     }
 
+    [Test]
+    public async Task TestAddWatermarkOverlayToPdf()
+    {
+        var outputFile = Path.Combine(TestOutputDir, "watermarkOverlay.pdf");
+        var inputFile = Path.Combine(Directory.GetCurrentDirectory(), "../../../../", "test_files", "simple.pdf");
+        var overlayFile = Path.Combine(Directory.GetCurrentDirectory(), "../../../../", "test_files", "simple.pdf");
+    
+        await Program.Main([ApiToken, TestOutputDir, inputFile, "pdf", "watermark-overlay", "FileName=watermarkOverlay", $"OverlayFile={overlayFile}"]);
+    
+        Assert.IsTrue(File.Exists(outputFile), "Output file was not created.");
+    }
+    
     [Test]
     public async Task TestProtectPdfWithPassword()
     {

ConvertApi.Cli/Program.cs

@@ -17,7 +17,7 @@ public static async Task Main(string[] args)
             DisplayHelp();
             return;
         }
-        
+
         // Replacing null values with empty string to avoid unexpected behaviour.
         args = args.Select(s => s ?? "").ToArray();
 
@@ -31,15 +31,15 @@ public static async Task Main(string[] args)
             : args.Length - parametersCount;
 
         string[] inputFiles = args.Skip(2).Take(inputFilesEndIndex - 2).ToArray();
-        
+
         string fromFormat = args.Length > inputFilesEndIndex
             ? args[^(2 + parametersCount)] // Second-to-last argument - parameters with '='
             : Path.GetExtension(inputFiles[0]).Trim('.').ToLower(); // Infer from first input file
 
         string toFormat = args.Length > inputFilesEndIndex + 1
             ? args[^(1 + parametersCount)] // Last argument - parameters with '='
             : Path.GetExtension(outputDirectoryOrFile).Trim('.').ToLower(); // Infer from output file
-        
+
         ValidateInputFiles(inputFiles, fromFormat);
 
         // Extract dynamic properties
@@ -59,13 +59,13 @@ private static void ValidateInputFiles(string[] inputFiles, string fromFormat)
     {
         if (fromFormat == "web")
             return;
-            
+
         if (inputFiles.Length == 0)
         {
             Console.WriteLine("Error: At least one input file is required.");
             return;
         }
-        
+
         foreach (var file in inputFiles)
         {
             if (!File.Exists(file))
@@ -120,29 +120,25 @@ static async Task ConvertFiles(string apiToken, string fromFormat, string toForm
             {
                 if (inputFiles.Length == 1)
                 {
-                    form.Add(new StreamContent(File.OpenRead(inputFiles[0]))
-                    {
-                        Headers = { ContentDisposition = new System.Net.Http.Headers.ContentDispositionHeaderValue("form-data") { Name = "file", FileName = Path.GetFileName(inputFiles[0]) } }
-                    });
+                    AddFilesToFormParameters(form, "file", inputFiles[0]);
                 }
                 else
                 {
                     int fileIndex = 0;
                     foreach (var inputFile in inputFiles)
                     {
-                        form.Add(new StreamContent(File.OpenRead(inputFile))
-                        {
-                            Headers =
-                            {
-                                ContentDisposition = new System.Net.Http.Headers.ContentDispositionHeaderValue("form-data") { Name = $"files[{fileIndex}]", FileName = Path.GetFileName(inputFile) }
-                            }
-                        });
+                        AddFilesToFormParameters(form, $"files[{fileIndex}]", inputFile);
                         fileIndex++;
                     }
                 }
             }
 
-            foreach (var property in properties)
+            foreach (var (filePropertyName, filePath) in properties.Where(x => x.Key.ToLower().EndsWith("file")))
+            {
+                AddFilesToFormParameters(form, filePropertyName, filePath);
+            }
+
+            foreach (var property in properties.Where(x => !x.Key.ToLower().EndsWith("file")))
             {
                 form.Add(new StringContent(property.Value), property.Key);
             }
@@ -186,13 +182,21 @@ static async Task ConvertFiles(string apiToken, string fromFormat, string toForm
         }
     }
 
+    private static void AddFilesToFormParameters(MultipartFormDataContent form, string parameterName,  string filePath)
+    {
+        form.Add(new StreamContent(File.OpenRead(filePath))
+        {
+            Headers = { ContentDisposition = new System.Net.Http.Headers.ContentDispositionHeaderValue("form-data") { Name = parameterName, FileName = Path.GetFileName(filePath) } }
+        });
+    }
+
     static string GetVersion()
     {
         var version = Assembly.GetExecutingAssembly()
             .GetName()
             .Version?
             .ToString() ?? "unknown";
-        
+
         return version;
     }
 }

README.md

@@ -116,17 +116,23 @@ convertapi-cli.exe YOUR_API_TOKEN output.docx input.pdf
 
 Merge multiple PDF files into one:
 ```shell
-convertapi-cli.exe YOUR_API_TOKEN merged_output.pdf file1.pdf file2.pdf file3.pdf pdf merge
+convertapi-cli.exe YOUR_API_TOKEN output_directory file1.pdf file2.pdf file3.pdf pdf merge
 ```
 
 Protect a PDF with a password:
 ```shell
-convertapi-cli.exe YOUR_API_TOKEN protected_output.pdf input.pdf pdf protect UserPassword=1234 OwnerPassword=abcd FileName=protected
+convertapi-cli.exe YOUR_API_TOKEN output_directory input.pdf pdf protect UserPassword=1234 OwnerPassword=abcd FileName=protected
 ```
 
 Add a watermark to a PDF:
 ```shell
-convertapi-cli.exe YOUR_API_TOKEN watermarked_output.pdf input.pdf pdf watermark Text=Confidential FileName=watermark
+convertapi-cli.exe YOUR_API_TOKEN output_directory input.pdf pdf watermark Text=Confidential FileName=watermark
+```
+
+Add watermark-overlay to a PDF:
+> **Note:** Overlay file path is added as parameter.
+```shell
+convertapi-cli.exe YOUR_API_TOKEN output_directory input.pdf pdf watermark-overlay OverlayFile=overlay-file.pdf FileName=watermarkResult
 ```