Split PdfAsync and PdfStreamAsync functionalities (#66)

Author: kblok

lib/PuppeteerSharp.Tests/Page/PdfTests.cs

@@ -22,10 +22,7 @@ public async Task ShouldBeAbleToSaveFile()
             }
 
             var page = await Browser.NewPageAsync();
-            await page.PdfAsync(new PdfOptions
-            {
-                Path = outputFile
-            });
+            await page.PdfAsync(outputFile);
 
             fileInfo = new FileInfo(outputFile);
             Assert.True(new FileInfo(outputFile).Length > 0);
@@ -41,7 +38,7 @@ public async Task ShouldDefaultToPrintInLetterFormat()
         {
             var page = await Browser.NewPageAsync();
 
-            var document = PdfReader.Open(await page.PdfAsync(), PdfDocumentOpenMode.ReadOnly);
+            var document = PdfReader.Open(await page.PdfStreamAsync(), PdfDocumentOpenMode.ReadOnly);
 
             Assert.Equal(1, document.Pages.Count);
             Assert.Equal(8.5, TruncateDouble(document.Pages[0].Width.Inch, 1));
@@ -53,7 +50,7 @@ public async Task ShouldSupportSettingCustomFormat()
         {
             var page = await Browser.NewPageAsync();
 
-            var document = PdfReader.Open(await page.PdfAsync(new PdfOptions
+            var document = PdfReader.Open(await page.PdfStreamAsync(new PdfOptions
             {
                 Format = "a4"
             }), PdfDocumentOpenMode.ReadOnly);
@@ -68,7 +65,7 @@ public async Task ShouldSupportSettingPaperWidthAndHeight()
         {
             var page = await Browser.NewPageAsync();
 
-            var document = PdfReader.Open(await page.PdfAsync(new PdfOptions
+            var document = PdfReader.Open(await page.PdfStreamAsync(new PdfOptions
             {
                 Width = "10in",
                 Height = "10in"
@@ -87,7 +84,7 @@ public async Task ShouldPrintMultiplePages()
             // Define width and height in CSS pixels.
             var width = 50 * 5 + 1;
             var height = 50 * 5 + 1;
-            var document = PdfReader.Open(await page.PdfAsync(new PdfOptions
+            var document = PdfReader.Open(await page.PdfStreamAsync(new PdfOptions
             {
                 Width = width,
                 Height = height
@@ -106,7 +103,7 @@ public async Task ShouldSupportPageRanges()
             // Define width and height in CSS pixels.
             var width = 50 * 5 + 1;
             var height = 50 * 5 + 1;
-            var document = PdfReader.Open(await page.PdfAsync(new PdfOptions
+            var document = PdfReader.Open(await page.PdfStreamAsync(new PdfOptions
             {
                 Width = width,
                 Height = height,
@@ -122,7 +119,7 @@ public async Task ShowThrowFormatIsUnknown()
             var page = await Browser.NewPageAsync();
             var exception = await Assert.ThrowsAsync<ArgumentException>(async () =>
             {
-                await page.PdfAsync(new PdfOptions
+                await page.PdfStreamAsync(new PdfOptions
                 {
                     Format = "something"
                 });
@@ -137,7 +134,7 @@ public async Task ShouldThrowIfUnitsAreUnknown()
             var page = await Browser.NewPageAsync();
             var exception = await Assert.ThrowsAsync<ArgumentException>(async () =>
             {
-                await page.PdfAsync(new PdfOptions
+                await page.PdfStreamAsync(new PdfOptions
                 {
                     Width = "10em"
                 });

lib/PuppeteerSharp.Tests/Page/ScreenshotTests.cs

@@ -188,7 +188,6 @@ public async Task ShouldRunInParallelInMultiplePages()
             for (var i = 0; i < n; i++)
             {
                 Assert.True(PixelMatch($"grid-cell-{i}.png", screenshotTasks[i].Result));
-
             }
 
             var closeTasks = new List<Task>();

lib/PuppeteerSharp.Tests/TestConstants.cs

@@ -19,7 +19,5 @@ public static class TestConstants
             { "timeout", 0},
             { "keepAliveInterval", 120}
         };
-
-
     }
 }

lib/PuppeteerSharp/Page.cs

@@ -304,9 +304,23 @@ await Task.WhenAll(
             return request?.Response;
         }
 
-        public async Task<Stream> PdfAsync() => await PdfAsync(new PdfOptions());
+        public async Task PdfAsync(string file) => await PdfAsync(file, new PdfOptions());
 
-        public async Task<Stream> PdfAsync(PdfOptions options)
+        public async Task PdfAsync(string file, PdfOptions options)
+        {
+            var stream = await PdfStreamAsync(options);
+
+            using (var fs = new FileStream(file, FileMode.Create, FileAccess.Write))
+            {
+                byte[] bytesInStream = new byte[stream.Length];
+                stream.Read(bytesInStream, 0, bytesInStream.Length);
+                fs.Write(bytesInStream, 0, bytesInStream.Length);
+            }
+        }
+
+        public async Task<Stream> PdfStreamAsync() => await PdfStreamAsync(new PdfOptions());
+
+        public async Task<Stream> PdfStreamAsync(PdfOptions options)
         {
             var paperWidth = 8.5m;
             var paperHeight = 11m;
@@ -357,33 +371,24 @@ public async Task<Stream> PdfAsync(PdfOptions options)
             });
 
             var buffer = Convert.FromBase64String(result.GetValue("data").Value<string>());
-
-            if (!string.IsNullOrEmpty(options.Path))
-            {
-                using (var fs = new FileStream(options.Path, FileMode.Create, FileAccess.Write))
-                {
-                    fs.Write(buffer, 0, buffer.Length);
-                }
-            }
-
             return new MemoryStream(buffer);
         }
 
         public async Task SetViewport(ViewPortOptions viewport)
         {
             var needsReload = await _emulationManager.EmulateViewport(_client, viewport);
             _viewport = viewport;
+
             if (needsReload)
             {
-                await Reload();
+                await ReloadAsync();
             }
         }
 
         public async Task ScreenshotAsync(string file) => await ScreenshotAsync(file, new ScreenshotOptions());
 
         public async Task ScreenshotAsync(string file, ScreenshotOptions options)
         {
-
             var fileInfo = new FileInfo(file);
             options.Type = fileInfo.Extension.Replace(".", string.Empty);
 
@@ -666,7 +671,7 @@ private void OnConsoleAPI(MessageEventArgs e)
             throw new NotImplementedException();
         }
 
-        private Task Reload()
+        private async Task ReloadAsync()
         {
             throw new NotImplementedException();
         }

lib/PuppeteerSharp/PdfOptions.cs

@@ -23,6 +23,5 @@ public PdfOptions()
         public object Width { get; set; }
         public object Height { get; set; }
         public MarginOptions MarginOptions { get; set; }
-        public string Path { get; set; }
     }
 }