From c79391c446a9e805da61eee48e21247c0c1bd6c5 Mon Sep 17 00:00:00 2001 From: Chae Cramb Date: Wed, 16 Aug 2023 16:25:35 +0100 Subject: [PATCH] fix bug introduced by yaml properties update --- src/services/cards.ts | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/src/services/cards.ts b/src/services/cards.ts index 238ea86..e1829c4 100644 --- a/src/services/cards.ts +++ b/src/services/cards.ts @@ -116,7 +116,7 @@ export class CardsService { this.insertMedias(cards, sourcePath); await this.deleteCardsOnAnki(cardsToDelete, ankiBlocks); await this.updateCardsOnAnki(cardsToUpdate); - await this.insertCardsOnAnki(cardsToCreate, frontmatter, deckName); + await this.insertCardsOnAnki(cardsToCreate); // Update decks if needed const deckNeedToBeChanged = await this.deckNeedToBeChanged( @@ -142,6 +142,8 @@ export class CardsService { } } + this.updateFrontmatter(frontmatter, deckName); + if (!this.notifications.length) { this.notifications.push("Nothing to do. Everything is up to date"); } @@ -185,11 +187,7 @@ export class CardsService { } } - private async insertCardsOnAnki( - cardsToCreate: Card[], - frontmatter: FrontMatterCache, - deckName: string - ): Promise { + private async insertCardsOnAnki(cardsToCreate: Card[]): Promise { if (cardsToCreate.length) { let insertedCards = 0; try { @@ -212,7 +210,6 @@ export class CardsService { card.reversed ? (total += 2) : total++; }); - this.updateFrontmatter(frontmatter, deckName); this.writeAnkiBlocks(cardsToCreate); this.notifications.push( @@ -227,31 +224,11 @@ export class CardsService { } private updateFrontmatter(frontmatter: FrontMatterCache, deckName: string) { - let newFrontmatter = ""; - const cardsDeckLine = `cards-deck: ${deckName}\n`; - if (frontmatter) { - const oldFrontmatter: string = this.file.substring( - frontmatter.position.start.offset, - frontmatter.position.end.offset - ); - if (!oldFrontmatter.match(this.regex.cardsDeckLine)) { - newFrontmatter = - oldFrontmatter.substring(0, oldFrontmatter.length - 3) + - cardsDeckLine + - "---"; - this.totalOffset += cardsDeckLine.length; - this.file = - newFrontmatter + - this.file.substring( - frontmatter.position.end.offset, - this.file.length + 1 - ); - } - } else { - newFrontmatter = `---\n${cardsDeckLine}---\n\n`; - this.totalOffset += newFrontmatter.length; - this.file = newFrontmatter + this.file; - } + const activeFile = this.app.workspace.getActiveFile() + + this.app.fileManager.processFrontMatter(activeFile, (frontmatter) => { + frontmatter["cards-deck"] = deckName; + }); } private writeAnkiBlocks(cardsToCreate: Card[]) {