Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: embedded file generalization fixed - alt used #571

Merged
merged 1 commit into from
Jan 6, 2024
Merged

fix: embedded file generalization fixed - alt used #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 19 additions & 39 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 19 additions & 3 deletions src/process-resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,17 @@ export const extractDataUrlResources = (

const {absoluteResourceWorkDir, relativeResourceWorkDir} = getResourceWorkDirs(note);
fsExtra.mkdirsSync(absoluteResourceWorkDir);

// change links hrefs
content = content.replace(/ (href)="data:([^;,]*)(;base64)?,([^"]*)"(.*?)<\/a>/g, (match,argument, mediatype, encoding, data, postfix) => {
const fileName = createResourceFromData(argument, match, mediatype, encoding === ';base64', data, absoluteResourceWorkDir, note);
const argValue = `${relativeResourceWorkDir}${yarleOptions.pathSeparator}${fileName}`;

return `yarle-file-resource="true" ${argument}="${argValue}"${postfix}`;
});
// src|href="data:image/svg+xml;base64,..." --> src="resourceDir/fileName"
return content.replace(/([^= ]*)="data:([^;,]*)(;base64)?,([^"]*)"/g, (match,argument, mediatype, encoding, data) => {
const fileName = createResourceFromData(mediatype, encoding === ';base64', data, absoluteResourceWorkDir, note);
return content.replace(/(src)="data:([^;,]*)(;base64)?,([^"]*)"/g, (match,argument, mediatype, encoding, data) => {
const fileName = createResourceFromData(argument, match, mediatype, encoding === ';base64', data, absoluteResourceWorkDir, note);
const argValue = `${relativeResourceWorkDir}${yarleOptions.pathSeparator}${fileName}`;

return `yarle-file-resource="true" ${argument}="${argValue}"`;
Expand All @@ -122,6 +129,8 @@ export const extractDataUrlResources = (

// returns filename of new resource
const createResourceFromData = (
argument: string,
match: string,
mediatype: string,
base64: boolean,
data: string,
Expand All @@ -131,7 +140,14 @@ const createResourceFromData = (
const baseName = 'embedded'; // data doesn't seem to include useful base filename
const extension = extensionForMimeType(mediatype) || '.dat';
const index = utils.getFileIndex(absoluteResourceWorkDir, baseName);
const fileName = index < 1 ? `${baseName}.${extension}` : `${baseName}.${index}.${extension}`;
let fileName = index < 1 ? `${baseName}.${extension}` : `${baseName}.${index}.${extension}`;


if (argument === 'href'){
const baseNameCandidate = match.split("alt=\"")[1]?.split("\"")[0]
if (baseNameCandidate)
fileName = baseNameCandidate
}
const absFilePath = `${absoluteResourceWorkDir}${path.sep}${fileName}`;

if (!base64 && !data.startsWith('&lt;svg')) { // TODO: handle <svg, tags, they may be checkboxes
Expand Down
Loading
Loading