', ['http://test.com/img.png']],
+ ['
', ['http://test.com/img.png', 'http://test.com/img2.png']],
+ ['
'],
+ ['
'],
+ ['
'],
+ ];
+
+ const callback = (urls) => {
+ let i = -1;
+
+ return function(src) {
+ i++;
+ return urls[i];
+ }
+ }
+
+ for (let i = 0; i < testCases.length; i++) {
+ const md = testCases[i][0];
+ const r = htmlUtils.replaceImageUrls(md, callback(testCases[i][1]));
+ expect(r.trim()).toBe(testCases[i][2].trim());
+ }
+
+ done();
+ });
+
+ it('should encode attributes', async (done) => {
+ const testCases = [
+ [{ a: 'one', b: 'two' }, 'a="one" b="two"'],
+ [{ a: 'one&two' }, 'a="one&two"'],
+ ];
+
+ for (let i = 0; i < testCases.length; i++) {
+ const attrs = testCases[i][0];
+ const expected = testCases[i][1];
+ expect(htmlUtils.attributesHtml(attrs)).toBe(expected);
+ }
+
+ done();
+ });
+
+ it('should prepend a base URL', async (done) => {
+ const testCases = [
+ [
+ '- {simplifiedPageButtonLabel}
- Clip complete page +
- Clip complete page (HTML) (Beta)
- Clip selection
- Clip screenshot
- Clip URL diff --git a/Clipper/joplin-webclipper/popup/src/bridge.js b/Clipper/joplin-webclipper/popup/src/bridge.js index 36a1597b5..03c219c9d 100644 --- a/Clipper/joplin-webclipper/popup/src/bridge.js +++ b/Clipper/joplin-webclipper/popup/src/bridge.js @@ -35,6 +35,9 @@ class Bridge { tags: command.tags || '', image_sizes: command.image_sizes || {}, anchor_names: command.anchor_names || [], + source_command: command.source_command, + convert_to: command.convert_to, + stylesheets: command.stylesheets, }; this.dispatch({ type: 'CLIPPED_CONTENT_SET', content: content }); diff --git a/ElectronClient/app/app.js b/ElectronClient/app/app.js index d93b3fd66..f615cf6ac 100644 --- a/ElectronClient/app/app.js +++ b/ElectronClient/app/app.js @@ -1020,16 +1020,17 @@ class Application extends BaseApplication { this.lastMenuScreen_ = screen; } - updateMenuItemStates() { + async updateMenuItemStates() { if (!this.lastMenuScreen_) return; if (!this.store()) return; const selectedNoteIds = this.store().getState().selectedNoteIds; + const note = selectedNoteIds.length === 1 ? await Note.load(selectedNoteIds[0]) : null; for (const itemId of ['copy', 'paste', 'cut', 'selectAll', 'bold', 'italic', 'link', 'code', 'insertDateTime', 'commandStartExternalEditing', 'setTags', 'showLocalSearch']) { const menuItem = Menu.getApplicationMenu().getMenuItemById('edit:' + itemId); if (!menuItem) continue; - menuItem.enabled = selectedNoteIds.length === 1; + menuItem.enabled = !!note && note.markup_language === Note.MARKUP_LANGUAGE_MARKDOWN; } } diff --git a/ElectronClient/app/compile.js b/ElectronClient/app/compile.js index aaff1a5ee..4d8254e05 100644 --- a/ElectronClient/app/compile.js +++ b/ElectronClient/app/compile.js @@ -47,7 +47,7 @@ convertJsx(__dirname + '/plugins'); const libContent = [ fs.readFileSync(basePath + '/ReactNativeClient/lib/string-utils-common.js', 'utf8'), fs.readFileSync(basePath + '/ReactNativeClient/lib/markJsUtils.js', 'utf8'), - fs.readFileSync(basePath + '/ReactNativeClient/lib/MdToHtml/webviewLib.js', 'utf8'), + fs.readFileSync(basePath + '/ReactNativeClient/lib/renderers/webviewLib.js', 'utf8'), ]; fs.writeFileSync(__dirname + '/gui/note-viewer/lib.js', libContent.join('\n'), 'utf8'); diff --git a/ElectronClient/app/gui/NotePropertiesDialog.jsx b/ElectronClient/app/gui/NotePropertiesDialog.jsx index 69267b134..76fe03814 100644 --- a/ElectronClient/app/gui/NotePropertiesDialog.jsx +++ b/ElectronClient/app/gui/NotePropertiesDialog.jsx @@ -33,6 +33,7 @@ class NotePropertiesDialog extends React.Component { location: _('Location'), source_url: _('URL'), revisionsLink: _('Note History'), + markup_language: _('Markup'), }; } @@ -82,6 +83,7 @@ class NotePropertiesDialog extends React.Component { } formNote.revisionsLink = note.id; + formNote.markup_language = Note.markupLanguageToLabel(note.markup_language); formNote.id = note.id; return formNote; @@ -292,7 +294,7 @@ class NotePropertiesDialog extends React.Component { controlComp =
{displayedValue}
}
- if (key !== 'id' && key !== 'revisionsLink') {
+ if (['id', 'revisionsLink', 'markup_language'].indexOf(key) < 0) {
editCompHandler = () => {this.editPropertyButtonClick(key, value)};
editCompIcon = 'fa-edit';
}
diff --git a/ElectronClient/app/gui/NoteRevisionViewer.jsx b/ElectronClient/app/gui/NoteRevisionViewer.jsx
index f6452a1fc..f2f1d9908 100644
--- a/ElectronClient/app/gui/NoteRevisionViewer.jsx
+++ b/ElectronClient/app/gui/NoteRevisionViewer.jsx
@@ -9,7 +9,7 @@ const Revision = require('lib/models/Revision');
const Setting = require('lib/models/Setting');
const RevisionService = require('lib/services/RevisionService');
const shared = require('lib/components/shared/note-screen-shared.js');
-const MdToHtml = require('lib/MdToHtml');
+const MarkupToHtml = require('lib/renderers/MarkupToHtml');
const { time } = require('lib/time-utils.js');
const ReactTooltip = require('react-tooltip');
const { substrWithEllipsis } = require('lib/string-utils');
@@ -92,6 +92,7 @@ class NoteRevisionViewerComponent extends React.PureComponent {
async reloadNote() {
let noteBody = '';
+ let markupLanguage = Note.MARKUP_LANGUAGE_MARKDOWN;
if (!this.state.revisions.length || !this.state.currentRevId) {
noteBody = _('This note has no history');
this.setState({ note: null });
@@ -100,16 +101,17 @@ class NoteRevisionViewerComponent extends React.PureComponent {
const note = await RevisionService.instance().revisionNote(this.state.revisions, revIndex);
if (!note) return;
noteBody = note.body;
+ markupLanguage = note.markup_language;
this.setState({ note: note });
}
const theme = themeStyle(this.props.theme);
- const mdToHtml = new MdToHtml({
+ const markupToHtml = new MarkupToHtml({
resourceBaseUrl: 'file://' + Setting.value('resourceDir') + '/',
});
- const result = mdToHtml.render(noteBody, theme, {
+ const result = markupToHtml.render(markupLanguage, noteBody, theme, {
codeTheme: theme.codeThemeCss,
userCss: this.props.customCss ? this.props.customCss : '',
resources: await shared.attachedResources(noteBody),
diff --git a/ElectronClient/app/gui/NoteText.jsx b/ElectronClient/app/gui/NoteText.jsx
index 437fd1820..a7f4c2557 100644
--- a/ElectronClient/app/gui/NoteText.jsx
+++ b/ElectronClient/app/gui/NoteText.jsx
@@ -12,7 +12,7 @@ const TagList = require('./TagList.min.js');
const { connect } = require('react-redux');
const { _ } = require('lib/locale.js');
const { reg } = require('lib/registry.js');
-const MdToHtml = require('lib/MdToHtml');
+const MarkupToHtml = require('lib/renderers/MarkupToHtml');
const shared = require('lib/components/shared/note-screen-shared.js');
const { bridge } = require('electron').remote.require('./bridge');
const { themeStyle } = require('../theme.js');
@@ -72,6 +72,7 @@ class NoteTextComponent extends React.Component {
newNote: null,
noteTags: [],
showRevisions: false,
+ loading: false,
// If the current note was just created, and the title has never been
// changed by the user, this variable contains that note ID. Used
@@ -96,6 +97,7 @@ class NoteTextComponent extends React.Component {
this.lastSetMarkers_ = '';
this.lastSetMarkersOptions_ = {};
this.selectionRange_ = null;
+ this.lastComponentUpdateNoteId_ = null;
this.noteSearchBar_ = React.createRef();
// Complicated but reliable method to get editor content height
@@ -326,12 +328,12 @@ class NoteTextComponent extends React.Component {
}
}
- mdToHtml() {
- if (this.mdToHtml_) return this.mdToHtml_;
- this.mdToHtml_ = new MdToHtml({
+ markupToHtml() {
+ if (this.markupToHtml_) return this.markupToHtml_;
+ this.markupToHtml_ = new MarkupToHtml({
resourceBaseUrl: 'file://' + Setting.value('resourceDir') + '/',
});
- return this.mdToHtml_;
+ return this.markupToHtml_;
}
async componentWillMount() {
@@ -356,7 +358,7 @@ class NoteTextComponent extends React.Component {
this.lastLoadedNoteId_ = note ? note.id : null;
- this.updateHtml(note && note.body ? note.body : '');
+ this.updateHtml(note ? note.markup_language : null, note && note.body ? note.body : '');
eventManager.on('alarmChange', this.onAlarmChange_);
eventManager.on('noteTypeToggle', this.onNoteTypeToggle_);
@@ -370,7 +372,7 @@ class NoteTextComponent extends React.Component {
componentWillUnmount() {
this.saveIfNeeded();
- this.mdToHtml_ = null;
+ this.markupToHtml_ = null;
eventManager.removeListener('alarmChange', this.onAlarmChange_);
eventManager.removeListener('noteTypeToggle', this.onNoteTypeToggle_);
@@ -389,6 +391,14 @@ class NoteTextComponent extends React.Component {
this.webviewRef().closeDevTools();
}
}
+
+ const currentNoteId = this.state.note ? this.state.note.id : null;
+ if (this.lastComponentUpdateNoteId_ !== currentNoteId && this.editor_) {
+ const undoManager = this.editor_.editor.getSession().getUndoManager();
+ undoManager.reset();
+ this.editor_.editor.getSession().setUndoManager(undoManager);
+ this.lastComponentUpdateNoteId_ = currentNoteId;
+ }
}
webviewRef() {
@@ -398,6 +408,8 @@ class NoteTextComponent extends React.Component {
}
async saveIfNeeded(saveIfNewNote = false, options = {}) {
+ if (this.state.loading) return;
+
const forceSave = saveIfNewNote && (this.state.note && !this.state.note.id);
if (this.scheduleSaveTimeout_) clearTimeout(this.scheduleSaveTimeout_);
@@ -448,6 +460,12 @@ class NoteTextComponent extends React.Component {
await this.saveIfNeeded();
+ const defer = () => {
+ this.setState({ loading: false });
+ }
+
+ this.setState({ loading: true });
+
const previousNote = this.state.note ? Object.assign({}, this.state.note) : null;
const stateNoteId = this.state.note ? this.state.note.id : null;
@@ -475,18 +493,18 @@ class NoteTextComponent extends React.Component {
noteTags = await Tag.tagsByNoteId(noteId);
this.lastLoadedNoteId_ = noteId;
note = noteId ? await Note.load(noteId) : null;
- if (noteId !== this.lastLoadedNoteId_) return; // Race condition - current note was changed while this one was loading
- if (options.noReloadIfLocalChanges && this.isModified()) return;
+ if (noteId !== this.lastLoadedNoteId_) return defer(); // Race condition - current note was changed while this one was loading
+ if (options.noReloadIfLocalChanges && this.isModified()) return defer();
// If the note hasn't been changed, exit now
if (this.state.note && note) {
let diff = Note.diffObjects(this.state.note, note);
delete diff.type_;
- if (!Object.getOwnPropertyNames(diff).length) return;
+ if (!Object.getOwnPropertyNames(diff).length) return defer();
}
}
- this.mdToHtml_ = null;
+ this.markupToHtml_ = null;
// If we are loading nothing (noteId == null), make sure to
// set webviewReady to false too because the webview component
@@ -520,22 +538,6 @@ class NoteTextComponent extends React.Component {
}
if (this.editor_) {
- // Calling setValue here does two things:
- // 1. It sets the initial value as recorded by the undo manager. If we were to set it instead to "" and wait for the render
- // phase to set the value, the initial value would still be "", which means pressing "undo" on a note that has just loaded
- // would clear it.
- // 2. It resets the undo manager - fixes https://github.com/laurent22/joplin/issues/355
- // Note: calling undoManager.reset() doesn't work
- try {
- this.editor_.editor.getSession().setValue(note && note.body? note.body : '');
- } catch (error) {
- if (error.message === "Cannot read property 'match' of undefined") {
- // The internals of Ace Editor throws an exception when creating a new note,
- // but that can be ignored.
- } else {
- console.error(error);
- }
- }
this.editor_.editor.clearSelection();
this.editor_.editor.moveCursorTo(0,0);
@@ -600,7 +602,9 @@ class NoteTextComponent extends React.Component {
// if (newState.note) await shared.refreshAttachedResources(this, newState.note.body);
- this.updateHtml(newState.note ? newState.note.body : '');
+ await this.updateHtml(newState.note ? newState.note.markup_language : null, newState.note ? newState.note.body : '');
+
+ defer();
}
async componentWillReceiveProps(nextProps) {
@@ -671,7 +675,7 @@ class NoteTextComponent extends React.Component {
const arg0 = args && args.length >= 1 ? args[0] : null;
const arg1 = args && args.length >= 2 ? args[1] : null;
- console.info('Got ipc-message: ' + msg, args);
+ if (msg !== 'percentScroll') console.info('Got ipc-message: ' + msg, args);
if (msg.indexOf('checkboxclick:') === 0) {
// Ugly hack because setting the body here will make the scrollbar
@@ -935,12 +939,20 @@ class NoteTextComponent extends React.Component {
}
}
- async updateHtml(body = null, options = null) {
+ async updateHtml(markupLanguage = null, body = null, options = null) {
if (!options) options = {};
if (!('useCustomCss' in options)) options.useCustomCss = true;
let bodyToRender = body;
- if (bodyToRender === null) bodyToRender = this.state.note && this.state.note.body ? this.state.note.body : '';
+
+ if (bodyToRender === null) {
+ bodyToRender = this.state.note && this.state.note.body ? this.state.note.body : '';
+ markupLanguage = this.state.note ? this.state.note.markup_language : Note.MARKUP_LANGUAGE_MARKDOWN;
+ }
+
+ if (!markupLanguage) markupLanguage = Note.MARKUP_LANGUAGE_MARKDOWN;
+
+ const resources = await shared.attachedResources(bodyToRender);
const theme = themeStyle(this.props.theme);
@@ -948,7 +960,7 @@ class NoteTextComponent extends React.Component {
codeTheme: theme.codeThemeCss,
postMessageSyntax: 'ipcProxySendToHost',
userCss: options.useCustomCss ? this.props.customCss : '',
- resources: await shared.attachedResources(bodyToRender),
+ resources: resources,
codeHighlightCacheKey: this.state.note ? this.state.note.id : null,
};
@@ -958,10 +970,10 @@ class NoteTextComponent extends React.Component {
if (!bodyToRender.trim() && visiblePanes.indexOf('viewer') >= 0 && visiblePanes.indexOf('editor') < 0) {
// Fixes https://github.com/laurent22/joplin/issues/217
- bodyToRender = '*' + _('This note has no content. Click on "%s" to toggle the editor and edit the note.', _('Layout')) + '*';
+ bodyToRender = '' + _('This note has no content. Click on "%s" to toggle the editor and edit the note.', _('Layout')) + '';
}
- const result = this.mdToHtml().render(bodyToRender, theme, mdOptions);
+ const result = this.markupToHtml().render(markupLanguage, bodyToRender, theme, mdOptions);
this.setState({
bodyHtml: result.html,
@@ -1086,7 +1098,7 @@ class NoteTextComponent extends React.Component {
lastSavedNote: Object.assign({}, note),
});
- this.updateHtml(note.body);
+ this.updateHtml(note.markup_language, note.body);
} catch (error) {
reg.logger().error(error);
bridge().showErrorMessageBox(error.message);
@@ -1115,13 +1127,13 @@ class NoteTextComponent extends React.Component {
const previousTheme = Setting.value('theme');
Setting.setValue('theme', Setting.THEME_LIGHT);
this.lastSetHtml_ = '';
- await this.updateHtml(tempBody, { useCustomCss: false });
+ await this.updateHtml(this.state.note.markup_language, tempBody, { useCustomCss: false });
this.forceUpdate();
const restoreSettings = async () => {
Setting.setValue('theme', previousTheme);
this.lastSetHtml_ = '';
- await this.updateHtml(previousBody);
+ await this.updateHtml(this.state.note.markup_language, previousBody);
this.forceUpdate();
}
@@ -1419,6 +1431,8 @@ class NoteTextComponent extends React.Component {
}
createToolbarItems(note) {
+ const markupLanguage = note.markup_language;
+
const toolbarItems = [];
if (note && this.state.folder && ['Search', 'Tag'].includes(this.props.notesParentType)) {
toolbarItems.push({
@@ -1431,7 +1445,6 @@ class NoteTextComponent extends React.Component {
noteId: note.id,
});
},
- // enabled: false,
});
}
@@ -1454,83 +1467,85 @@ class NoteTextComponent extends React.Component {
});
}
- toolbarItems.push({
- tooltip: _('Bold'),
- iconName: 'fa-bold',
- onClick: () => { return this.commandTextBold(); },
- });
+ if (note.markup_language === Note.MARKUP_LANGUAGE_MARKDOWN) {
+ toolbarItems.push({
+ tooltip: _('Bold'),
+ iconName: 'fa-bold',
+ onClick: () => { return this.commandTextBold(); },
+ });
- toolbarItems.push({
- tooltip: _('Italic'),
- iconName: 'fa-italic',
- onClick: () => { return this.commandTextItalic(); },
- });
+ toolbarItems.push({
+ tooltip: _('Italic'),
+ iconName: 'fa-italic',
+ onClick: () => { return this.commandTextItalic(); },
+ });
- toolbarItems.push({
- type: 'separator',
- });
+ toolbarItems.push({
+ type: 'separator',
+ });
- toolbarItems.push({
- tooltip: _('Hyperlink'),
- iconName: 'fa-link',
- onClick: () => { return this.commandTextLink(); },
- });
+ toolbarItems.push({
+ tooltip: _('Hyperlink'),
+ iconName: 'fa-link',
+ onClick: () => { return this.commandTextLink(); },
+ });
- toolbarItems.push({
- tooltip: _('Code'),
- iconName: 'fa-code',
- onClick: () => { return this.commandTextCode(); },
- });
+ toolbarItems.push({
+ tooltip: _('Code'),
+ iconName: 'fa-code',
+ onClick: () => { return this.commandTextCode(); },
+ });
- toolbarItems.push({
- tooltip: _('Attach file'),
- iconName: 'fa-paperclip',
- onClick: () => { return this.commandAttachFile(); },
- });
+ toolbarItems.push({
+ tooltip: _('Attach file'),
+ iconName: 'fa-paperclip',
+ onClick: () => { return this.commandAttachFile(); },
+ });
- toolbarItems.push({
- type: 'separator',
- });
+ toolbarItems.push({
+ type: 'separator',
+ });
- toolbarItems.push({
- tooltip: _('Numbered List'),
- iconName: 'fa-list-ol',
- onClick: () => { return this.commandTextListOl(); },
- });
+ toolbarItems.push({
+ tooltip: _('Numbered List'),
+ iconName: 'fa-list-ol',
+ onClick: () => { return this.commandTextListOl(); },
+ });
- toolbarItems.push({
- tooltip: _('Bulleted List'),
- iconName: 'fa-list-ul',
- onClick: () => { return this.commandTextListUl(); },
- });
+ toolbarItems.push({
+ tooltip: _('Bulleted List'),
+ iconName: 'fa-list-ul',
+ onClick: () => { return this.commandTextListUl(); },
+ });
- toolbarItems.push({
- tooltip: _('Checkbox'),
- iconName: 'fa-check-square',
- onClick: () => { return this.commandTextCheckbox(); },
- });
+ toolbarItems.push({
+ tooltip: _('Checkbox'),
+ iconName: 'fa-check-square',
+ onClick: () => { return this.commandTextCheckbox(); },
+ });
- toolbarItems.push({
- tooltip: _('Heading'),
- iconName: 'fa-header',
- onClick: () => { return this.commandTextHeading(); },
- });
+ toolbarItems.push({
+ tooltip: _('Heading'),
+ iconName: 'fa-header',
+ onClick: () => { return this.commandTextHeading(); },
+ });
- toolbarItems.push({
- tooltip: _('Horizontal Rule'),
- iconName: 'fa-ellipsis-h',
- onClick: () => { return this.commandTextHorizontalRule(); },
- });
+ toolbarItems.push({
+ tooltip: _('Horizontal Rule'),
+ iconName: 'fa-ellipsis-h',
+ onClick: () => { return this.commandTextHorizontalRule(); },
+ });
- toolbarItems.push({
- tooltip: _('Insert Date Time'),
- iconName: 'fa-calendar-plus-o',
- onClick: () => { return this.commandDateTime(); },
- });
+ toolbarItems.push({
+ tooltip: _('Insert Date Time'),
+ iconName: 'fa-calendar-plus-o',
+ onClick: () => { return this.commandDateTime(); },
+ });
- toolbarItems.push({
- type: 'separator',
- });
+ toolbarItems.push({
+ type: 'separator',
+ });
+ }
if (note && this.props.watchedNoteFiles.indexOf(note.id) >= 0) {
toolbarItems.push({
@@ -1646,6 +1661,7 @@ class NoteTextComponent extends React.Component {
const style = this.props.style;
const note = this.state.note;
const body = note && note.body ? note.body : '';
+ const markupLanguage = note ? note.markup_language : Note.MARKUP_LANGUAGE_MARKDOWN;
const theme = themeStyle(this.props.theme);
const visiblePanes = this.props.visiblePanes || ['editor', 'viewer'];
const isTodo = note && !!note.is_todo;
@@ -1855,7 +1871,7 @@ class NoteTextComponent extends React.Component {
delete editorRootStyle.fontSize;
const editor = ' + ' + ')
' + '
';
- }
-
- const mime = resource.mime ? resource.mime.toLowerCase() : '';
- if (Resource.isSupportedImageMimeType(mime)) {
- let realSrc = './' + Resource.filename(resource);
- if (ruleOptions.resourceBaseUrl) realSrc = ruleOptions.resourceBaseUrl + realSrc;
- let output = '' + '' + '' + '
';
- }
-
- const mime = resource.mime ? resource.mime.toLowerCase() : '';
- if (Resource.isSupportedImageMimeType(mime)) {
- let newSrc = './' + Resource.filename(resource);
- if (ruleOptions.resourceBaseUrl) newSrc = ruleOptions.resourceBaseUrl + newSrc;
- return '' + '' + '' + '
';
+ }
+
+ const mime = resource.mime ? resource.mime.toLowerCase() : '';
+ if (Resource.isSupportedImageMimeType(mime)) {
+ let newSrc = './' + Resource.filename(resource);
+ if (resourceBaseUrl) newSrc = resourceBaseUrl + newSrc;
+ return {
+ 'data-resource-id': resource.id,
+ 'src': newSrc,
+ };
+ }
+
+ return null;
+}
+
module.exports = utils;
\ No newline at end of file
diff --git a/ReactNativeClient/lib/MdToHtml/webviewLib.js b/ReactNativeClient/lib/renderers/webviewLib.js
similarity index 100%
rename from ReactNativeClient/lib/MdToHtml/webviewLib.js
rename to ReactNativeClient/lib/renderers/webviewLib.js
diff --git a/ReactNativeClient/lib/services/rest/Api.js b/ReactNativeClient/lib/services/rest/Api.js
index 0de139809..71132e87b 100644
--- a/ReactNativeClient/lib/services/rest/Api.js
+++ b/ReactNativeClient/lib/services/rest/Api.js
@@ -7,12 +7,15 @@ const BaseItem = require('lib/models/BaseItem');
const BaseModel = require('lib/BaseModel');
const Setting = require('lib/models/Setting');
const markdownUtils = require('lib/markdownUtils');
+const htmlUtils = require('lib/htmlUtils');
+const markupLanguageUtils = require('lib/markupLanguageUtils');
const mimeUtils = require('lib/mime-utils.js').mime;
const { Logger } = require('lib/logger.js');
const md5 = require('md5');
const { shim } = require('lib/shim');
const HtmlToMd = require('lib/HtmlToMd');
const urlUtils = require('lib/urlUtils.js');
+const ArrayUtils = require('lib/ArrayUtils.js');
const { netUtils } = require('lib/net-utils');
const { fileExtension, safeFileExtension, safeFilename, filename } = require('lib/path-utils');
const ApiResponse = require('lib/services/rest/ApiResponse');
@@ -369,7 +372,7 @@ class Api {
let note = await this.requestNoteToNote_(requestNote);
- const imageUrls = markdownUtils.extractImageUrls(note.body);
+ const imageUrls = ArrayUtils.unique(markupLanguageUtils.extractImageUrls(note.markup_language, note.body));
this.logger().info('Request (' + requestId + '): Downloading images: ' + imageUrls.length);
@@ -379,7 +382,7 @@ class Api {
result = await this.createResourcesFromPaths_(result);
await this.removeTempFiles_(result);
- note.body = this.replaceImageUrlsByResources_(note.body, result, imageSizes);
+ note.body = this.replaceImageUrlsByResources_(note.markup_language, note.body, result, imageSizes);
this.logger().info('Request (' + requestId + '): Saving note...');
@@ -430,18 +433,45 @@ class Api {
if (requestNote.id) output.id = requestNote.id;
- if (requestNote.body_html) {
- // Parsing will not work if the HTML is not wrapped in a top level tag, which is not guaranteed
- // when getting the content from elsewhere. So here wrap it - it won't change anything to the final
- // rendering but it makes sure everything will be parsed.
- output.body = await this.htmlToMdParser().parse('' + '' + requestNote.body_html + '
', {
- baseUrl: requestNote.base_url ? requestNote.base_url : '',
- anchorNames: requestNote.anchor_names ? requestNote.anchor_names : [],
- });
+ const baseUrl = requestNote.base_url ? requestNote.base_url : '';
- // Note: to save the note as HTML, use the code below:
- // const minify = require('html-minifier').minify;
- // output.body = minify(requestNote.body_html, { collapseWhitespace: true });
+ if (requestNote.body_html) {
+ if (requestNote.convert_to === 'html') {
+ const style = await this.buildNoteStyleSheet_(requestNote.stylesheets);
+ const minify = require('html-minifier').minify;
+
+ const minifyOptions = {
+ // Remove all spaces and, especially, newlines from tag attributes, as that would
+ // break the rendering.
+ customAttrCollapse: /.*/,
+ // Need to remove all whitespaces because whitespace at a beginning of a line
+ // means a code block in Markdown.
+ collapseWhitespace: true,
+ minifyCSS: true,
+ maxLineLength: 300,
+ };
+
+ const uglifycss = require('uglifycss');
+ const styleString = uglifycss.processString(style.join('\n'), {
+ // Need to set a max length because Ace Editor takes forever
+ // to display notes with long lines.
+ maxLineLen: 200,
+ });
+
+ const styleTag = style.length ? '' + '\n' : '';
+ output.body = styleTag + minify(requestNote.body_html, minifyOptions);
+ output.body = htmlUtils.prependBaseUrl(output.body, baseUrl);
+ output.markup_language = Note.MARKUP_LANGUAGE_HTML;
+ } else { // Convert to Markdown
+ // Parsing will not work if the HTML is not wrapped in a top level tag, which is not guaranteed
+ // when getting the content from elsewhere. So here wrap it - it won't change anything to the final
+ // rendering but it makes sure everything will be parsed.
+ output.body = await this.htmlToMdParser().parse('' + requestNote.body_html + '
', {
+ baseUrl: baseUrl,
+ anchorNames: requestNote.anchor_names ? requestNote.anchor_names : [],
+ });
+ output.markup_language = Note.MARKUP_LANGUAGE_MARKDOWN;
+ }
}
if (requestNote.parent_id) {
@@ -457,6 +487,9 @@ class Api {
if ('user_updated_time' in requestNote) output.user_updated_time = Database.formatValue(Database.TYPE_INT, requestNote.user_updated_time);
if ('user_created_time' in requestNote) output.user_created_time = Database.formatValue(Database.TYPE_INT, requestNote.user_created_time);
if ('is_todo' in requestNote) output.is_todo = Database.formatValue(Database.TYPE_INT, requestNote.is_todo);
+ if ('markup_language' in requestNote) output.markup_language = Database.formatValue(Database.TYPE_INT, requestNote.markup_language);
+
+ if (!output.markup_language) output.markup_language = Note.MARKUP_LANGUAGE_MARKDOWN;
return output;
}
@@ -486,6 +519,32 @@ class Api {
return newImagePath;
}
+ async buildNoteStyleSheet_(stylesheets) {
+ if (!stylesheets) return [];
+
+ const output = [];
+
+ for (const stylesheet of stylesheets) {
+ if (stylesheet.type === 'text') {
+ output.push(stylesheet.value);
+ } else if (stylesheet.type === 'url') {
+ try {
+ const tempPath = Setting.value('tempDir') + '/' + md5(Math.random() + '_' + Date.now()) + '.css';
+ await shim.fetchBlob(stylesheet.value, { path: tempPath, maxRetry: 1 });
+ const text = await shim.fsDriver().readFile(tempPath);
+ output.push(text);
+ await shim.fsDriver().remove(tempPath);
+ } catch (error) {
+ this.logger().warn('Cannot download stylesheet at ' + stylesheet.value, error);
+ }
+ } else {
+ throw new Error('Invalid stylesheet type: ' + stylesheet.type);
+ }
+ }
+
+ return output;
+ }
+
async downloadImage_(url, allowFileProtocolImages) {
const tempDir = Setting.value('tempDir');
@@ -525,12 +584,7 @@ class Api {
const output = {};
- let urlIndex = 0;
- const promiseProducer = () => {
- if (urlIndex >= urls.length) return null;
-
- const url = urls[urlIndex++];
-
+ const downloadOne = url => {
return new Promise(async (resolve, reject) => {
const imagePath = await this.downloadImage_(url, allowFileProtocolImages);
if (imagePath) output[url] = { path: imagePath, originalUrl: url };
@@ -538,7 +592,15 @@ class Api {
});
}
- const concurrency = 3
+ let urlIndex = 0;
+ const promiseProducer = () => {
+ if (urlIndex >= urls.length) return null;
+
+ const url = urls[urlIndex++];
+ return downloadOne(url);
+ }
+
+ const concurrency = 10;
const pool = new PromisePool(promiseProducer, concurrency)
await pool.start()
@@ -571,21 +633,33 @@ class Api {
}
}
- replaceImageUrlsByResources_(md, urls, imageSizes) {
- let output = md.replace(/(!\[.*?\]\()([^\s\)]+)(.*?\))/g, (match, before, imageUrl, after) => {
- const urlInfo = urls[imageUrl];
- if (!urlInfo || !urlInfo.resource) return before + imageUrl + after;
- const imageSize = imageSizes[urlInfo.originalUrl];
- const resourceUrl = Resource.internalUrl(urlInfo.resource);
+ replaceImageUrlsByResources_(markupLanguage, md, urls, imageSizes) {
+ const imageSizesIndexes = {};
- if (imageSize && (imageSize.naturalWidth !== imageSize.width || imageSize.naturalHeight !== imageSize.height)) {
- return '