fix: bug introduced by frontmatter update

reuseman#196

Author: chaecramb

src/entities/card.ts

@@ -2,7 +2,7 @@ import { CODE_DECK_EXTENSION } from "src/conf/constants";
 import { arraysEqual } from "src/utils";
 
 export abstract class Card {
-  id: number;
+  id: number | null;
   deckName: string;
   initialContent: string;
   fields: Record<string, string>;

src/services/cards.ts

@@ -60,7 +60,10 @@ export class CardsService {
     let deckName = "";
     if (parseFrontMatterEntry(frontmatter, "cards-deck")) {
       deckName = parseFrontMatterEntry(frontmatter, "cards-deck");
-    } else if (this.settings.folderBasedDeck && activeFile.parent?.path !== "/") {
+    } else if (
+      this.settings.folderBasedDeck &&
+      activeFile.parent?.path !== "/"
+    ) {
       // If the current file is in the path "programming/java/strings.md" then the deck name is "programming::java"
       // TODO parent might be undefined
       deckName = activeFile.parent!.path.split("/").join("::");
@@ -191,68 +194,45 @@ export class CardsService {
     frontmatter: FrontMatterCache,
     deckName: string
   ): Promise<number | undefined> {
-    if (cardsToCreate.length) {
-      let insertedCards = 0;
-      try {
-        const ids = await this.anki.addCards(cardsToCreate);
-        // Add IDs from response to Flashcard[]
-        ids.map((id: number, index: number) => {
-          cardsToCreate[index].id = id;
-        });
-
-        let total = 0;
-        cardsToCreate.forEach((card) => {
-          if (card.id === null) {
-            new Notice(
-              `Error, could not add: '${card.initialContent}'`,
-              NOTICE_TIMEOUT
-            );
-          } else {
-            card.reversed ? (insertedCards += 2) : insertedCards++;
-          }
-          card.reversed ? (total += 2) : total++;
-        });
+    if (cardsToCreate.length === 0) return;
 
-        this.updateFrontmatter(frontmatter, deckName);
-        this.writeAnkiBlocks(cardsToCreate);
+    let ids: number[] | undefined = undefined;
+    try {
+      ids = await this.anki.addCards(cardsToCreate);
+    } catch (err) {
+      console.error(err);
+      throw Error("Error: Could not write cards on Anki");
+    }
 
-        this.notifications.push(
-          `Inserted successfully ${insertedCards}/${total} cards.`
+    ids.forEach((id: number, index: number) => (cardsToCreate[index].id = id));
+
+    let cardsInserted = 0;
+    let cardsTotal = 0;
+    cardsToCreate.forEach((card) => {
+      cardsTotal += card.reversed ? 2 : 1;
+      if (card.id !== null) {
+        cardsInserted += card.reversed ? 2 : 1;
+      } else {
+        new Notice(
+          `Error, could not add: '${card.initialContent}'`,
+          NOTICE_TIMEOUT
         );
-        return insertedCards;
-      } catch (err) {
-        console.error(err);
-        Error("Error: Could not write cards on Anki");
       }
-    }
-  }
+    });
 
-  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;
-    }
+    // update frontmatter
+    // TODO this might not be needed?
+    const activeFile = this.app.workspace.getActiveFile()!;
+    this.app.fileManager.processFrontMatter(activeFile, (frontmatter) => {
+      frontmatter["cards-deck"] = deckName;
+    });
+
+    this.writeAnkiBlocks(cardsToCreate);
+
+    this.notifications.push(
+      `Inserted successfully ${cardsInserted}/${cardsTotal} cards.`
+    );
+    return cardsInserted;
   }
 
   private writeAnkiBlocks(cardsToCreate: Card[]) {