1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00

Clipper: Improved download of images and conversion to resources

This commit is contained in:
Laurent Cozic
2018-05-23 14:25:59 +01:00
parent 3c5eb99c59
commit a8da469523
14 changed files with 255 additions and 147 deletions

View File

@ -387,20 +387,21 @@ class BaseApplication {
}
async testing() {
const markdownUtils = require('lib/markdownUtils');
const ClipperServer = require('lib/ClipperServer');
const server = new ClipperServer();
const HtmlToMd = require('lib/HtmlToMd');
const service = new HtmlToMd();
const html = await shim.fsDriver().readFile('/mnt/d/test.html');
let markdown = service.parse(html);
let markdown = service.parse(html, { baseUrl: 'https://duckduckgo.com/' });
console.info(markdown);
console.info('--------------------------------------------------');
const imageUrls = server.extractImageUrls(markdown);
let result = await server.downloadImages(imageUrls);
result = await server.createResourcesFromPaths(result);
const imageUrls = markdownUtils.extractImageUrls(markdown);
let result = await server.downloadImages_(imageUrls);
result = await server.createResourcesFromPaths_(result);
console.info(result);
markdown = server.replaceImageUrlByResources(markdown, result);
markdown = server.replaceImageUrlsByResources_(markdown, result);
console.info('--------------------------------------------------');
console.info(markdown);
console.info('--------------------------------------------------');
@ -492,7 +493,11 @@ class BaseApplication {
// await this.testing();process.exit();
const clipperLogger = new Logger();
clipperLogger.addTarget('file', { path: profileDir + '/log-clipper.txt' });
clipperLogger.addTarget('console');
this.clipperServer_ = new ClipperServer();
this.clipperServer_.setLogger(clipperLogger);
this.clipperServer_.start();
return argv;