diff options
Diffstat (limited to 'ext/bg/js')
| -rw-r--r-- | ext/bg/js/anki-note-builder.js | 21 | ||||
| -rw-r--r-- | ext/bg/js/anki.js | 15 | 
2 files changed, 34 insertions, 2 deletions
| diff --git a/ext/bg/js/anki-note-builder.js b/ext/bg/js/anki-note-builder.js index f04a6bf7..aa76ecd9 100644 --- a/ext/bg/js/anki-note-builder.js +++ b/ext/bg/js/anki-note-builder.js @@ -44,6 +44,14 @@ class AnkiNoteBuilder {              await this._injectMedia(anki, definition, fields, mode, audioDetails, screenshotDetails, clipboardDetails);          } +        let duplicateScopeDeckName = null; +        let duplicateScopeCheckChildren = false; +        if (duplicateScope === 'deck-root') { +            duplicateScope = 'deck'; +            duplicateScopeDeckName = this.getRootDeckName(deck); +            duplicateScopeCheckChildren = true; +        } +          const fieldEntries = Object.entries(fields);          const noteFields = {};          const note = { @@ -51,7 +59,13 @@ class AnkiNoteBuilder {              tags,              deckName: deck,              modelName: model, -            options: {duplicateScope} +            options: { +                duplicateScope, +                duplicateScopeOptions: { +                    deckName: duplicateScopeDeckName, +                    checkChildren: duplicateScopeCheckChildren +                } +            }          };          const data = this._createNoteData(definition, mode, context, resultOutputMode, compactGlossaries); @@ -81,6 +95,11 @@ class AnkiNoteBuilder {          return false;      } +    getRootDeckName(deckName) { +        const index = deckName.indexOf('::'); +        return index >= 0 ? deckName.substring(0, index) : deckName; +    } +      // Private      _createNoteData(definition, mode, context, resultOutputMode, compactGlossaries) { diff --git a/ext/bg/js/anki.js b/ext/bg/js/anki.js index 182b4ded..84d81d49 100644 --- a/ext/bg/js/anki.js +++ b/ext/bg/js/anki.js @@ -92,13 +92,26 @@ class AnkiConnect {          if (!this._enabled) { return []; }          await this._checkVersion();          const actions = notes.map((note) => { -            let query = (duplicateScope === 'deck' ? `"deck:${this._escapeQuery(note.deckName)}" ` : ''); +            let query = ''; +            switch (duplicateScope) { +                case 'deck': +                    query = `"deck:${this._escapeQuery(note.deckName)}" `; +                    break; +                case 'deck-root': +                    query = `"deck:${this._escapeQuery(this.getRootDeckName(note.deckName))}" `; +                    break; +            }              query += this._fieldsToQuery(note.fields);              return {action: 'findNotes', params: {query}};          });          return await this._invoke('multi', {actions});      } +    getRootDeckName(deckName) { +        const index = deckName.indexOf('::'); +        return index >= 0 ? deckName.substring(0, index) : deckName; +    } +      // Private      async _checkVersion() { |