diff --git a/.gitignore b/.gitignore
index 4969a45a..42ca261d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+# data.json need save
+./data.json
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
diff --git a/Images/1cfcb1bb28a06e354b339691fe79a5d40c32ac3d8d74a0c1a5fd1b4f554e201a.png b/Images/1cfcb1bb28a06e354b339691fe79a5d40c32ac3d8d74a0c1a5fd1b4f554e201a.png
new file mode 100644
index 00000000..a5017f48
Binary files /dev/null and b/Images/1cfcb1bb28a06e354b339691fe79a5d40c32ac3d8d74a0c1a5fd1b4f554e201a.png differ
diff --git a/Images/5913712e835c128fdc7a12c0c0c1caa006ac7d47bf85a3a9f6c5970e37a0a948.png b/Images/5913712e835c128fdc7a12c0c0c1caa006ac7d47bf85a3a9f6c5970e37a0a948.png
new file mode 100644
index 00000000..7c79e5e8
Binary files /dev/null and b/Images/5913712e835c128fdc7a12c0c0c1caa006ac7d47bf85a3a9f6c5970e37a0a948.png differ
diff --git a/README.md b/README.md
index 18b04483..a73f67de 100644
--- a/README.md
+++ b/README.md
@@ -1,132 +1,53 @@
-# Obsidian_to_Anki
-Plugin to add flashcards from a text or markdown file to Anki. Run in Obsidian as a plugin, or from the command-line as a python script. Built with [Obsidian](https://obsidian.md/) markdown syntax in mind. Supports **user-defined custom syntax for flashcards.**
-See the [Trello](https://trello.com/b/6MXEizGg/obsidiantoanki) for planned features.
-
-## Getting started
-
-Check out the [Wiki](https://github.com/Pseudonium/Obsidian_to_Anki/wiki)! It has a ton of information, including setup instructions for new users. I will include a copy of the instructions here:
-
-## Setup
-
-### All users
-1. Start up [Anki](https://apps.ankiweb.net/), and navigate to your desired profile.
-2. Ensure that you've installed [AnkiConnect](https://git.foosoft.net/alex/anki-connect).
-
-### Obsidian plugin users
-3. Have [Obsidian](https://obsidian.md/) downloaded
-4. Search the 'Community plugins' list for this plugin
-5. Install the plugin.
-6. In Anki, navigate to Tools->Addons->AnkiConnect->Config, and change it to look like this:
-
-{
- "apiKey": null,
- "apiLogPath": null,
- "webBindAddress": "127.0.0.1",
- "webBindPort": 8765,
- "webCorsOrigin": "http://localhost",
- "webCorsOriginList": [
- "http://localhost",
- "app://obsidian.md"
- ]
-}
-
-
-7. Restart Anki to apply the above changes
-8. With Anki running in the background, load the plugin. This will generate the plugin settings.
-
-
-You shouldn't need Anki running to load Obsidian in the future, though of course you will need it for using the plugin!
-
-To run the plugin, look for an Anki icon on your ribbon (the place where buttons such as 'open Graph view' and 'open Quick Switcher' are).
-For more information on use, please check out the [Wiki](https://github.com/Pseudonium/Obsidian_to_Anki/wiki)!
-
-### Python script users
-3. Install the latest version of [Python](https://www.python.org/downloads/).
-4. If you are a new user, download `obstoanki_setup.py` from the [releases page](https://github.com/Pseudonium/Obsidian_to_Anki/releases), and place it in the folder you want the script installed (for example your notes folder).
-5. Run `obstoanki_setup.py`, for example by double-clicking it in a file explorer. This will download the latest version of the script and required dependencies automatically. Existing users should be able to run their existing `obstoanki_setup.py` to get the latest version of the script.
-6. Check the Permissions tab below to ensure the script is able to run.
-7. Run `obsidian_to_anki.py`, for example by double-clicking it in a file explorer. This will generate a config file, `obsidian_to_anki_config.ini`.
-
-#### Permissions
-The script needs to be able to:
-* Make a config file in the directory the script is installed.
-* Read the file in the directory the script is used.
-* Make a backup file in the directory the script is used.
-* Rename files in the directory the script is used.
-* Remove a backup file in the directory the script is used.
-* Change the current working directory temporarily (so that local image paths are resolved correctly).
-
-## Features
-
-Current features (check out the wiki for more details):
-* **Custom note types** - You're not limited to the 6 built-in note types of Anki.
-* **Custom scan directory**
- * The plugin will scan the entire vault by default
- * You can also set which directory (includes all sub-directories as well) to scan via plugin settings
-* **Ignore Folders and Files**
- * You can specify which files and folders to ignore
- * This can be done in the settings of this plugin with [Glob syntax](https://en.wikipedia.org/wiki/Glob_(programming)#Syntax).
- * If you're working on your own globs, you can test them out [here](https://globster.xyz/)
- * Examples:
- * `**/*.excalidraw.md` - Ignore all files that end in `.excalidraw.md`
- * => avoids excalidraw files from being scanned which can be extremely slow
- * `Template/**` - Ignore all files in the `Template` folder (including subfolders)
- * `**/private/**` - Ignore all files in folders that are called `private` no matter where they are in the vault
- * `[Pp]rivate*/**` - Ignore all files and folders in the root of the vault that start with `private` or with `Private`
-* **Updating notes from file** - Your text files are the canonical source of the notes.
-* **Tags**, including **tags for an entire file**.
-* **Adding to user-specified deck** on a *per-file* basis.
-* **Markdown formatting**.
-* **Math formatting**.
-* **Embedded images**. GIFs should work too.
-* **Audio**.
-* **Auto-deleting notes from the file**.
-* **Reading from all files in a directory automatically** - recursively too!
-* **Inline Notes** - Shorter syntax for typing out notes on a single line.
-* **Easy cloze formatting** - A more compact syntax to do Cloze text
-* **Frozen Fields**
-* **Obsidian integration** - A link to the file that made the flashcard, full link and image embed support.
-* **Custom syntax** - Using **regular expressions**, add custom syntax to generate **notes that make sense for you.** Some examples:
- * RemNote single-line style. `This is how to use::Remnote single-line style`
- 
- * Header paragraph style.
-
- # Style
- This style is suitable for having the header as the front, and the answer as the back
-
- 
- * Question answer style.
-
- Q: How do you use this style?
- A: Just like this.
-
- 
- * Neuracache #flashcard style.
-
- In Neuracache style, to make a flashcard you do #flashcard
- The next lines then become the back of the flashcard
-
- 
- * Ruled style
-
- How do you use ruled style?
- ---
- You need at least three '-' between the front and back of the card.
-
- 
- * Markdown table style
-
- | Why might this style be useful? |
- | ------ |
- | It looks nice when rendered as HTML in a markdown editor. |
-
- 
- * Cloze paragraph style
-
- The idea of {cloze paragraph style} is to be able to recognise any paragraphs that contain {cloze deletions}.
-
- 
-
-Note that **all custom syntax is off by default**, and must be programmed into the script via the config file - see the Wiki for more details.
-
-$1 ');
+ const mathRegex = /\$(.+?)\$/g;
+ convertedHeading = convertedHeading.replace(mathRegex, '\\($1\\)');
+ heading_strs.push(convertedHeading)
}
let result_arr: string[] = [result]
result_arr.push(...heading_strs)
- return result_arr.join(" > ")
+ return "Obsidian '
+ note.fields[field] += '🔗 '
}
format_note_with_frozen_fields(note: AnkiConnectNote, frozen_fields_dict: Record>): void {
@@ -119,8 +119,16 @@ export class FormatConverter {
if (!(this.file_cache.hasOwnProperty("links"))) {
return note_text
}
+ const regex = /\[([^\]]+)\]\(([^\)]+#\^ID-(\d{13}))\)/g;
for (let link of this.file_cache.links) {
+ //regex.test(input)
+ if(link.link.includes("#^ID-")){
+ const replacedString = link.original.replace(regex, '[$1|nid$3]');
+ note_text = note_text.replace(new RegExp(c.escapeRegex(link.original), "g"),replacedString)
+ }
+ else{
note_text = note_text.replace(new RegExp(c.escapeRegex(link.original), "g"), '' + link.displayText + " ")
+ }
}
return note_text
}
@@ -144,38 +152,43 @@ export class FormatConverter {
}
format(note_text: string, cloze: boolean, highlights_to_cloze: boolean): string {
- note_text = this.obsidian_to_anki_math(note_text)
- //Extract the parts that are anki math
- let math_matches: string[]
- let inline_code_matches: string[]
- let display_code_matches: string[]
+ // First, isolate display and inline code blocks
+ let math_matches: string[];
+ let inline_code_matches: string[];
+ let display_code_matches: string[];
const add_highlight_css: boolean = note_text.match(c.OBS_DISPLAY_CODE_REGEXP) ? true : false;
- [note_text, math_matches] = this.censor(note_text, ANKI_MATH_REGEXP, MATH_REPLACE);
[note_text, display_code_matches] = this.censor(note_text, c.OBS_DISPLAY_CODE_REGEXP, DISPLAY_CODE_REPLACE);
[note_text, inline_code_matches] = this.censor(note_text, c.OBS_CODE_REGEXP, INLINE_CODE_REPLACE);
+
+ // Process other parts of the text
+ note_text = this.obsidian_to_anki_math(note_text);
+ [note_text, math_matches] = this.censor(note_text, ANKI_MATH_REGEXP, MATH_REPLACE);
if (cloze) {
if (highlights_to_cloze) {
note_text = note_text.replace(HIGHLIGHT_REGEXP, "{$1}")
}
- note_text = this.curly_to_cloze(note_text)
+ note_text = this.curly_to_cloze(note_text);
}
- note_text = this.getAndFormatMedias(note_text)
- note_text = this.formatLinks(note_text)
- //Special for formatting highlights now, but want to avoid any == in code
- note_text = note_text.replace(HIGHLIGHT_REGEXP, String.raw`$1 `)
- note_text = this.decensor(note_text, DISPLAY_CODE_REPLACE, display_code_matches, false)
- note_text = this.decensor(note_text, INLINE_CODE_REPLACE, inline_code_matches, false)
- note_text = converter.makeHtml(note_text)
- note_text = this.decensor(note_text, MATH_REPLACE, math_matches, true).trim()
- // Remove unnecessary paragraph tag
+ note_text = this.getAndFormatMedias(note_text);
+ note_text = this.formatLinks(note_text);
+ note_text = note_text.replace(HIGHLIGHT_REGEXP, String.raw`$1 `);
+
+ // Restore code blocks
+ note_text = this.decensor(note_text, DISPLAY_CODE_REPLACE, display_code_matches, false);
+ note_text = this.decensor(note_text, INLINE_CODE_REPLACE, inline_code_matches, false);
+
+ // Final conversions
+ note_text = converter.makeHtml(note_text);
+ note_text = this.decensor(note_text, MATH_REPLACE, math_matches, true).trim();
if (note_text.startsWith(PARA_OPEN) && note_text.endsWith(PARA_CLOSE)) {
- note_text = note_text.slice(PARA_OPEN.length, -1 * PARA_CLOSE.length)
+ note_text = note_text.slice(PARA_OPEN.length, -1 * PARA_CLOSE.length);
}
if (add_highlight_css) {
- note_text = ' 