mirror of
https://github.com/laurent22/joplin.git
synced 2025-03-03 15:32:30 +02:00
- For now, supports Markdown-it plugins - Also fixed slow rendering of notes in some cases - Simplified how Markdown-It plugins are created and cleaned MdToHtml code commit 89576de2896c99134f25f2a2db25008514cb1315 Merge: c75aa21f 5292fc14 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 21 00:23:00 2020 +0100 Merge branch 'release-1.3' into plugin_content_scripts commit c75aa21ffdc42764d71dc9deadba7a7ef4233995 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 21 00:19:52 2020 +0100 Fixed tests commit 075187729d11a16d385b651cbf1ebb89f14935e0 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 21 00:11:53 2020 +0100 Fixed tests commit 14696b8c651e7afdaf71269bcdbadf0d58d3ef8a Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 20 23:27:58 2020 +0100 Fixed slow rendering of note commit 61c09f5bf856481f91b00cfe87ff05596c63d4bc Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 20 22:35:21 2020 +0100 Clean up commit 9f7ea7d865a990b3a21cc8c59093390d9db61653 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 20 20:05:31 2020 +0100 Updated doc commit 98bf3bde8d6663f2f91ff965304b4aac00bdd98b Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 20 19:56:34 2020 +0100 Finished converting plugins commit fe90d92e01427bd2b38200393713ea28763507a9 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 20 17:52:02 2020 +0100 Simplified how Markdown-It plugins are created commit 47c7b864cbb864d5df79849f27625aecf312df4b Author: Laurent Cozic <laurent@cozic.net> Date: Mon Oct 19 16:40:11 2020 +0100 Clean up rules commit d927a238bb635a4be45f9216d776f7d07cb0a584 Author: Laurent Cozic <laurent@cozic.net> Date: Mon Oct 19 14:29:40 2020 +0100 Fixed tests commit 388a56c5dde4c382e3ee0035791137150adaba1b Author: Laurent Cozic <laurent@cozic.net> Date: Mon Oct 19 14:00:47 2020 +0100 Add support for content scripts
111 lines
4.2 KiB
TypeScript
111 lines
4.2 KiB
TypeScript
import { ImportExportResult } from './types';
|
|
import { _ } from 'lib/locale';
|
|
|
|
const InteropService_Importer_Base = require('lib/services/interop/InteropService_Importer_Base').default;
|
|
const Folder = require('lib/models/Folder.js');
|
|
const Note = require('lib/models/Note.js');
|
|
const { basename, filename, rtrimSlashes, fileExtension, dirname } = require('lib/path-utils');
|
|
const shim = require('lib/shim').default;
|
|
const { extractImageUrls } = require('lib/markdownUtils').default;
|
|
const { unique } = require('lib/ArrayUtils');
|
|
const { pregQuote } = require('lib/string-utils-common');
|
|
const { MarkupToHtml } = require('lib/joplin-renderer');
|
|
|
|
export default class InteropService_Importer_Md extends InteropService_Importer_Base {
|
|
async exec(result:ImportExportResult) {
|
|
let parentFolderId = null;
|
|
|
|
const sourcePath = rtrimSlashes(this.sourcePath_);
|
|
|
|
const filePaths = [];
|
|
if (await shim.fsDriver().isDirectory(sourcePath)) {
|
|
if (!this.options_.destinationFolder) {
|
|
const folderTitle = await Folder.findUniqueItemTitle(basename(sourcePath));
|
|
const folder = await Folder.save({ title: folderTitle });
|
|
parentFolderId = folder.id;
|
|
} else {
|
|
parentFolderId = this.options_.destinationFolder.id;
|
|
}
|
|
|
|
this.importDirectory(sourcePath, parentFolderId);
|
|
} else {
|
|
if (!this.options_.destinationFolder) throw new Error(_('Please specify the notebook where the notes should be imported to.'));
|
|
parentFolderId = this.options_.destinationFolder.id;
|
|
filePaths.push(sourcePath);
|
|
}
|
|
|
|
for (let i = 0; i < filePaths.length; i++) {
|
|
await this.importFile(filePaths[i], parentFolderId);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
async importDirectory(dirPath:string, parentFolderId:string) {
|
|
console.info(`Import: ${dirPath}`);
|
|
|
|
const supportedFileExtension = this.metadata().fileExtensions;
|
|
const stats = await shim.fsDriver().readDirStats(dirPath);
|
|
for (let i = 0; i < stats.length; i++) {
|
|
const stat = stats[i];
|
|
|
|
if (stat.isDirectory()) {
|
|
const folderTitle = await Folder.findUniqueItemTitle(basename(stat.path));
|
|
const folder = await Folder.save({ title: folderTitle, parent_id: parentFolderId });
|
|
this.importDirectory(`${dirPath}/${basename(stat.path)}`, folder.id);
|
|
} else if (supportedFileExtension.indexOf(fileExtension(stat.path).toLowerCase()) >= 0) {
|
|
this.importFile(`${dirPath}/${stat.path}`, parentFolderId);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Parse text for links, attempt to find local file, if found create Joplin resource
|
|
* and update link accordingly.
|
|
*/
|
|
async importLocalImages(filePath:string, md:string) {
|
|
let updated = md;
|
|
const imageLinks = unique(extractImageUrls(md));
|
|
await Promise.all(imageLinks.map(async (encodedLink:string) => {
|
|
const link = decodeURI(encodedLink);
|
|
const attachmentPath = filename(`${dirname(filePath)}/${link}`, true);
|
|
const pathWithExtension = `${attachmentPath}.${fileExtension(link)}`;
|
|
const stat = await shim.fsDriver().stat(pathWithExtension);
|
|
const isDir = stat ? stat.isDirectory() : false;
|
|
if (stat && !isDir) {
|
|
const resource = await shim.createResourceFromPath(pathWithExtension);
|
|
// NOTE: use ](link) in case the link also appears elsewhere, such as in alt text
|
|
const linkPatternEscaped = pregQuote(`](${link})`);
|
|
const reg = new RegExp(linkPatternEscaped, 'g');
|
|
updated = updated.replace(reg, `](:/${resource.id})`);
|
|
}
|
|
}));
|
|
return updated;
|
|
}
|
|
|
|
async importFile(filePath:string, parentFolderId:string) {
|
|
const stat = await shim.fsDriver().stat(filePath);
|
|
if (!stat) throw new Error(`Cannot read ${filePath}`);
|
|
const title = filename(filePath);
|
|
const body = await shim.fsDriver().readFile(filePath);
|
|
let updatedBody;
|
|
try {
|
|
updatedBody = await this.importLocalImages(filePath, body);
|
|
} catch (error) {
|
|
// console.error(`Problem importing links for file ${filePath}, error:\n ${error}`);
|
|
}
|
|
const note = {
|
|
parent_id: parentFolderId,
|
|
title: title,
|
|
body: updatedBody || body,
|
|
updated_time: stat.mtime.getTime(),
|
|
created_time: stat.birthtime.getTime(),
|
|
user_updated_time: stat.mtime.getTime(),
|
|
user_created_time: stat.birthtime.getTime(),
|
|
markup_language: MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN,
|
|
};
|
|
|
|
return Note.save(note, { autoTimestamp: false });
|
|
}
|
|
}
|