Futa Arai 1 год назад
Родитель
Сommit
1a78cf9dd8

+ 1 - 1
apps/app/src/features/page-bulk-export/server/service/page-bulk-export-job-cron/index.ts

@@ -41,7 +41,7 @@ export interface IPageBulkExportJobCronService {
   removeStreamInExecution(jobId: ObjectIdLike): void;
   handleError(err: Error | null, pageBulkExportJob: PageBulkExportJobDocument): void;
   notifyExportResultAndCleanUp(action: SupportedActionType, pageBulkExportJob: PageBulkExportJobDocument): Promise<void>;
-  getTmpOutputDir(pageBulkExportJob: PageBulkExportJobDocument, isHtmlPath: boolean): string;
+  getTmpOutputDir(pageBulkExportJob: PageBulkExportJobDocument, isHtmlPath?: boolean): string;
 }
 
 /**

+ 2 - 1
apps/app/src/features/page-bulk-export/server/service/page-bulk-export-job-cron/steps/export-pages-to-fs-async.ts

@@ -28,6 +28,7 @@ async function convertMdToHtml(md: string, remarkHtml): Promise<string> {
  */
 function getPageWritable(this: IPageBulkExportJobCronService, pageBulkExportJob: PageBulkExportJobDocument): Writable {
   const isHtmlPath = pageBulkExportJob.format === PageBulkExportFormat.pdf;
+  const format = pageBulkExportJob.format === PageBulkExportFormat.pdf ? 'html' : pageBulkExportJob.format;
   const outputDir = this.getTmpOutputDir(pageBulkExportJob, isHtmlPath);
   // define before the stream starts to avoid creating multiple instances
   const remarkHtml = remark().use(html);
@@ -39,7 +40,7 @@ function getPageWritable(this: IPageBulkExportJobCronService, pageBulkExportJob:
 
         if (revision != null && isPopulated(revision)) {
           const markdownBody = revision.body;
-          const pathNormalized = `${normalizePath(page.path)}.${PageBulkExportFormat.md}`;
+          const pathNormalized = `${normalizePath(page.path)}.${format}`;
           const fileOutputPath = path.join(outputDir, pathNormalized);
           const fileOutputParentPath = getParentPath(fileOutputPath);