1.12.5.11 (#80)

## [1.12.5.11]

-   feat #78 fsrs v5 setting support enable_short_term and enable_fuzz (by @ishiko732).
-   fix #77 codeblock render error;
-   fix #76 sidebar note didn't show;
-   fix note random review;

docs/docs/changelog.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [1.12.5.11]
+
+-   feat #78 fsrs v5 setting support enable_short_term and enable_fuzz (by @ishiko732).
+-   fix #77 codeblock render error;
+-   fix #76 sidebar note didn't show;
+-   fix note random review;
+
 ## [1.12.5.10]
 
 -   同步原插件最新分支sync upsteam branch;

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-spaced-repetition-recall",
     "name": "Spaced Repetition Recall",
-    "version": "1.12.5.10",
+    "version": "1.12.5.11",
     "minAppVersion": "1.2.8",
     "description": "Fight the forgetting curve by reviewing flashcards & entire notes.",
     "author": "Newdea",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "obsidian-spaced-repetition",
-    "version": "1.12.5.10",
+    "version": "1.12.5.11",
     "description": "Fight the forgetting curve by reviewing flashcards & entire notes.",
     "main": "main.js",
     "scripts": {

src/generateParser.ts

@@ -86,7 +86,7 @@ main
 /* The input text to the parser contains arbitrary text, not just card definitions. 
   Hence we fallback to matching on loose_line. The result from loose_line is filtered out by filterBlocks() */  
 block
-  = html_comment / inline_rev_card / inline_card / multiline_rev_card / multiline_card / close_card / loose_line
+  = html_comment / inline_rev_card / inline_card / multiline_rev_card / multiline_card / close_card / backprime_code_line / loose_line
 
 html_comment
   = $("<!--" (!"-->" (html_comment / .))* "-->" newline?) {
@@ -127,7 +127,7 @@ multiline
   }
   
 multiline_before
-  = $(!multiline_mark nonempty_text_line)+
+  = $(!multiline_mark (tilde_code / backprime_code / nonempty_text_line ))+
 
 multiline_after
   = $(!separator_line (tilde_code / backprime_code / text_line))+
@@ -143,6 +143,11 @@ tilde_code
 tilde_marker
   = "~~~" "~"*
 
+backprime_code_line
+  = $(backprime_code) {
+    return createParsedQuestionInfo(CardType.Ignore,"",location().start.line-1,location().end.line-2);
+  }
+
 backprime_code
   = $(
     left:$backprime_marker text_line 
@@ -177,7 +182,7 @@ close_line
   = ((!close_text non_newline)* close_text) text_line_nonterminated?
   
 multiline_before_close
-  = (!close_line nonempty_text_line)+
+  = (!close_line !backprime_marker nonempty_text_line)+
 
 multiline_after_close
   = e:(!(newline separator_line) text_line1)+

src/gui/Sidebar.tsx

@@ -209,11 +209,12 @@ export class ReviewQueueListView extends ItemView {
         deck: ReviewDeck,
         plugin: SRPlugin,
     ): void {
-        const navFileEl: HTMLElement = folderEl
-            .getElementsByClassName("tree-item-children nav-folder-children")[0]
-            .createDiv("nav-file");
+        const childrenEl: HTMLElement = folderEl.getElementsByClassName(
+            "tree-item-children nav-folder-children",
+        )[0] as HTMLElement;
+        const navFileEl: HTMLElement = childrenEl.createDiv("nav-file");
         if (hidden) {
-            navFileEl.style.display = "none";
+            childrenEl.style.display = "none";
         }
 
         const navFileTitle: HTMLElement = navFileEl.createDiv("tree-item-self nav-file-title");

src/main.ts

@@ -142,6 +142,7 @@ export default class SRPlugin extends Plugin {
 
     async onload(): Promise<void> {
         SRPlugin._instance = this;
+        Iadapter.create(this.app);
         await this.loadPluginData();
         this.easeByPath = new NoteEaseList(this.data.settings);
         this.questionPostponementList = new QuestionPostponementList(
@@ -157,7 +158,6 @@ export default class SRPlugin extends Plugin {
         if (isVersionNewerThanOther(PLUGIN_VERSION, this.data.settings.previousRelease)) {
             new ReleaseNotes(this.app, this, obsidianJustInstalled ? null : PLUGIN_VERSION).open();
         }
-        Iadapter.create(this.app);
 
         const settings = this.data.settings;
         this.algorithm = algorithms[settings.algorithm];
@@ -188,7 +188,15 @@ export default class SRPlugin extends Plugin {
         registerTrackFileEvents(this);
 
         if (this.data.settings.dataLocation !== DataLocation.SaveOnNoteFile) {
-            this.registerInterval(window.setInterval(() => this.store.save(), 5 * 60 * 1000));
+            this.registerInterval(
+                window.setInterval(
+                    async () => {
+                        await this.sync();
+                        this.store.save();
+                    },
+                    5 * 60 * 1000,
+                ),
+            );
         }
 
         this.statusBar = this.addStatusBarItem();
@@ -867,11 +875,11 @@ export default class SRPlugin extends Plugin {
             }
         };
 
-        index = IReviewNote.getNextDueNoteIndex(
-            deck.dueNotesCount,
-            this.data.settings.openRandomNote,
-        );
-        if (mqs.isDue && index >= 0) {
+        if (mqs.isDue && deck.dueNotesCount > 0) {
+            index = IReviewNote.getNextNoteIndex(
+                deck.dueNotesCount,
+                this.data.settings.openRandomNote,
+            );
             await this.app.workspace.getLeaf().openFile(deck.scheduledNotes[index].note);
             item = deck.scheduledNotes[index].item;
             fShowItemInfo(item, "scheduledNoes index: " + index);
@@ -891,9 +899,10 @@ export default class SRPlugin extends Plugin {
             }
         }
         if (!mqs.isDue && deck.newNotes.length > 0) {
-            const index = this.data.settings.openRandomNote
-                ? Math.floor(Math.random() * deck.newNotes.length)
-                : 0;
+            const index = IReviewNote.getNextNoteIndex(
+                deck.newNotes.length,
+                this.data.settings.openRandomNote,
+            );
             await this.app.workspace.getLeaf().openFile(deck.newNotes[index].note);
             item = deck.newNotes[index].item;
             fShowItemInfo(item, "newNotes index:" + index);

src/reviewNote/review-note.ts

@@ -135,16 +135,13 @@ export abstract class IReviewNote {
         }
     }
 
-    static getNextDueNoteIndex(NotesCount: number, openRandomNote: boolean = false) {
-        let index = -1;
+    static getNextNoteIndex(NotesCount: number, openRandomNote: boolean = false) {
+        let index = 0;
 
-        if (NotesCount < 1) {
-            return -1;
-        }
         if (!openRandomNote) {
             return 0;
         } else {
-            index = Math.floor(Math.random() * NotesCount);
+            index = Math.floor(Math.random() * (NotesCount - 0.1)); // avoid conner case: index == notesCount;
         }
         return index;
     }