Skip to content

Commit

Permalink
When receiving Share, inserts a thematic-break between text files
Browse files Browse the repository at this point in the history
  • Loading branch information
@DougReeder
DougReeder committed Feb 10, 2024
1 parent f1c7c09 commit ba3c392
Show file tree
Hide file tree
Showing 2 changed files with 170 additions and 77 deletions.
62 changes: 51 additions & 11 deletions src/assembleNote.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,38 @@ export async function assembleNote(title, text, url, files, clientId) {
console.info(`Imported URL “${shorten(url)}”`);
}

const hasMaterialForTitle = slateNodes.length > 0;

let lastFileWasText = true;
let lastFileHadProblem = false;
for (const file of files) {
try {
if (!/^image/.test(file.type) && slateNodes.length > 0 && lastFileWasText) {
slateNodes.push(...divider(subtype, undefined, undefined));
}

const fileSubtype = /\/(?:x-|vnd\.|x\.)?([^;]+)/.exec(file.type)?.[1];
if (unsupportedTextSubtypes.includes(fileSubtype)) {
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
slateNodes.push({type: 'quote',
children: [{text: `Import of “${file.name}” (${file.type}) not supported`, bold: true}]});
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
console.warn(`Import of “${file.name}” (${file.type}) not supported`);
// doesn't push name into suffix
lastFileWasText = true;
lastFileHadProblem = true;
console.warn(`Import of “${file.name}” (${file.type}) not supported`);
postTransientMessage(`Import of “${file.name}” (${file.type}) not supported`, 'warning');
continue;
}

if (0 === file.size) {
suffix.push(file.name);
hasRealContent = true;
// doesn't set lastFileWasText nor lastFileHadProblem
console.warn(`“${file.name}” is empty.`);
postTransientMessage(`“${file.name}” is empty.`, 'warning');
continue;
}

// TODO: replace readAsText with Blob.text
await new Promise((resolve, reject) => {
const reader = new FileReader();
reader.addEventListener('load', async (evt) => {
Expand All @@ -96,21 +107,30 @@ export async function assembleNote(title, text, url, files, clientId) {
}
suffix.push(file.name);
hasRealContent = true;
lastFileWasText = true;
lastFileHadProblem = false;
console.info(`Imported “${file.name}” (${file.type}) as HTML`);
} else if (file.type?.startsWith('image')) {
const {dataUrl, alt} = await imageFileToDataUrl(file);
if (lastFileHadProblem) {
slateNodes.push(...divider(subtype, undefined, undefined));
}
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
slateNodes.push({type: 'image', url: dataUrl, children: [{text: alt}]});
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
// file name is in alt text, so it's not added to suffix
hasRealContent = true;
lastFileWasText = false;
lastFileHadProblem = false;
console.info(`Imported “${file.name}” (${file.type}) as graphic`);
} else { // supported text type
const paragraphs = evt.target.result.split(/\r\n|\n|\r/)
.map(line => {return {type: 'paragraph', children: [{text: line}]}});
slateNodes.push(...paragraphs);
suffix.push(file.name);
hasRealContent = true;
lastFileWasText = true;
lastFileHadProblem = false;
console.info(`Imported “${file.name}” (${file.type}) as text`);
}
resolve();
Expand All @@ -120,18 +140,18 @@ export async function assembleNote(title, text, url, files, clientId) {
});
reader.addEventListener('error', _evt => {
const msg = `error while reading “${file.name}”`;
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
slateNodes.push({type: 'quote', children: [{text: msg, bold: true}]})
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
lastFileWasText = true;
lastFileHadProblem = true;
reject(new Error(msg))
});
reader.addEventListener('abort', evt => {
const msg = `read of “${file.name}” was aborted`;
console.warn(msg, evt);
postTransientMessage(`“Import of ${file.name}” was interrupted`, 'warning');
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
slateNodes.push({type: 'quote', children: [{text: msg, bold: true}]});
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
lastFileWasText = true;
lastFileHadProblem = true;
resolve();
});
reader.readAsText(file);
Expand All @@ -141,22 +161,42 @@ export async function assembleNote(title, text, url, files, clientId) {
console.error(intro, err);
const msg = intro + ": " + extractUserMessage(err);
postTransientMessage(msg);
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
slateNodes.push({type: 'quote', children: [{text: msg, bold: true}]})
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
lastFileWasText = true;
lastFileHadProblem = true;
}
}
if (hasRealContent) {
if (suffix.length > 0) {
slateNodes.push({type: 'thematic-break', children: [{text: ""}]});
slateNodes.push({type: 'paragraph', children: [{text: suffix.join(", "), italic: true}]});
slateNodes.push(...divider(subtype, undefined, suffix.join(", ")));
if (!hasMaterialForTitle) {
slateNodes.unshift(...divider(subtype, suffix.join(", "), undefined));
}
}
return new NodeNote(undefined, subtype, slateNodes, date, undefined);
} else {
throw new Error("No usable content in Share");
}
}

function divider(subtype, beforeText, afterText) {
const slateNodes = [];
if ('html' === subtype) {
beforeText && slateNodes.push({type: 'paragraph', children: [{text: beforeText, italic: true}]});
slateNodes.push({type: 'thematic-break', children: [{text: ""}]});
afterText && slateNodes.push({type: 'paragraph', children: [{text: afterText, italic: true}]});
} else if ('markdown' === subtype) {
beforeText && slateNodes.push({type: 'paragraph', children: [{text: `*${beforeText}*`}]});
slateNodes.push({type: 'paragraph', children: [{text: "------------------------------"}]});
afterText && slateNodes.push({type: 'paragraph', children: [{text: `*${afterText}*`}]});
} else {
beforeText && slateNodes.push({type: 'paragraph', children: [{text: beforeText}]});
slateNodes.push({type: 'paragraph', children: [{text: ""}]});
afterText && slateNodes.push({type: 'paragraph', children: [{text: afterText}]});
}
return slateNodes;
}

function textHeuristics(text, subtype) {
try {
if ('html' === subtype) {
Expand Down
Loading

0 comments on commit ba3c392

Please sign in to comment.