tanner/pelican-obsidian
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include "/" in empty paths

Browse Source 
When articles were in the base directory, the string replacement:
`str(full_path).replace(str(base_path) + '/'`
would not match, causing the whole absolute path to be included which
would break the link.

This should now work if the article is in the base directory or in any
subfolder.
This commit is contained in:
Tanner Collin 2022-04-22 15:34:27 -06:00
parent bd55a6b66f
commit 7ee02b03d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pelican/plugins/obsidian/obsidian.py
View File

@ -49,7 +49,7 @@ class ObsidianMarkdownReader(MarkdownReader):
filename, linkname = get_file_and_linkname(match) filename, linkname = get_file_and_linkname(match)
path = ARTICLE_PATHS.get(filename) path = ARTICLE_PATHS.get(filename)
if path: if path:
link_structure = '[{linkname}]({{filename}}/{path}/{filename}.md)'.format( link_structure = '[{linkname}]({{filename}}{path}{filename}.md)'.format(
linkname=linkname, path=path, filename=filename linkname=linkname, path=path, filename=filename
) )
else: else:
@ -60,7 +60,7 @@ class ObsidianMarkdownReader(MarkdownReader):
filename, linkname = get_file_and_linkname(match) filename, linkname = get_file_and_linkname(match)
path = FILE_PATHS.get(filename) path = FILE_PATHS.get(filename)
if path: if path:
link_structure = '![{linkname}]({{static}}/{path}/{filename})'.format( link_structure = '![{linkname}]({{static}}{path}{filename})'.format(
linkname=linkname, path=path, filename=filename linkname=linkname, path=path, filename=filename
) )
else: else:
@ -101,7 +101,7 @@ def populate_files_and_articles(article_generator):
for article in articles: for article in articles:
full_path, filename_w_ext = os.path.split(article) full_path, filename_w_ext = os.path.split(article)
filename, ext = os.path.splitext(filename_w_ext) filename, ext = os.path.splitext(filename_w_ext)
path = str(full_path).replace(str(base_path) + '/', '') path = str(full_path).replace(str(base_path), '') + '/'
ARTICLE_PATHS[filename] = path ARTICLE_PATHS[filename] = path
globs = [base_path.glob('**/*.{}'.format(ext)) for ext in ['png', 'jpg', 'svg', 'apkg', 'gif']] globs = [base_path.glob('**/*.{}'.format(ext)) for ext in ['png', 'jpg', 'svg', 'apkg', 'gif']]
@ -109,7 +109,7 @@ def populate_files_and_articles(article_generator):
for _file in files: for _file in files:
full_path, filename_w_ext = os.path.split(_file) full_path, filename_w_ext = os.path.split(_file)
path = str(full_path).replace(str(base_path) + '/', '') path = str(full_path).replace(str(base_path), '') + '/'
FILE_PATHS[filename_w_ext] = path FILE_PATHS[filename_w_ext] = path