fix different device sync issue

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,51 @@
+---
+name: Bug report
+about: Create a bug report to help us improve the plugin.
+title: "[BUG]"
+labels: bug
+assignees: ""
+---
+
+**Before report the bug**
+
+-   [ ] searched the issues;
+-   [ ] disable origin `Obsidian Sapced Repetition` plugin;
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain the bug. This could be the logs in the developer console (`CTRL` + `SHIFT` + `i`).
+
+-   [ ] error messages
+
+**Versions (please complete the following information):**
+
+-   [ ] OS: [e.g. iOS]
+-   [ ] Obsidian version: [e.g. v0.12.4]
+-   [ ] Plugin version: [e.g. v1.4.9]
+-   [ ] If on desktop, Installer version: [run `this.navigator.appVersion` on the developer console, e.g. `5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) obsidian/0.12.3 Chrome/89.0.4389.128 Electron/12.0.6 Safari/537.36"`]
+
+**Additional context**
+Add any other context about the problem here (e.g. the markdown producing the error).
+
+-   Data Location Setting(select):
+-   [ ] Save in Note;
+-   [ ] Save in `tracked_files.json`
+-   Algorithm(select):
+-   [ ] Default
+-   [ ] Anki
+-   [ ] Fsrs
+-   [ ] SM2
+-   [ ] Additional context

.github/workflows/e2e.yml

@@ -16,7 +16,7 @@ jobs:
             - name: Setup Node
               uses: actions/setup-node@v4
               with:
-                  node-version: "20"
+                  node-version: "22"
 
             - uses: actions/checkout@v3
 

.github/workflows/pr.yml

@@ -2,20 +2,71 @@ name: Lint and Test
 
 on:
     pull_request:
-        branches: [master]
+        branches: ["**"]
+    push:
+        branches:
+            - "**"
 
 env:
     COREPACK_ENABLE_STRICT: 0
 
 jobs:
+    # https://github.com/snezhig/obsidian-front-matter-title/blob/master/.github/workflows/main.yml
+    validate:
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v3
+              with:
+                  submodules: "true"
+            - name: Install Dependencies
+              run: npm install -g pnpm && pnpm install
+
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "22"
+                  cache: "pnpm"
+            - run: pnpm i
+
+            # - name: Eslint
+            #   run: pnpm run lint
+
+            - name: Run test
+              run: pnpm run test
+
+    pretty:
+        needs: validate
+        runs-on: ubuntu-latest
+        # if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Newdea/obsidian-spaced-repetition-recall'
+        permissions: write-all
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+              with:
+                  # Make sure the actual branch is checked out when running on pull requests
+                  ref: ${{ github.head_ref }}
+
+            - name: Prettify code
+              uses: creyD/[email protected]
+              with:
+                  prettier_version: ^3.1.1
+                  # This part is also where you can pass other options, for example:
+                  # prettier_options: --write *.ts *.json src test --ignore-path package-lock.json
+                  # --config .prettierrc.json --ignore-path package-lock.json pnpm-lock.yaml
+                  prettier_options: --write .
+
     lint_and_test:
+        needs: pretty
         runs-on: ubuntu-latest
 
         steps:
             - name: Setup Node
               uses: actions/setup-node@v4
               with:
-                  node-version: "20"
+                  node-version: "22"
 
             - uses: actions/checkout@v3
 

.github/workflows/release.yml

@@ -6,9 +6,11 @@ on:
             - "*"
 
 env:
-    PLUGIN_NAME: obsidian-spaced-repetition
+    PLUGIN_NAME: obsidian-spaced-repetition-recall
     COREPACK_ENABLE_STRICT: 0
 
+permissions: write-all
+
 jobs:
     release:
         runs-on: ubuntu-latest
@@ -19,7 +21,7 @@ jobs:
             - name: Use Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: "20"
+                  node-version: "22"
 
             - name: Build
               id: build

.gitignore

@@ -20,6 +20,7 @@ yarn-error.log
 
 # build
 build
+config.js
 
 # testing
 coverage

.npmrc

@@ -1 +1 @@
-use-node-version=20.1.0
+use-node-version=22.2.0

.prettierrc.json

@@ -1,5 +1,6 @@
 {
     "printWidth": 100,
     "tabWidth": 4,
-    "semi": true
+    "semi": true,
+    "trailingComma": "all"
 }

CHANGELOG.md

@@ -1 +1 @@
-docs/changelog.md
+docs/docs/changelog.md

CONTRIBUTING.md

@@ -1 +1 @@
-docs/en/contributing.md
+docs/docs/en/contributing.md

README.md

@@ -1,42 +1,71 @@
+This is a modified version of [obsidian-spaced-repetition](https://github.com/st3v3nmw/obsidian-spaced-repetition) and merging [recall plugin](https://github.com/martin-jw/obsidian-recall) to use seperate json data file, and add some interesting features.
+
+就是 SR 的时间排程信息可以单独保存，~~不修改原笔记文件内容~~(如果卡片复习，开启blockid设置，会在卡片文本后追加BlockID)，以及添加其他功能。
+
 # Flashcard-Based and Note-Based Spaced Repetition Plugin
 
-<img src="https://img.shields.io/github/downloads/st3v3nmw/obsidian-spaced-repetition/total" /> <img src="https://img.shields.io/github/downloads/st3v3nmw/obsidian-spaced-repetition/latest/total?style=flat-square" /> <img src="https://img.shields.io/github/manifest-json/v/st3v3nmw/obsidian-spaced-repetition?style=flat-square" />
+## Features
 
-Fight the forgetting curve & note aging by reviewing flashcards & notes using spaced repetition on Obsidian.md
+-   [@st3v3nmw's ReadMe](https://github.com/st3v3nmw/obsidian-spaced-repetition#readme)
+-   [中文使用手册](./docs/README_ZH.md)
 
--   Check the documentation [here](https://www.stephenmwangi.com/obsidian-spaced-repetition/).
--   Check the [roadmap](https://github.com/st3v3nmw/obsidian-spaced-repetition/projects/3/) for upcoming features & fixes.
--   Raise an issue [here](https://github.com/st3v3nmw/obsidian-spaced-repetition/issues/) if you have a feature request or a bug report.
--   Visit the [discussions](https://github.com/st3v3nmw/obsidian-spaced-repetition/discussions/) section for Q&A help, feedback, and general discussion.
--   The plugin has been translated into _Arabic / العربية, Chinese (Simplified) / 简体中文, Chinese (Traditional) / 繁體中文, Czech / čeština, German / Deutsch, Italian / Italiano, Korean / 한국어, Japanese / 日本語, Polish / Polski, Portuguese (Brazil) / Português do Brasil, Spanish / Español, and Russian / русский_ by the Obsidian community 😄.
-    -   To help translate this plugin to your language, check the [translation guide here](https://www.stephenmwangi.com/obsidian-spaced-repetition/contributing/#translating_1).
+-   merge [recall plugin](https://github.com/martin-jw/obsidian-recall) to use seperate file
+    -   setting where to save schedule info by Data Location
+        -   save on note file, just as used do.
+        -   save on seperate tracked_files.json.
+    -   setting convert tracked note to decks
+    -   switch Algorithm(only work on saving on seperate tracked_files.json.): Default, anki, [Fsrs](https://github.com/open-spaced-repetition/ts-fsrs)
+    -   file menu to tracknote/untracknote
+-   show floatbar for reviewing response when reviewing note by click statusbar or review command or sidebar, and can set whether showing the interval or not;
+-   Reviewing a Notes directly [#635];
+-   when using fsrs, output `ob-revlog.csv`, to optimize the algorithm parameters using [optimizer](https://github.com/open-spaced-repetition/fsrs-optimizer) for better review;
+-   Statistics: add note view statistics,and today review statistics;
+-   Postpone notes/cards;
+-   postpone to review after x days;
+-   reschedule all scheduled items;
+-   support multi-clozes;
+-   setting `burySiblingCards` split into `burySiblingCards`(origin) and `burySiblingCardsByNoteReview`, and multi-clozes will not be buried;
+-   Setting: Card index uses BlockID, which appends BlockID (e.g. `^blkid1`) to the card text, **will modify the original notes file**. Off by default, but card index may not be accurate enough;
+-   Setting: Mix ondue and new notes queue when reviewing(default: 3 ondue notes, then 2 new notes);
 
-## Features
+## Maintainers Wanted
+
+Since I am not a programmer, I don't know much about typescript programming, so I can only do some bug fixes and small feature updates. but it is difficult to realize some of the proposed features. Welcome to join us if you are interested in this plugin, and work together to maintain and update this plugin.
+
+You can join us by submitting an [issue](https://github.com/open-spaced-repetition/obsidian-spaced-repetition-recall/issues)/[PR](https://github.com/open-spaced-repetition/obsidian-spaced-repetition-recall/pulls)、或[论坛讨论](https://forum-zh.obsidian.md/t/topic/20551) directly.
+
+## How to install the plugin
 
--   Flashcards
-    -   [Decks](https://www.stephenmwangi.com/obsidian-spaced-repetition/flashcards/#decks) (Using Obsidian's hierarchical tags or folder structure)
-    -   [Single-line style](https://www.stephenmwangi.com/obsidian-spaced-repetition/flashcards/#single-line-basic-remnote-style) (`Question::Answer`)
-    -   [Single-line reversed style](https://www.stephenmwangi.com/obsidian-spaced-repetition/flashcards/#single-line-reversed) (`Question:::Answer`)
-    -   [Multi-line style](https://www.stephenmwangi.com/obsidian-spaced-repetition/flashcards/#multi-line-basic) (Separated by `?`)
-    -   [Multi-line reversed style](https://www.stephenmwangi.com/obsidian-spaced-repetition/flashcards/#multi-line-reversed) (Separated by `??`)
-    -   [Cloze cards](https://www.stephenmwangi.com/obsidian-spaced-repetition/flashcards/#cloze-cards) (`==highlight==` your cloze deletions!, `**bolded text**`, or `{{text in curly braces}}`)
-    -   [Card context - automatic titles based on headings](https://www.stephenmwangi.com/obsidian-spaced-repetition/flashcards/#context) (i.e. `Note title > Heading 1 > Subheading`)
-    -   Rich text support in flashcards (inherited from Obsidian)
-        -   Images, Audio, & Video
-        -   LaTeX
-        -   Code syntax highlighting
-        -   Footnotes
--   Notes
-    -   [Reviewing entire notes](https://www.stephenmwangi.com/obsidian-spaced-repetition/notes/)
-    -   Possible use case: [Incremental writing](https://www.stephenmwangi.com/obsidian-spaced-repetition/notes/#incremental-writing)
--   [Statistics](https://www.stephenmwangi.com/obsidian-spaced-repetition/flashcards/#statistics)
+1. Download main.js, manifest.json, styles.css from the latest release (see [releases](https://github.com/open-spaced-repetition/obsidian-spaced-repetition-recall/releases/))
+2. Create a new folder `obsidian-spaced-repetition-recall` in `Vault-name/.obsidian/plugins` and put the downloaded files in there
+3. Reload your plugins and enable the plugin
+
+OR USE BRAT pulgin;
 
 ## Usage
 
-Check the [docs](https://www.stephenmwangi.com/obsidian-spaced-repetition/) for more details.
+Check the [docs](./docs/usage.md) for more details.
+
+## Thanks
+
+I develop this plugin as a hobby, spending my free time doing this. If you find it valuable, then please say THANK YOU or buy me a coffee...
+
+<div class="ex-coffee-div" align = "center">
+<a ><img src="https://github.com/Newdea/newdea/blob/main/.github/funding/QR_alipay.png?v=3" height=120></a>
+<a ><img src="https://github.com/Newdea/newdea/blob/main/.github/funding/QR_wechat.png?v=3" height=120></a>
+</div>
+
+or buy original plugin author(@st3v3nmw) a coffee...
 
 ## Supported By
 
 <a href='https://ko-fi.com/M4M44DEN6' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://cdn.ko-fi.com/cdn/kofi3.png?v=2' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
 
-<a href="https://jb.gg/OpenSourceSupport" target="_blank"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" height='128' style='border:0px;height:128px;' alt="JetBrains Logo (Main) logo."></a>
+---
+
+Thank you to everyone who has created a plugin that inspired me and I took code from.
+
+-   first, thanks to [@st3v3nmw's obsidian-spaced-repetition](https://github.com/st3v3nmw/obsidian-spaced-repetition) and [@martin-jw recall plugin](https://github.com/martin-jw/obsidian-recall)
+-   floatbar(thanks to [@chetachi's cMenu](https://github.com/chetachiezikeuzor/cMenu-Plugin))
+-   [Fsrs Algorithm](https://github.com/open-spaced-repetition)
+-   ReleaseNotes(thanks to [@Zsolt Viczian Excalidraw](https://zsolt.blog))

docs/README_ZH.md

@@ -0,0 +1,76 @@
+本插件是魔改自[obsidian-spaced-repetition](https://github.com/st3v3nmw/obsidian-spaced-repetition) 和 [recall plugin](https://github.com/martin-jw/obsidian-recall)
+就是 SR 的复习时间信息可以单独保存，~~不修改原笔记文件内容~~(如果卡片复习，开启blockid设置，会在卡片文本后追加BlockID)，以及添加其他功能。
+
+## Features
+
+-   [@st3v3nmw's ReadMe](https://github.com/st3v3nmw/obsidian-spaced-repetition#readme)
+-   [english ReadMe](../README.md)
+
+1. 复习时间信息可以保存在单独文件内，不修改原笔记文件内容；
+2. 在复习笔记时可以显示悬浮栏（跟复习卡片时类似），方便选择记忆效果，且可显隐到下次重复的时间间隔；
+3. 可以只转换复习笔记到卡片组，而不是全部库的笔记都转换;
+4. 在有多个标签时，可不用选标签，直接打开笔记；
+5. 算法可以切换：默认的 Anki 优化算法、Anki 算法、[Fsrs 算法](https://github.com/open-spaced-repetition/ts-fsrs)；
+6. 使用 Fsrs 算法时，可根据标签输出重复日志文件 `ob_revlog.csv`，以使用[optimizer](https://github.com/open-spaced-repetition/fsrs-optimizer) 优化算法参数，达到更好的复习效果；
+7. 数据表中新增笔记复习情况、当天复习情况；
+8. 延后笔记/卡片;
+9. 修改笔记/卡片在x天后复习;
+10. 重排所有已排程的复习项；
+11. 支持多个挖空；
+12. 设置项 隐藏关联卡片拆分为 隐藏关联卡片（即原来的）和复习笔记时隐藏关联卡片；另，多个挖空不会被隐藏关联卡片；
+13. 设置项： 卡片定位使用BlockID，会在卡片文本后追加BlockID (e.g. `^blkid1`)，**即修改了原笔记文件**。默认关闭，但卡片定位可能不太准确，但也够用；
+14. 设置项： 复习笔记时，复习顺序可混合新旧笔记(默认： 3篇到期的，然后2篇新的笔记)；
+15. 其他待发现的小改动；
+
+**注意**
+没有使用过 obsidian-spaced-repetition 插件的可以直接用，正在使用 obsidian-spaced-repetition 插件的话，建议试用前先备份 :yum:
+
+欢迎大家试用讨论
+
+## 欢迎加入
+
+因我本人并不是程序员，对 typescript 编程有许多不懂的地方，目前只能做些 bug 修复、及小功能更新。而对一些好的功能建议就难以实现了，欢迎对这个插件感兴趣的朋友加入，一起维护更新这个插件。
+
+加入方式直接提 [issue](https://github.com/open-spaced-repetition/obsidian-spaced-repetition-recall/issues)/[PR](https://github.com/open-spaced-repetition/obsidian-spaced-repetition-recall/pulls)、或[论坛讨论](https://forum-zh.obsidian.md/t/topic/20551) 。
+
+## 适用场景
+
+1. 间隔重复复习；
+2. 渐进式总结；
+3. 增量写作；
+
+更详细内容请参考 [使用教程](使用教程.md).
+
+## 下载
+
+推荐 BRAT 直接添加 github 链接更方便些
+
+github: https://github.com/open-spaced-repetition/obsidian-spaced-repetition-recall
+
+或：
+
+1. 从[最新发布](https://github.com/open-spaced-repetition/obsidian-spaced-repetition-recall/releases/)中下载压缩包（已包括 main.js, manifest.json, styles.css）；
+2. 在 `Vault-name/.obsidian/plugins` 中，把刚下的文件解压（应是`obsidian-spaced-repetition-recall`文件夹）放入`plugins`文件夹下；
+3. 重启 Obsidan 开启插件，就可以使用了。
+
+## Thanks
+
+业余时间折腾的，如果对你有所帮助，可以请我喝瓶饮料或奶茶呀~
+
+<div class="ex-coffee-div" align = "center">
+<a ><img src="https://github.com/Newdea/newdea/blob/main/.github/funding/QR_alipay.png?v=3" height=120></a>
+<a ><img src="https://github.com/Newdea/newdea/blob/main/.github/funding/QR_wechat.png?v=3" height=120></a>
+</div>
+
+或者，请原插件作者(@st3v3nmw)喝杯咖啡
+
+<a href='https://ko-fi.com/M4M44DEN6' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://cdn.ko-fi.com/cdn/kofi3.png?v=2' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
+
+---
+
+Thank you to everyone who has created a plugin that inspired me and I took code from.
+
+-   first, thanks to [@st3v3nmw's obsidian-spaced-repetition](https://github.com/st3v3nmw/obsidian-spaced-repetition) and [@martin-jw recall plugin](https://github.com/martin-jw/obsidian-recall)
+-   floatbar(thanks to [@chetachi's cMenu](https://github.com/chetachiezikeuzor/cMenu-Plugin))
+-   [Fsrs Algorithm](https://github.com/open-spaced-repetition)
+-   ReleaseNotes(thanks to [@Zsolt Viczian Excalidraw](https://zsolt.blog))