yanki 2.0.1 → 2.0.3

package/dist/lib/index.d.ts

@@ -194,6 +194,7 @@ type SyncNotesResult = Simplify<Pick<GlobalOptions, 'ankiWeb' | 'dryRun' | 'name
   deletedMedia: string[];
   duration: number;
   fixedDatabase: boolean;
+  reuploadedMedia: string[];
   synced: SyncedNote[];
 }>;
 /**

package/dist/lib/index.js

@@ -534,8 +534,8 @@ function resolveWithBasePath(filePath, options) {
 	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);
@@ -1318,7 +1318,7 @@ async function deleteOrphanedDecks(client, activeNotes, originalNotes, dryRun) {
 		while (parts.length > 1) {
 			parts.pop();
 			const parentDeckName = parts.join("::");
-			if (activeNoteDeckNames.some((deckName) => parentDeckName.includes(deckName))) break;
+			if (activeNoteDeckNames.some((deckName) => deckName.startsWith(`${parentDeckName}::`))) break;
 			orphanedParentDeckNames.push(parentDeckName);
 		}
 	}
@@ -1409,21 +1409,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.
@@ -1467,7 +1495,7 @@ 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);
 	return {
@@ -2712,6 +2740,7 @@ async function syncNotes(allLocalNotes, options) {
 		duration: performance.now() - startTime,
 		fixedDatabase: false,
 		namespace: sanitizedNamespace,
+		reuploadedMedia: [],
 		synced: allLocalNotesCopy.map((note) => ({
 			action: "ankiUnreachable",
 			note
@@ -2784,7 +2813,7 @@ async function syncNotes(allLocalNotes, options) {
 			}
 		}
 	}
-	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);
 	return {
@@ -2795,6 +2824,7 @@ async function syncNotes(allLocalNotes, options) {
 		duration: performance.now() - startTime,
 		fixedDatabase,
 		namespace: sanitizedNamespace,
+		reuploadedMedia,
 		synced
 	};
 }
@@ -2866,7 +2896,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 +2929,7 @@ async function syncFiles(allLocalFilePaths, options) {
 		duration: performance.now() - startTime,
 		fixedDatabase,
 		namespace,
+		reuploadedMedia,
 		synced: syncedAndSorted
 	};
 }
@@ -2919,6 +2950,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)`);

package/dist/standalone/index.d.ts

@@ -1554,6 +1554,7 @@ type SyncNotesResult = Simplify<Pick<GlobalOptions, 'ankiWeb' | 'dryRun' | 'name
   deletedMedia: string[];
   duration: number;
   fixedDatabase: boolean;
+  reuploadedMedia: string[];
   synced: SyncedNote[];
 }>;
 /**