yanki 2.0.2 → 2.0.4

package/dist/lib/index.js

@@ -31,7 +31,6 @@ import remarkMath from "remark-math";
 import remarkParse from "remark-parse";
 import { parse, stringify } from "yaml";
 import { sanitizeUri } from "micromark-util-sanitize-uri";
-
 //#region src/lib/utilities/string.ts
 function getHash(text, length) {
 	return fnv1a(text, { size: length === 8 ? 32 : 64 }).toString(16).padStart(length, "0");
@@ -70,9 +69,11 @@ function emptyIsUndefined(text) {
 function css(strings, ...values) {
 	return trimLeadingIndentation(strings, ...values);
 }
+const NEWLINE_REGEX$1 = /\r?\n/;
+const LEADING_WHITESPACE_REGEX = /^(\s+)/;
 function trimLeadingIndentation(strings, ...values) {
-	const lines = strings.reduce((result, text, i) => `${result}${text}${String(values[i] ?? "")}`, "").split(/\r?\n/).filter((line) => line.trim() !== "");
-	const leadingSpace = /^(\s+)/.exec(lines[0])?.[0] ?? "";
+	const lines = strings.reduce((result, text, i) => `${result}${text}${String(values[i] ?? "")}`, "").split(NEWLINE_REGEX$1).filter((line) => line.trim() !== "");
+	const leadingSpace = LEADING_WHITESPACE_REGEX.exec(lines[0])?.[0] ?? "";
 	const leadingSpaceRegex = new RegExp(`^${leadingSpace}`);
 	return lines.map((line) => line.replace(leadingSpaceRegex, "").trimEnd()).join("\n");
 }
@@ -82,16 +83,17 @@ function splitAtFirstMatch(text, regex) {
 	const { index } = match;
 	return [text.slice(0, index), text.slice(index)];
 }
-
 //#endregion
 //#region src/lib/shared/constants.ts
 /**
 * The default CSS to use for cards. This matches Anki's default. Stored in the Yanki card models and shared across all Yanki-managed notes regardless of namespace.
+* It does change occasionally, see https://github.com/ankitects/anki/blob/main/rslib/src/notetype/styling.css
 */
 const CSS_DEFAULT_STYLE = css`
 	.card {
 		font-family: arial;
 		font-size: 20px;
+		line-height: 1.5;
 		text-align: center;
 		color: black;
 		background-color: white;
@@ -102,22 +104,6 @@ const CSS_DEFAULT_STYLE = css`
 */
 const CSS_DEFAULT_CLASS_NAME = "yanki";
 /**
-* Whether to require changes to notes, models, or decks before invoking an
-* AnkiWeb sync. Seems like a good idea, but this is tricky... because if you
-* change the AnkiWeb flag after doing a sync, and haven't changed any files,
-* you won't end up pushing changes to AnkiWeb, which seems to contradict
-* expectations even though it would be more performant in the typical case.
-*
-* Only applies if the `ankiWeb` flag is true.
-*/
-const SYNC_TO_ANKI_WEB_EVEN_IF_UNCHANGED = true;
-/**
-* The maximum length of a namespace. This is used to ensure that the namespace
-* is easy to type in CLI commands and doesn't hog too much semantic space in
-* Media filenames.
-*/
-const NOTE_NAMESPACE_MAX_LENGTH = 60;
-/**
 * The default deck to put a card in if the deck deck can not be inferred from
 * the file path, e.g. when the `sync` command is used directly instead of
 * `syncFiles`.
@@ -140,7 +126,6 @@ const NOTE_DEFAULT_EMPTY_HAST = u("element", {
 }, [u("text", NOTE_DEFAULT_EMPTY_TEXT)])]);
 const MEDIA_DEFAULT_HASH_MODE_FILE = "metadata";
 const MEDIA_DEFAULT_HASH_MODE_URL = "metadata";
-const MEDIA_INCLUDE_LEGIBLE_FILENAME = false;
 /**
 * How to first attempt to infer the asset type behind a URL.
 *
@@ -149,11 +134,6 @@ const MEDIA_INCLUDE_LEGIBLE_FILENAME = false;
 */
 const MEDIA_URL_CONTENT_TYPE_MODE = "metadata";
 /**
-* Anki enforces limits on media asset filenames. Older versions allowed up to 255, but it will be 120 moving forward.
-* https://github.com/ankitects/anki/blob/e41c4573d789afe8b020fab5d9d1eede50c3fa3d/rslib/src/sync/media/mod.rs#L20
-*/
-const MEDIA_FILENAME_MAX_LENGTH = 120;
-/**
 * Filename to use when a media asset has no name. Will be appended with counter parenthetical as needed.
 */
 const MEDIA_DEFAULT_EMPTY_FILENAME = "Untitled";
@@ -219,12 +199,10 @@ const MEDIA_SUPPORTED_EXTENSIONS = [
 	...MEDIA_SUPPORTED_IMAGE_EXTENSIONS,
 	...MEDIA_SUPPORTED_FILE_EXTENSIONS
 ];
-
 //#endregion
 //#region src/lib/utilities/platform.ts
 const ENVIRONMENT = typeof window === "undefined" ? typeof process === "undefined" ? "other" : "node" : "browser";
-const PLATFORM = ENVIRONMENT === "browser" ? /windows/i.test(navigator.userAgent) ? "windows" : /mac/i.test(navigator.userAgent) ? "mac" : /linux/i.test(navigator.userAgent) || /ubuntu/i.test(navigator.userAgent) ? "linux" : "other" : ENVIRONMENT === "node" ? process.platform === "win32" ? "windows" : process.platform === "darwin" ? "mac" : process.platform === "linux" ? "linux" : "other" : "other";
-
+ENVIRONMENT === "browser" ? /windows/i.test(navigator.userAgent) || /mac/i.test(navigator.userAgent) || /linux/i.test(navigator.userAgent) || /ubuntu/i.test(navigator.userAgent) : ENVIRONMENT === "node" && (process.platform === "win32" || process.platform === "darwin" || process.platform);
 //#endregion
 //#region src/lib/shared/types.ts
 const defaultGlobalOptions = {
@@ -273,7 +251,6 @@ async function getDefaultFileAdapter() {
 function getDefaultFetchAdapter() {
 	return fetch.bind(globalThis);
 }
-
 //#endregion
 //#region src/lib/utilities/file.ts
 async function fileExists(absoluteFilePath, fileAdapter) {
@@ -296,9 +273,91 @@ async function getFileContentHash(absoluteFilePath, fileAdapter, mode = MEDIA_DE
 		case "name": return getHash(absoluteFilePath, 16);
 	}
 }
-
 //#endregion
 //#region src/lib/utilities/namespace.ts
+const CONSECUTIVE_HYPHENS_REGEX = /-+/g;
+const ASTERISK_REGEX = /\*/;
+const FORBIDDEN_CHARACTERS = [
+	[/:/, "Colon"],
+	[/\u0000/, "Null"],
+	[/\u0001/, "Start of Heading"],
+	[/\u0002/, "Start of Text"],
+	[/\u0003/, "End of Text"],
+	[/\u0004/, "End of Transmission"],
+	[/\u0005/, "Enquiry"],
+	[/\u0006/, "Acknowledge"],
+	[/\u0007/, "Bell"],
+	[/\u0008/, "Backspace"],
+	[/\u0009/, "Horizontal Tab"],
+	[/\u000A/, "Line Feed"],
+	[/\u000B/, "Vertical Tab"],
+	[/\u000C/, "Form Feed"],
+	[/\u000D/, "Carriage Return"],
+	[/\u000E/, "Shift Out"],
+	[/\u000F/, "Shift In"],
+	[/\u0010/, "Data Link Escape"],
+	[/\u0011/, "Device Control 1"],
+	[/\u0012/, "Device Control 2"],
+	[/\u0013/, "Device Control 3"],
+	[/\u0014/, "Device Control 4"],
+	[/\u0015/, "Negative Acknowledge"],
+	[/\u0016/, "Synchronous Idle"],
+	[/\u0017/, "End of Transmission Block"],
+	[/\u0018/, "Cancel"],
+	[/\u0019/, "End of Medium"],
+	[/\u001A/, "Substitute"],
+	[/\u001B/, "Escape"],
+	[/\u001C/, "File Separator"],
+	[/\u001D/, "Group Separator"],
+	[/\u001E/, "Record Separator"],
+	[/\u001F/, "Unit Separator"],
+	[/\u007F/, "Delete"],
+	[/\u0080/, "Padding Character"],
+	[/\u0081/, "High Octet Preset"],
+	[/\u0082/, "Break Permitted Here"],
+	[/\u0083/, "No Break Here"],
+	[/\u0084/, "Index"],
+	[/\u0085/, "Next Line"],
+	[/\u0086/, "Start of Selected Area"],
+	[/\u0087/, "End of Selected Area"],
+	[/\u0088/, "Character Tabulation Set"],
+	[/\u0089/, "Character Tabulation with Justification"],
+	[/\u008A/, "Line Tabulation Set"],
+	[/\u008B/, "Partial Line Forward"],
+	[/\u008C/, "Partial Line Backward"],
+	[/\u008D/, "Reverse Line Feed"],
+	[/\u008E/, "Single Shift Two"],
+	[/\u008F/, "Single Shift Three"],
+	[/\u0090/, "Device Control String"],
+	[/\u0091/, "Private Use One"],
+	[/\u0092/, "Private Use Two"],
+	[/\u0093/, "Set Transmit State"],
+	[/\u0094/, "Cancel Character"],
+	[/\u0095/, "Message Waiting"],
+	[/\u0096/, "Start of Protected Area"],
+	[/\u0097/, "End of Protected Area"],
+	[/\u0098/, "Start of String"],
+	[/\u0099/, "Single Graphic Character Introducer"],
+	[/\u009A/, "Single Character Introducer"],
+	[/\u009B/, "Control Sequence Introducer"],
+	[/\u009C/, "String Terminator"],
+	[/\u009D/, "Operating System Command"],
+	[/\u009E/, "Privacy Message"],
+	[/\u009F/, "Application Program Command"],
+	[/\u00A0/, "Non-breaking Space"],
+	[/\u00AD/, "Soft Hyphen"],
+	[/\u200B/, "Zero-width Space"],
+	[/\u200C/, "Zero-width Non-joiner"],
+	[/\u200D/, "Zero-width Joiner"],
+	[/\u200E/, "Left-to-right Mark"],
+	[/\u200F/, "Right-to-left Mark"],
+	[/\u202A/, "Left-to-right Embedding"],
+	[/\u202B/, "Right-to-left Embedding"],
+	[/\u202C/, "Pop Directional Formatting"],
+	[/\u202D/, "Left-to-right Override"],
+	[/\u202E/, "Right-to-left Override"],
+	[/\uFEFF/, "Byte Order Mark (BOM)"]
+];
 /**
 * Convenience
 * @returns sanitized valid namespace
@@ -334,89 +393,8 @@ function sanitizeNamespace(namespace) {
 function validateNamespace(namespace, allowAsterisk = false) {
 	const errorMessages = [];
 	if (namespace.trim().length === 0) errorMessages.push("Cannot be empty");
-	if (namespace.trim().length > NOTE_NAMESPACE_MAX_LENGTH) errorMessages.push(`Cannot be longer than ${NOTE_NAMESPACE_MAX_LENGTH} characters`);
-	const forbiddenCharacters = [
-		[/:/, "Colon"],
-		[/\u0000/, "Null"],
-		[/\u0001/, "Start of Heading"],
-		[/\u0002/, "Start of Text"],
-		[/\u0003/, "End of Text"],
-		[/\u0004/, "End of Transmission"],
-		[/\u0005/, "Enquiry"],
-		[/\u0006/, "Acknowledge"],
-		[/\u0007/, "Bell"],
-		[/\u0008/, "Backspace"],
-		[/\u0009/, "Horizontal Tab"],
-		[/\u000A/, "Line Feed"],
-		[/\u000B/, "Vertical Tab"],
-		[/\u000C/, "Form Feed"],
-		[/\u000D/, "Carriage Return"],
-		[/\u000E/, "Shift Out"],
-		[/\u000F/, "Shift In"],
-		[/\u0010/, "Data Link Escape"],
-		[/\u0011/, "Device Control 1"],
-		[/\u0012/, "Device Control 2"],
-		[/\u0013/, "Device Control 3"],
-		[/\u0014/, "Device Control 4"],
-		[/\u0015/, "Negative Acknowledge"],
-		[/\u0016/, "Synchronous Idle"],
-		[/\u0017/, "End of Transmission Block"],
-		[/\u0018/, "Cancel"],
-		[/\u0019/, "End of Medium"],
-		[/\u001A/, "Substitute"],
-		[/\u001B/, "Escape"],
-		[/\u001C/, "File Separator"],
-		[/\u001D/, "Group Separator"],
-		[/\u001E/, "Record Separator"],
-		[/\u001F/, "Unit Separator"],
-		[/\u007F/, "Delete"],
-		[/\u0080/, "Padding Character"],
-		[/\u0081/, "High Octet Preset"],
-		[/\u0082/, "Break Permitted Here"],
-		[/\u0083/, "No Break Here"],
-		[/\u0084/, "Index"],
-		[/\u0085/, "Next Line"],
-		[/\u0086/, "Start of Selected Area"],
-		[/\u0087/, "End of Selected Area"],
-		[/\u0088/, "Character Tabulation Set"],
-		[/\u0089/, "Character Tabulation with Justification"],
-		[/\u008A/, "Line Tabulation Set"],
-		[/\u008B/, "Partial Line Forward"],
-		[/\u008C/, "Partial Line Backward"],
-		[/\u008D/, "Reverse Line Feed"],
-		[/\u008E/, "Single Shift Two"],
-		[/\u008F/, "Single Shift Three"],
-		[/\u0090/, "Device Control String"],
-		[/\u0091/, "Private Use One"],
-		[/\u0092/, "Private Use Two"],
-		[/\u0093/, "Set Transmit State"],
-		[/\u0094/, "Cancel Character"],
-		[/\u0095/, "Message Waiting"],
-		[/\u0096/, "Start of Protected Area"],
-		[/\u0097/, "End of Protected Area"],
-		[/\u0098/, "Start of String"],
-		[/\u0099/, "Single Graphic Character Introducer"],
-		[/\u009A/, "Single Character Introducer"],
-		[/\u009B/, "Control Sequence Introducer"],
-		[/\u009C/, "String Terminator"],
-		[/\u009D/, "Operating System Command"],
-		[/\u009E/, "Privacy Message"],
-		[/\u009F/, "Application Program Command"],
-		[/\u00A0/, "Non-breaking Space"],
-		[/\u00AD/, "Soft Hyphen"],
-		[/\u200B/, "Zero-width Space"],
-		[/\u200C/, "Zero-width Non-joiner"],
-		[/\u200D/, "Zero-width Joiner"],
-		[/\u200E/, "Left-to-right Mark"],
-		[/\u200F/, "Right-to-left Mark"],
-		[/\u202A/, "Left-to-right Embedding"],
-		[/\u202B/, "Right-to-left Embedding"],
-		[/\u202C/, "Pop Directional Formatting"],
-		[/\u202D/, "Left-to-right Override"],
-		[/\u202E/, "Right-to-left Override"],
-		[/\uFEFF/, "Byte Order Mark (BOM)"]
-	];
-	if (!allowAsterisk) forbiddenCharacters.push([/\*/, "Asterisk"]);
+	if (namespace.trim().length > 60) errorMessages.push(`Cannot be longer than 60 characters`);
+	const forbiddenCharacters = allowAsterisk ? FORBIDDEN_CHARACTERS : [...FORBIDDEN_CHARACTERS, [ASTERISK_REGEX, "Asterisk"]];
 	for (const [regex, description] of forbiddenCharacters) {
 		const match = namespace.match(regex);
 		if (match) {
@@ -430,9 +408,8 @@ function validateNamespace(namespace, allowAsterisk = false) {
 * Get sanitized namespace with yanki-media- prefix (for ease of searching)
 */
 function getSlugifiedNamespace(namespace) {
-	return `yanki-media-${slugify(sanitizeNamespace(namespace)).replaceAll(/-+/g, "-")}`;
+	return `yanki-media-${slugify(sanitizeNamespace(namespace)).replaceAll(CONSECUTIVE_HYPHENS_REGEX, "-")}`;
 }
-
 //#endregion
 //#region src/lib/utilities/mime.ts
 /**
@@ -479,9 +456,10 @@ function getFileExtensionForMimeType(mimeType) {
 	if (result === void 0) return;
 	return result;
 }
-
 //#endregion
 //#region src/lib/utilities/path.ts
+const WINDOWS_DRIVE_LETTER_REGEX = /^[A-Z]:/i;
+const QUERY_FRAGMENT_START_REGEX = /[#?^]/;
 /**
 * The browserify polyfill doesn't implement win32 absolute path detection...
 * @param filePath Normalized path
@@ -528,18 +506,18 @@ function resolveWithBasePath(filePath, options) {
 	}
 	if (!isAbsolute(cwd)) console.warn(`CWD "${cwd}" is not absolute`);
 	if (isAbsolute(filePath)) {
-		if (basePath === void 0 || /^[A-Z]:/i.test(filePath) || !compoundBase && filePath.startsWith(basePath)) return filePath;
+		if (basePath === void 0 || WINDOWS_DRIVE_LETTER_REGEX.test(filePath) || !compoundBase && filePath.startsWith(basePath)) return filePath;
 		return path.join(basePath, filePath);
 	}
 	return path.join(cwd, filePath);
 }
 function stripBasePath(filePath, basePath) {
-	const regex = new RegExp(`^${basePath}`, "i");
-	return filePath.replace(regex, "");
+	if (filePath.toLowerCase().startsWith(basePath.toLowerCase())) return filePath.slice(basePath.length);
+	return filePath;
 }
 function getBaseAndQueryParts(filePath) {
 	const directoryPath = path.dirname(filePath);
-	const [base, query] = splitAtFirstMatch(path.basename(filePath), /[#?^]/);
+	const [base, query] = splitAtFirstMatch(path.basename(filePath), QUERY_FRAGMENT_START_REGEX);
 	return [path.join(directoryPath, base), query];
 }
 function getBase(filePath) {
@@ -562,9 +540,10 @@ function addExtension(filePath, extension) {
 	const [base, query] = getBaseAndQueryParts(filePath);
 	return `${base}.${extension}${query ?? ""}`;
 }
-
 //#endregion
 //#region src/lib/utilities/url.ts
+const DRIVE_LETTER_REGEX = /^[a-z]:/i;
+const FILE_PREFIX_REGEX = /^file:/i;
 function safeDecodeURI(text) {
 	try {
 		return decodeURI(text);
@@ -581,9 +560,7 @@ function safeDecodeURI(text) {
 function safeParseUrl(text) {
 	try {
 		const url = new URL(text);
-		const driveLetterPattern = /^[a-z]:/i;
-		const filePrefixPattern = /^file:/i;
-		if ((filePrefixPattern.test(url.protocol) || driveLetterPattern.test(url.protocol)) && !filePrefixPattern.test(text)) return;
+		if ((FILE_PREFIX_REGEX.test(url.protocol) || DRIVE_LETTER_REGEX.test(url.protocol)) && !FILE_PREFIX_REGEX.test(text)) return;
 		return url;
 	} catch {
 		return;
@@ -706,7 +683,6 @@ function urlToHostAndPort(url) {
 function hostAndPortToUrl(host, port) {
 	return `${host}:${port}`;
 }
-
 //#endregion
 //#region src/lib/utilities/media.ts
 /**
@@ -720,16 +696,6 @@ async function getAnkiMediaFilenameExtension(pathOrUrl, fetchAdapter) {
 	if (extensionCandidate === void 0 || !MEDIA_SUPPORTED_EXTENSIONS.includes(extensionCandidate)) return;
 	return extensionCandidate;
 }
-function getLegibleFilename(pathOrUrl, maxLength) {
-	let legibleFilename;
-	const parsedUrl = safeParseUrl(pathOrUrl);
-	if (parsedUrl === void 0) {
-		const filePath = pathOrUrl;
-		legibleFilename = path.basename(filePath, path.extname(filePath));
-	} else legibleFilename = path.basename(parsedUrl.pathname, path.extname(parsedUrl.pathname));
-	if (legibleFilename === void 0) throw new Error(`Could not create a legible file name for: ${pathOrUrl}`);
-	return truncateOnWordBoundary(slugify(legibleFilename.trim()).replaceAll(/-+/g, "-"), maxLength, "...", "-");
-}
 /**
 * Check if a media asset exists
 */
@@ -747,15 +713,13 @@ async function getSafeAnkiMediaFilename(absolutePathOrUrl, namespace, fileExtens
 	const assetHash = await getContentHash(absolutePathOrUrl, fileAdapter, fetchAdapter);
 	const resolvedFileExtension = fileExtension === void 0 ? "" : `.${fileExtension}`;
 	let safeFilename;
-	if (MEDIA_INCLUDE_LEGIBLE_FILENAME) safeFilename = `${safeNamespace}-${assetHash}-${getLegibleFilename(absolutePathOrUrl, MEDIA_FILENAME_MAX_LENGTH - (safeNamespace.length + 1 + assetHash.length + 1 + resolvedFileExtension.length))}${resolvedFileExtension}`;
-	else safeFilename = `${safeNamespace}-${assetHash}${resolvedFileExtension}`;
-	if (safeFilename.length > MEDIA_FILENAME_MAX_LENGTH) throw new Error(`Filename too long: ${safeFilename}`);
+	safeFilename = `${safeNamespace}-${assetHash}${resolvedFileExtension}`;
+	if (safeFilename.length > 120) throw new Error(`Filename too long: ${safeFilename}`);
 	return safeFilename;
 }
 async function getContentHash(absolutePathOrUrl, fileAdapter, fetchAdapter) {
 	return isUrl(absolutePathOrUrl) ? getUrlContentHash(absolutePathOrUrl, fetchAdapter) : getFileContentHash(absolutePathOrUrl, fileAdapter);
 }
-
 //#endregion
 //#region src/lib/parse/rehype-mathjax-anki.ts
 /**
@@ -792,7 +756,6 @@ const plugin$3 = function() {
 		});
 	};
 };
-
 //#endregion
 //#region src/lib/parse/remark-conditional-breaks.ts
 const plugin$2 = function() {
@@ -804,9 +767,9 @@ const plugin$2 = function() {
 		return tree;
 	};
 };
-
 //#endregion
 //#region src/lib/parse/rehype-utilities.ts
+const DIMENSION_CHARS_REGEX = /^[\dx]+$/;
 const processor = unified().use(plugin$2).use(remarkRehype, { allowDangerousHtml: true }).use(rehypeRaw).use(plugin$3).use(rehypeShiki, {
 	defaultLanguage: "plaintext",
 	fallbackLanguage: "plaintext",
@@ -957,7 +920,7 @@ function parseDimensionsFromAltText(alt) {
 	};
 }
 function parseDimensions(dimensions) {
-	if (!/^[\dx]+$/.test(dimensions)) return {
+	if (!DIMENSION_CHARS_REGEX.test(dimensions)) return {
 		width: void 0,
 		height: void 0
 	};
@@ -1028,7 +991,6 @@ function addFirstChildToFirstDiv(tree, newChild) {
 	});
 	return tree;
 }
-
 //#endregion
 //#region src/lib/model/model.ts
 const yankiModels = [
@@ -1093,7 +1055,6 @@ const yankiModels = [
 ];
 const yankiModelNames = yankiModels.map((model) => model.modelName);
 const legacyYankiModelNames = ["Yanki - Basic (and reversed card)"];
-
 //#endregion
 //#region src/lib/utilities/anki-connect.ts
 async function deleteNotes(client, notes, dryRun = false) {
@@ -1409,21 +1370,49 @@ async function uploadMediaForNote(client, note, dryRun, fileAdapter) {
 	}
 	return uploadedMedia;
 }
-async function deleteUnusedMedia(client, liveNotes, namespace, dryRun) {
-	if (dryRun) return [];
+async function reconcileMedia(client, liveNotes, namespace, dryRun, fileAdapter) {
+	if (dryRun) return {
+		deleted: [],
+		reuploaded: []
+	};
 	const slugifiedNamespace = getSlugifiedNamespace(namespace);
-	const activeMediaFilenames = [];
+	const expectedMedia = [];
 	for (const note of liveNotes) {
 		const mediaPaths = extractMediaFromHtml(`${note.fields.Front}\n${note.fields.Back}\n${note.fields.Extra}`);
-		for (const { filename } of mediaPaths) activeMediaFilenames.push(filename);
+		for (const media of mediaPaths) expectedMedia.push(media);
 	}
+	const activeMediaFilenames = new Set(expectedMedia.map(({ filename }) => filename));
 	const allMediaInNamespace = await client.media.getMediaFilesNames({ pattern: `${slugifiedNamespace}-*` });
 	const deletedMediaFilenames = [];
-	for (const remoteMediaFilename of allMediaInNamespace) if (!activeMediaFilenames.includes(remoteMediaFilename)) {
+	for (const remoteMediaFilename of allMediaInNamespace) if (!activeMediaFilenames.has(remoteMediaFilename)) {
 		await client.media.deleteMediaFile({ filename: remoteMediaFilename });
 		deletedMediaFilenames.push(remoteMediaFilename);
 	}
-	return deletedMediaFilenames;
+	const reuploadedMediaFilenames = [];
+	for (const { filename, originalSrc } of expectedMedia) if (!allMediaInNamespace.includes(filename)) try {
+		if (isUrl(originalSrc)) {
+			await client.media.storeMediaFile({
+				deleteExisting: true,
+				filename,
+				url: originalSrc
+			});
+			reuploadedMediaFilenames.push(filename);
+		} else if (fileAdapter === void 0) console.warn(`Could not re-upload local media file "${filename}": no file adapter provided`);
+		else {
+			await client.media.storeMediaFile({
+				data: uint8ArrayToBase64(await fileAdapter.readFileBuffer(originalSrc)),
+				deleteExisting: true,
+				filename
+			});
+			reuploadedMediaFilenames.push(filename);
+		}
+	} catch (error) {
+		console.warn(`Anki could not re-upload media file: "${filename}"\n${String(error)}`);
+	}
+	return {
+		deleted: deletedMediaFilenames,
+		reuploaded: reuploadedMediaFilenames
+	};
 }
 /**
 * Request permission to access Anki through Anki-Connect.
@@ -1447,7 +1436,6 @@ async function syncToAnkiWeb(client) {
 		console.warn("Could not sync to AnkiWeb.");
 	}
 }
-
 //#endregion
 //#region src/lib/actions/clean.ts
 const defaultCleanOptions = { ...defaultGlobalOptions };
@@ -1467,9 +1455,9 @@ async function cleanNotes(options) {
 	const remoteNotes = await getRemoteNotes(client, sanitizedNamespace);
 	await deleteNotes(client, remoteNotes, dryRun);
 	const deletedDecks = await deleteOrphanedDecks(client, [], remoteNotes, dryRun);
-	const deletedMedia = await deleteUnusedMedia(client, [], sanitizedNamespace, dryRun);
+	const { deleted: deletedMedia } = await reconcileMedia(client, [], sanitizedNamespace, dryRun);
 	const isChanged = remoteNotes.length > 0 || deletedDecks.length > 0;
-	if (!dryRun && ankiWeb && (isChanged || SYNC_TO_ANKI_WEB_EVEN_IF_UNCHANGED)) await syncToAnkiWeb(client);
+	if (!dryRun && ankiWeb && (isChanged || true)) await syncToAnkiWeb(client);
 	return {
 		ankiWeb,
 		deletedDecks,
@@ -1505,7 +1493,6 @@ function formatCleanResult(result, verbose = false) {
 	}
 	return lines.join("\n");
 }
-
 //#endregion
 //#region src/lib/actions/list.ts
 const defaultListOptions = { ...defaultGlobalOptions };
@@ -1534,9 +1521,10 @@ function formatListResult(result) {
 	}
 	return lines.join("\n");
 }
-
 //#endregion
 //#region src/lib/utilities/filenames.ts
+const CLOZE_CONTENT_REGEX = /\{\{\w\d*\s?:{0,2}([^:}]+)/;
+const FILENAME_INCREMENT_SUFFIX_REGEX = /\s\(\d+\)$/;
 function getSafeTitleForNote(note, manageFilenames, maxLength) {
 	if (manageFilenames === "off") throw new Error("manageFilenames must not be off");
 	switch (note.modelName) {
@@ -1553,7 +1541,7 @@ function getSafeTitleForNote(note, manageFilenames, maxLength) {
 		case "Yanki - Cloze": {
 			const cleanFront = getAllLinesOfHtmlAsPlainText(note.fields.Front);
 			const textBeforeCloze = emptyIsUndefined(cleanFront.split("{{").at(0) ?? "");
-			const firstClozeText = emptyIsUndefined(/\{\{\w\d*\s?:{0,2}([^:}]+)/.exec(cleanFront)?.at(1));
+			const firstClozeText = emptyIsUndefined(CLOZE_CONTENT_REGEX.exec(cleanFront)?.at(1));
 			const textAfterCloze = emptyIsUndefined(cleanFront.split("}}").at(1)?.split("{{").at(0) ?? "");
 			switch (manageFilenames) {
 				case "prompt": return getSafeFilename(textBeforeCloze ?? textAfterCloze ?? firstClozeText ?? "", maxLength);
@@ -1576,8 +1564,7 @@ function getSafeFilename(text, maxLength) {
 	if (basicSafeFilename.length === 0) basicSafeFilename = MEDIA_DEFAULT_EMPTY_FILENAME;
 	basicSafeFilename = basicSafeFilename.normalize("NFC");
 	if (maxLength === void 0) return basicSafeFilename;
-	const safeMaxLength = Math.min(maxLength, MEDIA_FILENAME_MAX_LENGTH - 12);
-	return truncateOnWordBoundary(basicSafeFilename, safeMaxLength);
+	return truncateOnWordBoundary(basicSafeFilename, Math.min(maxLength, 108));
 }
 function getUniqueFilePath(filePath, existingFilenames) {
 	let newFilePath = appendFilenameIncrement(filePath, 1);
@@ -1600,7 +1587,7 @@ function auditUniqueFilePath(filePath, existingFilenames) {
 */
 function stripFilenameIncrement(filename) {
 	const validExtension = filename.endsWith(".") || filename.endsWith(")") ? void 0 : path.extname(filename);
-	const strippedBaseNameWithoutExtension = path.basename(filename, validExtension).replace(/\s\(\d+\)$/, "");
+	const strippedBaseNameWithoutExtension = path.basename(filename, validExtension).replace(FILENAME_INCREMENT_SUFFIX_REGEX, "");
 	return path.join(path.dirname(filename), `${strippedBaseNameWithoutExtension}${validExtension ?? ""}`);
 }
 function appendFilenameIncrement(filename, value) {
@@ -1611,9 +1598,9 @@ function appendFilenameIncrement(filename, value) {
 function getTemporarilyUniqueFilePath(filePath) {
 	return `${filePath}-${nanoid(8)}`;
 }
-
 //#endregion
 //#region src/lib/utilities/resolve-link.ts
+const MD_EXTENSION_REGEX = /\.md$/;
 const defaultResolveLinkOptions = {
 	allFilePaths: [],
 	basePath: void 0,
@@ -1722,13 +1709,13 @@ function resolveLink(filePathOrUrl, options) {
 function resolveNameLink(name, cwd, allFilePaths) {
 	if (allFilePaths.length === 0) return;
 	const [base, query] = getBaseAndQueryParts(name);
-	const baseWithoutMd = base.replace(/\.md$/, "").toLowerCase();
+	const baseWithoutMd = base.replace(MD_EXTENSION_REGEX, "").toLowerCase();
 	const pathsToName = allFilePaths.filter((filePath) => {
-		return filePath.replace(/\.md$/, "").toLowerCase().endsWith(baseWithoutMd);
+		return filePath.replace(MD_EXTENSION_REGEX, "").toLowerCase().endsWith(baseWithoutMd);
 	});
 	if (pathsToName.length === 0) return;
 	if (pathsToName.length === 1) return `${pathsToName[0]}${query ?? ""}`;
-	return `${[...pathsToName].sort((a, b) => {
+	return `${pathsToName.toSorted((a, b) => {
 		if (!base.endsWith(".md") || base.includes(path.sep)) {
 			const aHasCwd = a.startsWith(cwd);
 			if (aHasCwd !== b.startsWith(cwd)) return aHasCwd ? -1 : 1;
@@ -1758,7 +1745,6 @@ function createObsidianVaultLink(absolutePath, basePath, obsidianVault) {
 	const relativePath = stripBasePath(absolutePath, basePath);
 	return `obsidian://open?vault=${encodeURIComponent(obsidianVault)}&file=${encodeURIComponent(relativePath)}`;
 }
-
 //#endregion
 //#region src/lib/parse/remark-resolve-links.ts
 const plugin$1 = function(options) {
@@ -1799,7 +1785,6 @@ const plugin$1 = function(options) {
 		});
 	};
 };
-
 //#endregion
 //#region src/lib/parse/wiki-basic/mdast-util-wiki-basic.ts
 function wikiBasicFromMarkdown() {
@@ -1865,7 +1850,6 @@ function wikiBasicFromMarkdown() {
 		this.exit(token);
 	}
 }
-
 //#endregion
 //#region src/lib/parse/wiki-basic/micromark-extension-wiki-basic.ts
 function wikiBasic() {
@@ -2067,7 +2051,6 @@ function wikiBasic() {
 		}
 	}
 }
-
 //#endregion
 //#region src/lib/parse/wiki-basic/remark-wiki-basic.ts
 /**
@@ -2096,9 +2079,9 @@ const plugin = function() {
 	data.micromarkExtensions = [...data.micromarkExtensions ?? [], wikiBasic()];
 	data.fromMarkdownExtensions = [...data.fromMarkdownExtensions ?? [], wikiBasicFromMarkdown()];
 };
-
 //#endregion
 //#region src/lib/parse/remark-utilities.ts
+const CLOZE_NUMBER_PREFIX_REGEX = /^[(|]?(\d{1,2})(?:[\s).|]|$)(.*)$/;
 const defaultAstFromMarkdownOptions = { ...defaultGlobalOptions };
 async function getAstFromMarkdown(markdown, options) {
 	const { allFilePaths, basePath, cwd, obsidianVault, resolveUrls } = deepmerge(defaultAstFromMarkdownOptions, options ?? {});
@@ -2128,13 +2111,16 @@ function deleteFirstNodeOfType(tree, nodeType) {
 	return tree;
 }
 /**
-* Trims all leading spaces from the first text node and all trailing spaces from
-* the last text node in an array of phrasing content nodes.
+* Trims all leading spaces from the first text node and all trailing spaces
+* from the last text node in an array of phrasing content nodes.
 *
 * This is useful in cases where surrounding white space in text nodes is not
 * necessary and should be removed to clean up the content.
+*
 * @param nodes - An array of phrasing content nodes.
-* @returns The modified array of nodes with leading and trailing spaces trimmed.
+*
+* @returns The modified array of nodes with leading and trailing spaces
+*   trimmed.
 */
 function trimLeadingAndTrailingSpaces(nodes) {
 	const firstNode = nodes.at(0);
@@ -2154,7 +2140,7 @@ function replaceDeleteNodesWithClozeMarkup(ast) {
 	visit(ast, "delete", (node, index, parent) => {
 		if (parent === void 0 || index === void 0 || !("children" in node) || node.children.length === 0) return CONTINUE;
 		if (node.children.length > 0 && isText(node.children[0])) {
-			const result = /^[(|]?(\d{1,2})(?:[\s).|]|$)(.*)$/.exec(node.children[0].value);
+			const result = CLOZE_NUMBER_PREFIX_REGEX.exec(node.children[0].value);
 			if (result !== null && (node.children.length > 1 || (result.at(2) ?? "").length > 0)) {
 				const possibleClozeIndex = Number.parseInt(result.at(1) ?? "", 10);
 				if (!Number.isNaN(possibleClozeIndex)) {
@@ -2276,7 +2262,6 @@ function removeLastEmphasis(ast) {
 		return lastEmphasisNode;
 	}
 }
-
 //#endregion
 //#region src/lib/parse/parse.ts
 const defaultGetNoteFromMarkdownOptions = {
@@ -2435,10 +2420,24 @@ async function getNoteFromMarkdown(markdown, options) {
 		tags: obsidianTagsToAnkiTags(frontmatter.tags)
 	};
 }
+/**
+* Obsidian delimits nested tags with a `/`
+*
+* Anki delimits nested tags with `::`
+*
+* '' and `:` are not permitted in Obsidian tags
+*
+* Curiously, Obsidian allows just `/` and `this//////that` as valid tags,
+* though `/` tags are broken. Fixes
+* https://github.com/kitschpatrol/yanki-obsidian/issues/20
+*
+* We also force coercion to an array of strings (even though non-string tag
+* values shouldn't really be allowed in the first place) to handle edge cases
+* like https://github.com/kitschpatrol/yanki/issues/12
+*/
 function obsidianTagsToAnkiTags(tags) {
-	return (typeof tags === "string" ? [tags] : tags ?? []).map((tag) => tag.replaceAll("/", "::"));
+	return (Array.isArray(tags) ? tags : tags === void 0 ? [] : [tags]).map((tag) => String(tag).replaceAll("/", "::"));
 }
-
 //#endregion
 //#region src/lib/actions/load-local-notes.ts
 const defaultLoadOptions = { ...defaultGlobalOptions };
@@ -2507,7 +2506,6 @@ function getDeckNamesFromFilePaths(absoluteFilePaths, options) {
 	const offset = mode === "common-parent" ? lastSegmentHasFile ? 1 : 1 : lastSegmentHasFile ? 1 : 0;
 	return filePathSegments.map((pathSegments) => pathSegments.slice(commonPathSegments.length - offset).join("::"));
 }
-
 //#endregion
 //#region src/lib/actions/rename.ts
 const defaultRenameNotesOptions = { ...defaultGlobalOptions };
@@ -2573,7 +2571,6 @@ async function renameFiles(allLocalFilePaths, options) {
 		})
 	};
 }
-
 //#endregion
 //#region src/lib/actions/style.ts
 const defaultSetStyleOptions = {
@@ -2608,7 +2605,7 @@ async function setStyle(options) {
 		});
 	}
 	const isChanged = modelsReport.some((model) => model.action !== "unchanged");
-	if (!dryRun && ankiWeb && (isChanged || SYNC_TO_ANKI_WEB_EVEN_IF_UNCHANGED)) await syncToAnkiWeb(client);
+	if (!dryRun && ankiWeb && (isChanged || true)) await syncToAnkiWeb(client);
 	return {
 		ankiWeb,
 		dryRun,
@@ -2633,9 +2630,9 @@ function formatSetStyleResult(result, verbose = false) {
 	}
 	return lines.join("\n");
 }
-
 //#endregion
 //#region src/lib/model/frontmatter.ts
+const NEWLINE_REGEX = /\r?\n/;
 /**
 * Update the noteId in the frontmatter of a markdown string.
 *
@@ -2652,7 +2649,7 @@ function formatSetStyleResult(result, verbose = false) {
 */
 async function setNoteIdInFrontmatter(markdown, noteId) {
 	const [frontmatterStart, frontmatterEnd] = getFrontmatterRange(markdown);
-	const lines = markdown.split(/\r?\n/);
+	const lines = markdown.split(NEWLINE_REGEX);
 	if (frontmatterStart === void 0 || frontmatterEnd === void 0) {
 		if (noteId === void 0) return markdown;
 		return [
@@ -2679,14 +2676,13 @@ async function setNoteIdInFrontmatter(markdown, noteId) {
 	].join("\n");
 }
 function getFrontmatterRange(markdown) {
-	const lines = markdown.split(/\r?\n/);
+	const lines = markdown.split(NEWLINE_REGEX);
 	if (!lines.join("").trim().startsWith("---")) return [void 0, void 0];
 	const frontmatterStart = lines.findIndex((line) => line.startsWith("---"));
 	const frontmatterEnd = lines.findIndex((line, index) => index > frontmatterStart && line.startsWith("---"));
 	if (frontmatterStart === -1 || frontmatterEnd === -1) return [void 0, void 0];
 	return [frontmatterStart, frontmatterEnd];
 }
-
 //#endregion
 //#region src/lib/actions/sync-notes.ts
 const defaultSyncNotesOptions = { ...defaultGlobalOptions };
@@ -2712,6 +2708,7 @@ async function syncNotes(allLocalNotes, options) {
 		duration: performance.now() - startTime,
 		fixedDatabase: false,
 		namespace: sanitizedNamespace,
+		reuploadedMedia: [],
 		synced: allLocalNotesCopy.map((note) => ({
 			action: "ankiUnreachable",
 			note
@@ -2781,12 +2778,13 @@ async function syncNotes(allLocalNotes, options) {
 			} catch {
 				fixedDatabase = true;
 				await client.graphical.guiCheckDatabase();
+				await client.miscellaneous.reloadCollection();
 			}
 		}
 	}
-	const deletedMedia = await deleteUnusedMedia(client, liveNotes, sanitizedNamespace, dryRun);
+	const { deleted: deletedMedia, reuploaded: reuploadedMedia } = await reconcileMedia(client, liveNotes, sanitizedNamespace, dryRun, fileAdapter ?? void 0);
 	const isChanged = deletedDecks.length > 0 || synced.some((note) => note.action !== "unchanged");
-	if (!dryRun && ankiWeb && (isChanged || SYNC_TO_ANKI_WEB_EVEN_IF_UNCHANGED)) await syncToAnkiWeb(client);
+	if (!dryRun && ankiWeb && (isChanged || true)) await syncToAnkiWeb(client);
 	return {
 		ankiWeb,
 		deletedDecks,
@@ -2795,6 +2793,7 @@ async function syncNotes(allLocalNotes, options) {
 		duration: performance.now() - startTime,
 		fixedDatabase,
 		namespace: sanitizedNamespace,
+		reuploadedMedia,
 		synced
 	};
 }
@@ -2807,7 +2806,6 @@ function selectNoteToKeep(duplicates, remoteNote) {
 function findRemoteContentMatchId(localNote, remoteNotes, matchedIds) {
 	return remoteNotes.find((remoteNote) => remoteNote.noteId !== void 0 && !matchedIds.has(remoteNote.noteId) && areNotesEqual(localNote, remoteNote, false))?.noteId ?? void 0;
 }
-
 //#endregion
 //#region src/lib/actions/sync-files.ts
 const defaultSyncFilesOptions = {
@@ -2866,7 +2864,7 @@ async function syncFiles(allLocalFilePaths, options) {
 			for (const [index, renamedNote] of renamedLocalNotes.entries()) renamedNote.note = reloadedLocalNotes[index].note;
 		}
 	}
-	const { deletedDecks, deletedMedia, fixedDatabase, synced } = await syncNotes(renamedLocalNotes.map((note) => note.note), {
+	const { deletedDecks, deletedMedia, fixedDatabase, reuploadedMedia, synced } = await syncNotes(renamedLocalNotes.map((note) => note.note), {
 		ankiConnectOptions,
 		ankiWeb,
 		checkDatabase,
@@ -2899,6 +2897,7 @@ async function syncFiles(allLocalFilePaths, options) {
 		duration: performance.now() - startTime,
 		fixedDatabase,
 		namespace,
+		reuploadedMedia,
 		synced: syncedAndSorted
 	};
 }
@@ -2919,6 +2918,7 @@ function formatSyncFilesResult(result, verbose = false) {
 		if (totalRenamed > 0) lines.push("", `Local notes renamed: ${totalRenamed}`);
 		if (result.deletedDecks.length > 0) lines.push("", `Decks pruned: ${result.deletedDecks.length}`);
 		if (result.deletedMedia.length > 0) lines.push("", `Media assets deleted: ${result.deletedMedia.length}`);
+		if (result.reuploadedMedia.length > 0) lines.push("", `Media assets re-uploaded: ${result.reuploadedMedia.length}`);
 		if (!result.dryRun) lines.push("", `Database automatically fixed: ${result.fixedDatabase ? "Yes" : "No"}`);
 		lines.push("", result.dryRun ? "Sync Plan Details:" : "Sync Details:");
 		for (const { action, filePath, note } of synced) if (filePath === void 0) lines.push(`  Note ID ${note.noteId} ${capitalize(action)} (From Anki)`);
@@ -2926,6 +2926,5 @@ function formatSyncFilesResult(result, verbose = false) {
 	}
 	return lines.join("\n");
 }
-
 //#endregion
-export { cleanNotes, defaultCleanOptions, defaultGetNoteFromMarkdownOptions, defaultGetStyleOptions, defaultListOptions, defaultRenameFilesOptions, defaultSetStyleOptions, defaultSyncFilesOptions, defaultSyncNotesOptions, formatCleanResult, formatListResult, formatSetStyleResult, formatSyncFilesResult, getNoteFromMarkdown, getStyle, hostAndPortToUrl, listNotes, renameFiles, setStyle, syncFiles, syncNotes, urlToHostAndPort };
+export { cleanNotes, defaultCleanOptions, defaultGetNoteFromMarkdownOptions, defaultGetStyleOptions, defaultListOptions, defaultRenameFilesOptions, defaultSetStyleOptions, defaultSyncFilesOptions, defaultSyncNotesOptions, formatCleanResult, formatListResult, formatSetStyleResult, formatSyncFilesResult, getNoteFromMarkdown, getStyle, hostAndPortToUrl, listNotes, renameFiles, setStyle, syncFiles, syncNotes, urlToHostAndPort };