improved markdown & orgmode parsing #766
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LeXofLeviafan
commented
Aug 24, 2024
| if newtag: | ||
| if newtag.lower() not in tags: | ||
| tags_string = (newtag + DELIM) + tags_string | ||
| tags = list(dict.fromkeys(get_org_tags(match.group('tags') or ''))) |
There was a problem hiding this comment.
LeXofLeviafan
commented
Aug 24, 2024
| @@ -3670,34 +3651,24 @@ def import_org(filepath: str, newtag: Optional[str]): | |||
| tag_list_cleaned.append(tag.strip()) | |||
| return tag_list_cleaned | |||
|
|
|||
| # Supported OrgMode format: `[[url][title]] :tags:` (or `[[url]] :tags:`) | |||
| _url, _maybe_title = r'(?P<url>((?!\]\[).)+?)', r'(\]\[(?P<title>.+))?' | |||
There was a problem hiding this comment.
Regex for URL means "any string not containing ]["
LeXofLeviafan
commented
Aug 24, 2024
| ('foo, bar, baz', None, ',bar,baz,foo,'), | ||
| ('foo, bar, baz', 'new tag', ',bar,baz,foo,new tag,'), | ||
| ]) | ||
| @pytest.mark.parametrize('title', ['Bookmark title', '', None]) |
There was a problem hiding this comment.
[Bookmark title](…), [](…) & <…>
LeXofLeviafan
commented
Aug 24, 2024
| ('tag1: ::tag2:tag::3:tag4:: :tag:::5: ta g::6:: ', None, ',tag1,:tag2,tag:3,tag4:,tag::5,ta g:6:,'), | ||
| ('tag1: ::tag2:tag::3:tag4:: :tag:::5: ta g::6:: ', 'new tag', ',new tag,tag1,:tag2,tag:3,tag4:,tag::5,ta g:6:,'), | ||
| ]) | ||
| @pytest.mark.parametrize('title', ['Bookmark title', '', None]) |
There was a problem hiding this comment.
[[…][Bookmark title]], [[…][]] & [[…]]
LeXofLeviafan
commented
Aug 24, 2024
| from buku import import_md | ||
|
|
||
| p = tmpdir.mkdir("importmd").join("test.md") | ||
| p.write("[text1](http://example.com)") | ||
| print(line := (f'<{url}>' if title is None else f'[{title}]({url})') + | ||
| ('' if not tags else f' <!-- TAGS: {tags} -->')) |
There was a problem hiding this comment.
Printing out the line to be parsed makes it easier to figure out what went wrong when a test fails.
LeXofLeviafan
commented
Aug 24, 2024
|
|
||
| parse_tags([tags]) | ||
| tags = DELIM.join(s for s in [newtag, match.group('tags')] if s) | ||
| tags = parse_tags([tags]) |
There was a problem hiding this comment.
…Smh the output of parse_tags() was ignored before 😅
|
Nice improvement, thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When trying to import a generated DB file, I've noticed some irregularities. I went around the issue by converting the file to Markdown format, but I still ended up making a few improvements to the parsing code; namely:
<url>/[[url]])Markdown import
OrgMode import
(Unlike in Markdown, empty titles –
[[url][]]– are explicitly invalid in OrgMode)