Browse Source

refactoring

pull/22922/head
SALİH ÖZKARA 8 months ago
parent
commit
a600e468de
  1. 1
      modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj
  2. 2
      modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj
  3. 2
      modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationModule.cs
  4. 4
      modules/docs/src/Volo.Docs.Common.HttpApi/Volo/Docs/Documents/DocsDocumentPdfController.cs
  5. 2
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/IHtmlToPdfRenderer.cs
  6. 5
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/IText/ITextHtmlToPdfRenderer.cs
  7. 4
      modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/ProjectPdfGenerator.cs

1
modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj

@ -43,6 +43,7 @@
<ProjectReference Include="..\..\..\..\modules\account\src\Volo.Abp.Account.Web\Volo.Abp.Account.Web.csproj" />
<ProjectReference Include="..\..\..\..\modules\account\src\Volo.Abp.Account.Application\Volo.Abp.Account.Application.csproj" />
<ProjectReference Include="..\..\..\..\modules\account\src\Volo.Abp.Account.HttpApi\Volo.Abp.Account.HttpApi.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.BackgroundJobs\Volo.Abp.BackgroundJobs.csproj" />
</ItemGroup>

2
modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.csproj

@ -17,7 +17,7 @@
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.BackgroundJobs\Volo.Abp.BackgroundJobs.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.BackgroundJobs.Abstractions\Volo.Abp.BackgroundJobs.Abstractions.csproj" />
</ItemGroup>
</Project>

2
modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/DocsAdminApplicationModule.cs

@ -15,7 +15,7 @@ namespace Volo.Docs.Admin
typeof(AbpCachingModule),
typeof(AbpAutoMapperModule),
typeof(AbpDddApplicationModule),
typeof(AbpBackgroundJobsModule)
typeof(AbpBackgroundJobsAbstractionsModule)
)]
public class DocsAdminApplicationModule : AbpModule
{

4
modules/docs/src/Volo.Docs.Common.HttpApi/Volo/Docs/Documents/DocsDocumentPdfController.cs

@ -23,14 +23,14 @@ public class DocsDocumentPdfController : DocsControllerBase, IDocumentPdfAppServ
[HttpGet]
[Route("download")]
public Task<IRemoteStreamContent> DownloadPdfAsync(DocumentPdfGeneratorInput input)
public virtual Task<IRemoteStreamContent> DownloadPdfAsync(DocumentPdfGeneratorInput input)
{
return DocumentPdfAppService.DownloadPdfAsync(input);
}
[HttpGet]
[Route("exists")]
public Task<bool> ExistsAsync(DocumentPdfGeneratorInput input)
public virtual Task<bool> ExistsAsync(DocumentPdfGeneratorInput input)
{
return DocumentPdfAppService.ExistsAsync(input);
}

2
modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/IHtmlToPdfRenderer.cs

@ -6,5 +6,5 @@ namespace Volo.Docs.Projects.Pdf;
public interface IHtmlToPdfRenderer
{
Stream Render(string title, string html, List<PdfDocument> documents);
Task<Stream> RenderAsync(string title, string html, List<PdfDocument> documents);
}

5
modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/IText/ITextHtmlToPdfRenderer.cs

@ -8,7 +8,6 @@ using iText.Kernel.Pdf.Action;
using Microsoft.Extensions.Options;
using Volo.Abp.DependencyInjection;
using Volo.Docs.Utils;
using ITextDocument = iText.Layout.Document;
namespace Volo.Docs.Projects.Pdf.IText;
@ -21,7 +20,7 @@ public class ITextHtmlToPdfRenderer : IHtmlToPdfRenderer, ITransientDependency
Options = options;
}
public virtual Stream Render(string title, string html, List<PdfDocument> documents)
public virtual Task<Stream> RenderAsync(string title, string html, List<PdfDocument> documents)
{
var pdfStream = new MemoryStream();
using (var pdfWriter = new PdfWriter(pdfStream))
@ -36,7 +35,7 @@ public class ITextHtmlToPdfRenderer : IHtmlToPdfRenderer, ITransientDependency
}
pdfStream.Position = 0;
return pdfStream;
return Task.FromResult<Stream>(pdfStream);
}
private void CreatePdfFromHtml(string html, iText.Kernel.Pdf.PdfDocument pdfDocument)

4
modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/Pdf/ProjectPdfGenerator.cs

@ -73,7 +73,7 @@ public class ProjectPdfGenerator : IProjectPdfGenerator, ITransientDependency
var chunkHtml = await BuildHtmlAsync([document]);
var pdfStream = HtmlToPdfRenderer.Render($"{title} - Part {document.Title}", chunkHtml, [document]);
var pdfStream = await HtmlToPdfRenderer.RenderAsync($"{title} - Part {document.Title}", chunkHtml, [document]);
Logger.LogInformation("Chunk {Index} rendered to PDF", i + 1);
@ -103,8 +103,6 @@ public class ProjectPdfGenerator : IProjectPdfGenerator, ITransientDependency
finally
{
AllPdfDocuments.Clear();
GC.Collect();
GC.WaitForPendingFinalizers();
}
}

Loading…
Cancel
Save