depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix and refactor extracting content using metaMarked directly might lead in invalid object

Browse source
This commit is contained in:
Wu Cheng-Han 2017-01-04 23:57:16 +08:00
parent ac2b100d35
commit c1b5e74cf9
2 changed files with 34 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
lib/models/note.js
View file

@ -236,33 +236,17 @@ module.exports = function (sequelize, DataTypes) {
}); });
}, },
parseNoteInfo: function (body) { parseNoteInfo: function (body) {
var meta = null; var parsed = Note.extractMeta(body);
try { var $ = cheerio.load(md.render(parsed.markdown));
var obj = metaMarked(body);
body = obj.markdown;
meta = obj.meta;
} catch (err) {
//na
}
if (!meta) meta = {};
var $ = cheerio.load(md.render(body));
return { return {
title: Note.extractNoteTitle(meta, $), title: Note.extractNoteTitle(parsed.meta, $),
tags: Note.extractNoteTags(meta, $) tags: Note.extractNoteTags(parsed.meta, $)
}; };
}, },
parseNoteTitle: function (body) { parseNoteTitle: function (body) {
var meta = null; var parsed = Note.extractMeta(body);
try { var $ = cheerio.load(md.render(parsed.markdown));
var obj = metaMarked(body); return Note.extractNoteTitle(parsed.meta, $);
body = obj.markdown;
meta = obj.meta;
} catch (err) {
//na
}
if (!meta) meta = {};
var $ = cheerio.load(md.render(body));
return Note.extractNoteTitle(meta, $);
}, },
extractNoteTitle: function (meta, $) { extractNoteTitle: function (meta, $) {
var title = ""; var title = "";
@ -320,6 +304,19 @@ module.exports = function (sequelize, DataTypes) {
} }
return tags; return tags;
}, },
extractMeta: function (content) {
try {
var obj = metaMarked(content);
if (!obj.markdown) obj.markdown = "";
if (!obj.meta) obj.meta = {};
} catch (err) {
var obj = {
markdown: content,
meta: {}
};
}
return obj;
},
parseMeta: function (meta) { parseMeta: function (meta) {
var _meta = {}; var _meta = {};
if (meta) { if (meta) {

59
lib/response.js
View file

@ -6,7 +6,6 @@ var markdownpdf = require("markdown-pdf");
var LZString = require('lz-string'); var LZString = require('lz-string');
var S = require('string'); var S = require('string');
var shortId = require('shortid'); var shortId = require('shortid');
var metaMarked = require('meta-marked');
var querystring = require('querystring'); var querystring = require('querystring');
var request = require('request'); var request = require('request');
var moment = require('moment'); var moment = require('moment');
@ -76,13 +75,8 @@ function showIndex(req, res, next) {
function responseHackMD(res, note) { function responseHackMD(res, note) {
var body = note.content; var body = note.content;
var meta = null; var extracted = models.Note.extractMeta(body);
try { var meta = models.Note.parseMeta(extracted.meta);
meta = models.Note.parseMeta(metaMarked(body).meta);
} catch(err) {
//na
}
if (!meta) meta = {};
var title = models.Note.decodeTitle(note.title); var title = models.Note.decodeTitle(note.title);
title = models.Note.generateWebTitle(meta.title || title); title = models.Note.generateWebTitle(meta.title || title);
res.set({ res.set({
@ -192,16 +186,9 @@ function showPublishNote(req, res, next) {
return response.errorNotFound(res); return response.errorNotFound(res);
} }
var body = note.content; var body = note.content;
var meta = null; var extracted = models.Note.extractMeta(body);
var markdown = null; markdown = extracted.markdown;
try { meta = models.Note.parseMeta(extracted.meta);
var obj = metaMarked(body);
markdown = obj.markdown;
meta = models.Note.parseMeta(obj.meta);
} catch(err) {
//na
}
if (!meta) meta = {};
var createtime = note.createdAt; var createtime = note.createdAt;
var updatetime = note.lastchangeAt; var updatetime = note.lastchangeAt;
var title = models.Note.decodeTitle(note.title); var title = models.Note.decodeTitle(note.title);
@ -266,16 +253,9 @@ function actionDownload(req, res, note) {
function actionInfo(req, res, note) { function actionInfo(req, res, note) {
var body = note.content; var body = note.content;
var meta = null; var extracted = models.Note.extractMeta(body);
var markdown = null; var markdown = extracted.markdown;
try { var meta = models.Note.parseMeta(extracted.meta);
var obj = metaMarked(body);
markdown = obj.markdown;
meta = models.Note.parseMeta(obj.meta);
} catch(err) {
//na
}
if (!meta) meta = {};
var createtime = note.createdAt; var createtime = note.createdAt;
var updatetime = note.lastchangeAt; var updatetime = note.lastchangeAt;
var title = models.Note.decodeTitle(note.title); var title = models.Note.decodeTitle(note.title);
@ -298,18 +278,14 @@ function actionInfo(req, res, note) {
function actionPDF(req, res, note) { function actionPDF(req, res, note) {
var body = note.content; var body = note.content;
try { var extracted = models.Note.extractMeta(body);
body = metaMarked(body).markdown;
} catch(err) {
//na
}
var title = models.Note.decodeTitle(note.title); var title = models.Note.decodeTitle(note.title);
if (!fs.existsSync(config.tmppath)) { if (!fs.existsSync(config.tmppath)) {
fs.mkdirSync(config.tmppath); fs.mkdirSync(config.tmppath);
} }
var path = config.tmppath + '/' + Date.now() + '.pdf'; var path = config.tmppath + '/' + Date.now() + '.pdf';
markdownpdf().from.string(body).to(path, function () { markdownpdf().from.string(extracted.markdown).to(path, function () {
var stream = fs.createReadStream(path); var stream = fs.createReadStream(path);
var filename = title; var filename = title;
// Be careful of special characters // Be careful of special characters
@ -580,16 +556,9 @@ function showPublishSlide(req, res, next) {
return response.errorNotFound(res); return response.errorNotFound(res);
} }
var body = note.content; var body = note.content;
var meta = null; var extracted = models.Note.extractMeta(body);
var markdown = null; markdown = extracted.markdown;
try { meta = models.Note.parseMeta(extracted.meta);
var obj = metaMarked(body);
markdown = obj.markdown;
meta = models.Note.parseMeta(obj.meta);
} catch(err) {
//na
}
if (!meta) meta = {};
var createtime = note.createdAt; var createtime = note.createdAt;
var updatetime = note.lastchangeAt; var updatetime = note.lastchangeAt;
var title = models.Note.decodeTitle(note.title); var title = models.Note.decodeTitle(note.title);
@ -603,7 +572,7 @@ function showPublishSlide(req, res, next) {
updatetime: updatetime, updatetime: updatetime,
url: origin, url: origin,
body: markdown, body: markdown,
meta: JSON.stringify(obj.meta || {}), meta: JSON.stringify(extracted.meta),
useCDN: config.usecdn, useCDN: config.usecdn,
owner: note.owner ? note.owner.id : null, owner: note.owner ? note.owner.id : null,
ownerprofile: note.owner ? models.User.getProfile(note.owner) : null, ownerprofile: note.owner ? models.User.getProfile(note.owner) : null,