tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

update

pull/22922/head
SALİH ÖZKARA 8 months ago
parent
42edab3381
commit
3389f6b3e8
3 changed files with 22 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/IText/ITextHtmlToPdfRenderer.cs
  2. 71
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/ProjectPdfGenerator.cs
  3. 4
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/Puppeteer/PuppeteerHtmlToPdfRenderer.cs

47
modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/IText/ITextHtmlToPdfRenderer.cs
View File

@ -12,7 +12,7 @@ using ITextDocument = iText.Layout.Document;
namespace Volo.Docs.Projects.Pdf.IText;
public class ITextHtmlToPdfRenderer : IHtmlToPdfRenderer
public class ITextHtmlToPdfRenderer : IHtmlToPdfRenderer, ITransientDependency
{
protected IOptions<DocsProjectPdfGeneratorOptions> Options { get; }
@ -45,51 +45,6 @@ public class ITextHtmlToPdfRenderer : IHtmlToPdfRenderer
return Task.FromResult<Stream>(pdfStream);
}
public virtual async Task<MemoryStream> MergePdfFilesAsync(List<MemoryStream> pdfFiles, string title, bool disposeStreams = true)
{
var mergedStream = new MemoryStream();
var mergedPdfWriter = new PdfWriter(mergedStream);
var mergedPdfDocument = new iText.Kernel.Pdf.PdfDocument(mergedPdfWriter);
mergedPdfDocument.GetDocumentInfo().SetTitle(title);
mergedPdfWriter.SetCloseStream(false);
foreach (var pdfFile in pdfFiles)
{
try
{
using var reader = new PdfReader(pdfFile);
using var sourcePdf = new iText.Kernel.Pdf.PdfDocument(reader);
var pageCount = sourcePdf.GetNumberOfPages();
for (var i = 1; i <= pageCount; i++)
{
var page = sourcePdf.GetPage(i);
mergedPdfDocument.AddPage(page.CopyTo(mergedPdfDocument));
}
}
catch (Exception ex)
{
throw new Exception($"Error merging PDF file {pdfFile}: {ex.Message}", ex);
}
finally
{
try
{
await pdfFile.DisposeAsync();
}
catch
{
// Ignore any exceptions during disposal
}
}
}
mergedPdfDocument.Close();
mergedStream.Position = 0;
return mergedStream;
}
private void BuildPdfOutlines(PdfOutline parentOutline, List<PdfDocument> pdfDocumentNodes)
{
foreach (var pdfDocumentNode in pdfDocumentNodes)

71
modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/ProjectPdfGenerator.cs
View File

@ -30,9 +30,7 @@ public class ProjectPdfGenerator : IProjectPdfGenerator, ITransientDependency
protected IDocumentSource DocumentSource { get; set; }
protected DocumentParams DocumentParams { get; set; }
protected Project Project { get; set; }
protected List<PdfDocument> AllPdfDocuments { get; } = [];
protected int ChunkSize { get; set; } = 60;
protected List<PdfDocument> AllPdfDocuments { get; private set; } = [];
public ProjectPdfGenerator(
IDocumentSourceFactory documentStoreFactory,
@ -61,30 +59,31 @@ public class ProjectPdfGenerator : IProjectPdfGenerator, ITransientDependency
DocumentParams = await GetDocumentParamsAsync(project, version, languageCode);
var navigation = await GetNavigationAsync(project, version, languageCode);
AllPdfDocuments = new List<PdfDocument>();
await SetAllPdfDocumentsAsync(navigation.Items, project, version, languageCode);
var title = Options.Value.CalculatePdfFileTitle?.Invoke(project) ?? project.Name;
var tempStreams = new List<Stream>();
var tempStreams = new List<(PdfDocument pdfDocument, Stream stream)>();
try
{
var documentChunks = ChunkDocuments(AllPdfDocuments);
Logger.LogInformation("Documents split into {ChunkCount} chunks for processing", documentChunks.Count);
foreach (var (chunk, index) in documentChunks.Select((chunk, index) => (chunk, index)))
var index = 0;
foreach (var document in AllPdfDocuments)
{
try
{
Logger.LogInformation("Processing chunk {Index}/{Total}", index + 1, documentChunks.Count);
Logger.LogInformation("Processing chunk {Index}/{Total}", index + 1, AllPdfDocuments.Count);
var chunkHtml = await BuildHtmlAsync(chunk);
var chunkHtml = await BuildHtmlAsync([document]);
var pdfStream = await HtmlToPdfRenderer.RenderAsync($"{title} - Part {index + 1}", chunkHtml, chunk);
var pdfStream = await HtmlToPdfRenderer.RenderAsync($"{title} - Part {document.Title}", chunkHtml, [document]);
Logger.LogInformation("Chunk {Index} rendered to PDF", index + 1);
tempStreams.Add(pdfStream);
tempStreams.Add((document, pdfStream));
index++;
}
catch (Exception e)
{
@ -94,7 +93,7 @@ public class ProjectPdfGenerator : IProjectPdfGenerator, ITransientDependency
Logger.LogInformation("All chunks processed, merging PDF files");
var mergedPdfStream = await MergePdfFilesAsync(tempStreams, title, disposeStreams: true);
var mergedPdfStream = await MergePdfFilesAsync(tempStreams, title);
await ProjectPdfFileStore.SetAsync(project, version, languageCode, mergedPdfStream);
}
catch(Exception e)
@ -104,7 +103,7 @@ public class ProjectPdfGenerator : IProjectPdfGenerator, ITransientDependency
{
try
{
await tempStream.DisposeAsync();
await tempStream.stream.DisposeAsync();
}
catch
{
@ -119,34 +118,6 @@ public class ProjectPdfGenerator : IProjectPdfGenerator, ITransientDependency
}
}
protected virtual List<List<PdfDocument>> ChunkDocuments(List<PdfDocument> documents)
{
var flatDocuments = FlattenDocuments(documents);
return flatDocuments
.Select((doc, index) => new { doc, index })
.GroupBy(x => x.index / ChunkSize)
.Select(g => g.Select(x => x.doc).ToList())
.ToList();
}
protected virtual List<PdfDocument> FlattenDocuments(List<PdfDocument> documents)
{
var result = new List<PdfDocument>();
foreach (var document in documents)
{
result.Add(document);
if (document.HasChildren)
{
result.AddRange(FlattenDocuments(document.Children));
}
}
return result;
}
protected virtual async Task<string> BuildHtmlAsync(List<PdfDocument> pdfDocuments)
{
var htmlContent = await ConvertDocumentsToHtmlAsync(pdfDocuments);
@ -182,7 +153,7 @@ public class ProjectPdfGenerator : IProjectPdfGenerator, ITransientDependency
return contentBuilder.ToString();
}
protected virtual async Task<MemoryStream> MergePdfFilesAsync(List<Stream> pdfFiles, string title, bool disposeStreams = true)
protected virtual async Task<MemoryStream> MergePdfFilesAsync(List<(PdfDocument pdfDocument, Stream stream)> pdfFiles, string title)
{
if (pdfFiles.Count == 0)
{
@ -194,22 +165,18 @@ public class ProjectPdfGenerator : IProjectPdfGenerator, ITransientDependency
{
using var zipArchive = new ZipArchive(zipStream, ZipArchiveMode.Create, true);
var index = 0;
foreach (var pdfFile in pdfFiles)
foreach (var (doc, pdfFile) in pdfFiles)
{
if (pdfFile.CanSeek)
{
pdfFile.Position = 0;
}
var entry = zipArchive.CreateEntry($"{title}_{index}.pdf", CompressionLevel.Fastest);
var entry = zipArchive.CreateEntry($"{title}_{doc.Title}.pdf", CompressionLevel.Fastest);
await using var entryStream = entry.Open();
await pdfFile.CopyToAsync(entryStream);
if (disposeStreams)
{
await pdfFile.DisposeAsync();
}
index++;
await pdfFile.DisposeAsync();
}
}

4
modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/Puppeteer/PuppeteerHtmlToPdfRenderer.cs
View File

@ -7,7 +7,7 @@ using Volo.Abp.DependencyInjection;
namespace Volo.Docs.Projects.Pdf.Puppeteer;
public class PuppeteerHtmlToPdfRenderer : IHtmlToPdfRenderer, ITransientDependency
public class PuppeteerHtmlToPdfRenderer : IHtmlToPdfRenderer
{
public async Task<Stream> RenderAsync(string title, string html, List<PdfDocument> documents)
{
@ -16,7 +16,7 @@ public class PuppeteerHtmlToPdfRenderer : IHtmlToPdfRenderer, ITransientDependen
Browser = SupportedBrowser.Chromium
}.DownloadAsync();
await using var browser = await PuppeteerSharp.Puppeteer.LaunchAsync(new LaunchOptions { Headless = true, Timeout = 600000, Browser = SupportedBrowser.Chromium });
await using var browser = await PuppeteerSharp.Puppeteer.LaunchAsync(new LaunchOptions { Headless = false, Timeout = 600000, Browser = SupportedBrowser.Chromium });
await using var page = await browser.NewPageAsync();
await page.SetContentAsync(html, new NavigationOptions

Write Preview
Loading…
Cancel
Save