mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-21 09:38:01 +02:00
8a6fe20a69
* Allow downloading resources automatically, on demand, or when loading note * Make needToBeFetched calls to return the right number of resources * All: Improved handling of resource downloading and decryption * Desktop: Click on resource to download it (and, optionally, to decrypt it) * Desktop: Better handling of resource state (not downloaded, downloading, encrypted) in front end * Renamed setting to sync.resourceDownloadMode * Download resources when changing setting * tweaks * removed duplicate cs * Better report resource download progress * Make sure resource cache is properly cleared when needed * Also handle manual download for non-image resources * More improvements to logic when downloading and decrypting resources
62 lines
2.5 KiB
JavaScript
62 lines
2.5 KiB
JavaScript
const Entities = require('html-entities').AllHtmlEntities;
|
|
const htmlentities = (new Entities()).encode;
|
|
const Resource = require('lib/models/Resource.js');
|
|
const utils = require('../utils');
|
|
|
|
function renderImageHtml(before, src, after, ruleOptions) {
|
|
const resourceId = Resource.urlToId(src);
|
|
const result = ruleOptions.resources[resourceId];
|
|
const resource = result ? result.item : null;
|
|
const resourceStatus = utils.resourceStatus(result);
|
|
|
|
if (resourceStatus !== 'ready') {
|
|
const icon = utils.resourceStatusImage(resourceStatus);
|
|
return '<div class="not-loaded-resource resource-status-' + resourceStatus + '" data-resource-id="' + resourceId + '">' + '<img src="data:image/svg+xml;utf8,' + htmlentities(icon) + '"/>' + '</div>';
|
|
}
|
|
|
|
const mime = resource.mime ? resource.mime.toLowerCase() : '';
|
|
if (Resource.isSupportedImageMimeType(mime)) {
|
|
let newSrc = './' + Resource.filename(resource);
|
|
if (ruleOptions.resourceBaseUrl) newSrc = ruleOptions.resourceBaseUrl + newSrc;
|
|
return '<img ' + before + ' data-resource-id="' + resource.id + '" src="' + newSrc + '" ' + after + '/>';
|
|
}
|
|
|
|
return '[Image: ' + htmlentities(resource.title) + ' (' + htmlentities(mime) + ')]';
|
|
}
|
|
|
|
function installRule(markdownIt, mdOptions, ruleOptions) {
|
|
const htmlBlockDefaultRender = markdownIt.renderer.rules.html_block || function(tokens, idx, options, env, self) {
|
|
return self.renderToken(tokens, idx, options);
|
|
};
|
|
|
|
const htmlInlineDefaultRender = markdownIt.renderer.rules.html_inline || function(tokens, idx, options, env, self) {
|
|
return self.renderToken(tokens, idx, options);
|
|
};
|
|
|
|
const imageRegex = /<img(.*?)src=["'](.*?)["'](.*?)\/>/
|
|
|
|
const handleImageTags = function(defaultRender) {
|
|
return function(tokens, idx, options, env, self) {
|
|
const token = tokens[idx];
|
|
const content = token.content;
|
|
|
|
if (!content.match(imageRegex)) return defaultRender(tokens, idx, options, env, self);
|
|
|
|
return content.replace(imageRegex, (v, before, src, after) => {
|
|
if (!Resource.isResourceUrl(src)) return defaultRender(tokens, idx, options, env, self);
|
|
return renderImageHtml(before, src, after, ruleOptions);
|
|
});
|
|
}
|
|
}
|
|
|
|
// It seems images sometimes are inline, sometimes a block
|
|
// to make sure they both render correctly.
|
|
markdownIt.renderer.rules.html_block = handleImageTags(htmlBlockDefaultRender);
|
|
markdownIt.renderer.rules.html_inline = handleImageTags(htmlInlineDefaultRender);
|
|
}
|
|
|
|
module.exports = function(context, ruleOptions) {
|
|
return function(md, mdOptions) {
|
|
installRule(md, mdOptions, ruleOptions);
|
|
};
|
|
}; |