Merge branch 'master' into frontend-next

This commit is contained in:
Yukai Huang 2017-01-07 00:05:15 +08:00
commit 3566d71aea
5 changed files with 76 additions and 86 deletions

View file

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

View file

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

View file

@ -13,6 +13,7 @@ import { saveAs } from 'file-saver';
require('./common');
require('../vendor/md-toc');
var Viz = require("viz.js");
//auto update last change
window.createtime = null;
@ -314,6 +315,7 @@ export function finishView(view) {
svg[0].setAttribute('preserveAspectRatio', 'xMidYMid meet');
} catch (err) {
$value.unwrap();
$value.parent().append('<div class="alert alert-warning">' + err + '</div>');
console.warn(err);
}
});
@ -337,26 +339,36 @@ export function finishView(view) {
$value.children().unwrap().unwrap();
} catch (err) {
$value.unwrap();
$value.parent().append('<div class="alert alert-warning">' + err + '</div>');
console.warn(err);
}
});
//graphviz
const Viz = require("viz.js");
const graphvizs = view.find("div.graphviz.raw").removeClass("raw");
graphvizs.each((key, value) => {
var graphvizs = view.find("div.graphviz.raw").removeClass("raw");
function parseGraphviz(key, value) {
var $value = $(value);
var $ele = $(value).parent().parent();
var graphviz = Viz($value.text());
if (!graphviz) throw Error('viz.js output empty graph');
$value.html(graphviz);
$ele.addClass('graphviz');
$value.children().unwrap().unwrap();
}
graphvizs.each(function (key, value) {
try {
var $value = $(value);
const $ele = $(value).parent().parent();
const graphviz = Viz($value.text());
if (!graphviz) throw Error('viz.js output empty graph');
$value.html(graphviz);
$ele.addClass('graphviz');
$value.children().unwrap().unwrap();
parseGraphviz(key, value);
} catch (err) {
$value.unwrap();
console.warn(err);
// workaround for graphviz not recover from error
try {
parseGraphviz(key, value);
} catch (err) {
var $value = $(value);
$value.unwrap();
$value.parent().append('<div class="alert alert-warning">' + err + '</div>');
console.warn(err);
}
}
});
//mermaid
@ -376,11 +388,11 @@ export function finishView(view) {
$ele.html($value.text());
mermaid.init(undefined, $ele);
} else {
$value.unwrap();
console.warn(mermaidError);
throw new Error(mermaidError);
}
} catch (err) {
$value.unwrap();
$value.parent().append('<div class="alert alert-warning">' + err + '</div>');
console.warn(err);
}
});
@ -539,6 +551,16 @@ export function postProcess(code) {
});
}
}
// show yaml meta paring error
if (md.metaError) {
var warning = result.find('div#meta-error');
if (warning && warning.length > 0) {
warning.text(md.metaError)
} else {
warning = $('<div id="meta-error" class="alert alert-warning">' + md.metaError + '</div>')
result.prepend(warning);
}
}
return result;
}
window.postProcess = postProcess;
@ -1103,7 +1125,9 @@ function meta(state, start, end, silent) {
try {
md.meta = jsyaml.safeLoad(data.join('\n')) || {};
delete md.metaError;
} catch(err) {
md.metaError = err;
console.warn(err);
return false;
}

2
public/vendor/ot/codemirror-adapter.js vendored Normal file → Executable file
View file

@ -328,7 +328,7 @@ ot.CodeMirrorAdapter = (function (global) {
return {
clear: function () {
for (var i = 0; i < selectionObjects.length; i++) {
selectionObjects[i].clear();
if (selectionObjects[i]) selectionObjects[i].clear();
}
}
};

File diff suppressed because one or more lines are too long