瀏覽代碼

reset feature of converting pdf

yusuketk 5 年之前
父節點
當前提交
5d85fbcdca
共有 2 個文件被更改,包括 4 次插入17 次删除
  1. 4 5
      src/server/routes/apiv3/page.js
  2. 0 12
      src/server/service/export.js

+ 4 - 5
src/server/routes/apiv3/page.js

@@ -115,7 +115,7 @@ module.exports = (crowi) => {
   const loginRequired = require('../../middlewares/login-required')(crowi);
   const csrf = require('../../middlewares/csrf')(crowi);
   const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
-  const { exportService } = crowi;
+
   const globalNotificationService = crowi.getGlobalNotificationService();
   const { Page, GlobalNotificationSetting } = crowi.models;
 
@@ -199,7 +199,7 @@ module.exports = (crowi) => {
   */
   router.get('/export', validator.export, async(req, res) => {
     try {
-      const { type, pageId = null, revisionId = null } = req.query;
+      const { pageId = null, revisionId = null } = req.query;
 
       if (pageId == null) {
         return res.apiv3Err(new ErrorV3('Should provided pageId or both pageId and revisionId.'));
@@ -228,12 +228,11 @@ module.exports = (crowi) => {
       const Revision = crowi.model('Revision');
       const revision = await Revision.findById(revisionIdForFind);
       const markdown = revision.body;
-      const data = type === 'pdf' ? await exportService.convertMdToPdf(markdown) : markdown;
 
-      return res.send(data);
+      return res.apiv3({ markdown });
     }
     catch (err) {
-      logger.error('Failed to get page', err);
+      logger.error('Failed to get markdown', err);
       return res.apiv3Err(err, 500);
     }
   });

+ 0 - 12
src/server/service/export.js

@@ -6,7 +6,6 @@ const mongoose = require('mongoose');
 const { Transform } = require('stream');
 const streamToPromise = require('stream-to-promise');
 const archiver = require('archiver');
-const markdownpdf = require('markdown-pdf');
 const ConfigLoader = require('../service/config-loader');
 
 const toArrayIfNot = require('../../lib/util/toArrayIfNot');
@@ -351,17 +350,6 @@ class ExportService {
     return zipFile;
   }
 
-  // convert md text to pdf as buffer data (promise wrapper)
-  async convertMdToPdf(md) {
-    return new Promise((resolve, reject) => {
-      markdownpdf()
-        .from.string(md)
-        .to.buffer({}, (opt, buffer) => {
-          resolve(buffer);
-        });
-    });
-  }
-
 }
 
 module.exports = ExportService;