afiqzudinhadi/obsidian-media-db-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Revert "Changed overwrite confirmation to only appear on new notes"

Browse source 
This reverts commit 46952218de.
This commit is contained in:
ltctceplrm 2025-03-05 22:59:28 +01:00
parent 46952218de
commit d24b2d7271
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main.ts
View file

@ -512,15 +512,14 @@ export default class MediaDbPlugin extends Plugin {
// look if file already exists and ask if it should be overwritten // look if file already exists and ask if it should be overwritten
const file = this.app.vault.getAbstractFileByPath(filePath); const file = this.app.vault.getAbstractFileByPath(filePath);
if (file) { if (file) {
if (!options.isUpdating) { const shouldOverwrite = await new Promise<boolean>(resolve => {
const shouldOverwrite = await new Promise<boolean>(resolve => { new ConfirmOverwriteModal(this.app, fileName, resolve).open();
new ConfirmOverwriteModal(this.app, fileName, resolve).open(); });
});
if (!shouldOverwrite) { if (!shouldOverwrite) {
throw new Error('MDB | file creation cancelled by user'); throw new Error('MDB | file creation cancelled by user');
}
} }
await this.app.vault.delete(file); await this.app.vault.delete(file);
} }
@ -575,9 +574,9 @@ export default class MediaDbPlugin extends Plugin {
console.debug(`MDB | newMediaTypeModel after merge`, newMediaTypeModel); console.debug(`MDB | newMediaTypeModel after merge`, newMediaTypeModel);
if (onlyMetadata) { if (onlyMetadata) {
await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachFile: activeFile, folder: activeFile.parent ?? undefined, openNote: true, isUpdating: true }); await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachFile: activeFile, folder: activeFile.parent ?? undefined, openNote: true });
} else { } else {
await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachTemplate: true, folder: activeFile.parent ?? undefined, openNote: true, isUpdating: true }); await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachTemplate: true, folder: activeFile.parent ?? undefined, openNote: true });
} }
} }

1
src/utils/Utils.ts
View file

@ -193,7 +193,6 @@ export interface CreateNoteOptions {
attachFile?: TFile; attachFile?: TFile;
openNote?: boolean; openNote?: boolean;
folder?: TFolder; folder?: TFolder;
isUpdating?: boolean; // New property
} }
export function migrateObject<T extends object>(object: T, oldData: any, defaultData: T): void { export function migrateObject<T extends object>(object: T, oldData: any, defaultData: T): void {