Revert "Changed overwrite confirmation to only appear on new notes"
This reverts commit 46952218de.
This commit is contained in:
parent
46952218de
commit
d24b2d7271
2 changed files with 8 additions and 10 deletions
|
|
@ -512,7 +512,6 @@ export default class MediaDbPlugin extends Plugin {
|
|||
// look if file already exists and ask if it should be overwritten
|
||||
const file = this.app.vault.getAbstractFileByPath(filePath);
|
||||
if (file) {
|
||||
if (!options.isUpdating) {
|
||||
const shouldOverwrite = await new Promise<boolean>(resolve => {
|
||||
new ConfirmOverwriteModal(this.app, fileName, resolve).open();
|
||||
});
|
||||
|
|
@ -520,7 +519,7 @@ export default class MediaDbPlugin extends Plugin {
|
|||
if (!shouldOverwrite) {
|
||||
throw new Error('MDB | file creation cancelled by user');
|
||||
}
|
||||
}
|
||||
|
||||
await this.app.vault.delete(file);
|
||||
}
|
||||
|
||||
|
|
@ -575,9 +574,9 @@ export default class MediaDbPlugin extends Plugin {
|
|||
console.debug(`MDB | newMediaTypeModel after merge`, newMediaTypeModel);
|
||||
|
||||
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 {
|
||||
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 });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -193,7 +193,6 @@ export interface CreateNoteOptions {
|
|||
attachFile?: TFile;
|
||||
openNote?: boolean;
|
||||
folder?: TFolder;
|
||||
isUpdating?: boolean; // New property
|
||||
}
|
||||
|
||||
export function migrateObject<T extends object>(object: T, oldData: any, defaultData: T): void {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue