More resilient logic to handle both date and datetime timestamps in a post metadata
This commit is contained in:
Fabio Manganiello
parent
609dd14d90
commit
390ca758b9
1 changed files with 63 additions and 52 deletions
113
madblog/app.py
113
madblog/app.py
|
|
@ -12,11 +12,11 @@ from ._sorters import PagesSorter, PagesSortByTime
|
||||||
|
|
||||||
|
|
||||||
class BlogApp(Flask):
|
class BlogApp(Flask):
|
||||||
_title_header_regex = re.compile(r'^#\s*((\[(.*)\])|(.*))')
|
_title_header_regex = re.compile(r"^#\s*((\[(.*)\])|(.*))")
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super().__init__(*args, template_folder=config.templates_dir, **kwargs)
|
super().__init__(*args, template_folder=config.templates_dir, **kwargs)
|
||||||
self.pages_dir = os.path.join(config.content_dir, 'markdown')
|
self.pages_dir = os.path.join(config.content_dir, "markdown")
|
||||||
self.img_dir = config.default_img_dir
|
self.img_dir = config.default_img_dir
|
||||||
self.css_dir = config.default_css_dir
|
self.css_dir = config.default_css_dir
|
||||||
self.js_dir = config.default_js_dir
|
self.js_dir = config.default_js_dir
|
||||||
|
|
@ -27,73 +27,80 @@ class BlogApp(Flask):
|
||||||
# `config.content_dir` is treated as the root for markdown files.
|
# `config.content_dir` is treated as the root for markdown files.
|
||||||
self.pages_dir = config.content_dir
|
self.pages_dir = config.content_dir
|
||||||
|
|
||||||
img_dir = os.path.join(config.content_dir, 'img')
|
img_dir = os.path.join(config.content_dir, "img")
|
||||||
if os.path.isdir(img_dir):
|
if os.path.isdir(img_dir):
|
||||||
self.img_dir = os.path.abspath(img_dir)
|
self.img_dir = os.path.abspath(img_dir)
|
||||||
else:
|
else:
|
||||||
self.img_dir = config.content_dir
|
self.img_dir = config.content_dir
|
||||||
|
|
||||||
css_dir = os.path.join(config.content_dir, 'css')
|
css_dir = os.path.join(config.content_dir, "css")
|
||||||
if os.path.isdir(css_dir):
|
if os.path.isdir(css_dir):
|
||||||
self.css_dir = os.path.abspath(css_dir)
|
self.css_dir = os.path.abspath(css_dir)
|
||||||
|
|
||||||
js_dir = os.path.join(config.content_dir, 'js')
|
js_dir = os.path.join(config.content_dir, "js")
|
||||||
if os.path.isdir(js_dir):
|
if os.path.isdir(js_dir):
|
||||||
self.js_dir = os.path.abspath(js_dir)
|
self.js_dir = os.path.abspath(js_dir)
|
||||||
|
|
||||||
fonts_dir = os.path.join(config.content_dir, 'fonts')
|
fonts_dir = os.path.join(config.content_dir, "fonts")
|
||||||
if os.path.isdir(fonts_dir):
|
if os.path.isdir(fonts_dir):
|
||||||
self.fonts_dir = os.path.abspath(fonts_dir)
|
self.fonts_dir = os.path.abspath(fonts_dir)
|
||||||
|
|
||||||
templates_dir = os.path.join(config.content_dir, 'templates')
|
templates_dir = os.path.join(config.content_dir, "templates")
|
||||||
if os.path.isdir(templates_dir):
|
if os.path.isdir(templates_dir):
|
||||||
self.template_folder = os.path.abspath(templates_dir)
|
self.template_folder = os.path.abspath(templates_dir)
|
||||||
|
|
||||||
def get_page_metadata(self, page: str) -> dict:
|
def get_page_metadata(self, page: str) -> dict:
|
||||||
if not page.endswith('.md'):
|
if not page.endswith(".md"):
|
||||||
page = page + '.md'
|
page = page + ".md"
|
||||||
|
|
||||||
md_file = os.path.join(self.pages_dir, page)
|
md_file = os.path.join(self.pages_dir, page)
|
||||||
if not os.path.isfile(md_file):
|
if not os.path.isfile(md_file):
|
||||||
abort(404)
|
abort(404)
|
||||||
|
|
||||||
metadata = {}
|
metadata = {}
|
||||||
with open(md_file, 'r') as f:
|
with open(md_file, "r") as f:
|
||||||
metadata['uri'] = '/article/' + page[:-3]
|
metadata["uri"] = "/article/" + page[:-3]
|
||||||
|
|
||||||
for line in f.readlines():
|
for line in f.readlines():
|
||||||
if not line:
|
if not line:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not (m := re.match(r'^\[//]: # \(([^:]+):\s*([^)]+)\)\s*$', line)):
|
if not (m := re.match(r"^\[//]: # \(([^:]+):\s*([^)]+)\)\s*$", line)):
|
||||||
break
|
break
|
||||||
|
|
||||||
if m.group(1) == 'published':
|
if m.group(1) == "published":
|
||||||
|
try:
|
||||||
metadata[m.group(1)] = datetime.date.fromisoformat(m.group(2))
|
metadata[m.group(1)] = datetime.date.fromisoformat(m.group(2))
|
||||||
|
except ValueError:
|
||||||
|
metadata[m.group(1)] = datetime.datetime.fromisoformat(
|
||||||
|
m.group(2)
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
metadata[m.group(1)] = m.group(2)
|
metadata[m.group(1)] = m.group(2)
|
||||||
|
|
||||||
if not metadata.get('title'):
|
if not metadata.get("title"):
|
||||||
# If the `title` header isn't available in the file,
|
# If the `title` header isn't available in the file,
|
||||||
# infer it from the first line of the file
|
# infer it from the first line of the file
|
||||||
with open(md_file, 'r') as f:
|
with open(md_file, "r") as f:
|
||||||
header = ''
|
header = ""
|
||||||
for line in f.readlines():
|
for line in f.readlines():
|
||||||
header = line
|
header = line
|
||||||
break
|
break
|
||||||
|
|
||||||
metadata['title_inferred'] = True
|
metadata["title_inferred"] = True
|
||||||
m = self._title_header_regex.search(header)
|
m = self._title_header_regex.search(header)
|
||||||
if m:
|
if m:
|
||||||
metadata['title'] = m.group(3) or m.group(1)
|
metadata["title"] = m.group(3) or m.group(1)
|
||||||
else:
|
else:
|
||||||
metadata['title'] = os.path.basename(md_file)
|
metadata["title"] = os.path.basename(md_file)
|
||||||
|
|
||||||
if not metadata.get('published'):
|
if not metadata.get("published"):
|
||||||
# If the `published` header isn't available in the file,
|
# If the `published` header isn't available in the file,
|
||||||
# infer it from the file's creation date
|
# infer it from the file's creation date
|
||||||
metadata['published'] = datetime.date.fromtimestamp(os.stat(md_file).st_ctime)
|
metadata["published"] = datetime.date.fromtimestamp(
|
||||||
metadata['published_inferred'] = True
|
os.stat(md_file).st_ctime
|
||||||
|
)
|
||||||
|
metadata["published_inferred"] = True
|
||||||
|
|
||||||
return metadata
|
return metadata
|
||||||
|
|
||||||
|
|
@ -102,37 +109,42 @@ class BlogApp(Flask):
|
||||||
page: str,
|
page: str,
|
||||||
title: Optional[str] = None,
|
title: Optional[str] = None,
|
||||||
skip_header: bool = False,
|
skip_header: bool = False,
|
||||||
skip_html_head: bool = False
|
skip_html_head: bool = False,
|
||||||
):
|
):
|
||||||
if not page.endswith('.md'):
|
if not page.endswith(".md"):
|
||||||
page = page + '.md'
|
page = page + ".md"
|
||||||
|
|
||||||
metadata = self.get_page_metadata(page)
|
metadata = self.get_page_metadata(page)
|
||||||
# Don't duplicate the page title if it's been inferred
|
# Don't duplicate the page title if it's been inferred
|
||||||
if not (title or metadata.get('title_inferred')):
|
if not (title or metadata.get("title_inferred")):
|
||||||
title = metadata.get('title', config.title)
|
title = metadata.get("title", config.title)
|
||||||
|
|
||||||
with open(os.path.join(self.pages_dir, page), 'r') as f:
|
with open(os.path.join(self.pages_dir, page), "r") as f:
|
||||||
return render_template(
|
return render_template(
|
||||||
'article.html',
|
"article.html",
|
||||||
config=config,
|
config=config,
|
||||||
title=title,
|
title=title,
|
||||||
image=metadata.get('image'),
|
image=metadata.get("image"),
|
||||||
description=metadata.get('description'),
|
description=metadata.get("description"),
|
||||||
author=(
|
author=(
|
||||||
re.match(r'(.+?)\s+<([^>]+>)', metadata['author'])[1]
|
re.match(r"(.+?)\s+<([^>]+>)", metadata["author"])[1]
|
||||||
if 'author' in metadata else None
|
if "author" in metadata
|
||||||
),
|
|
||||||
author_email=(
|
|
||||||
re.match(r'(.+?)\s+<([^>]+)>', metadata['author'])[2]
|
|
||||||
if 'author' in metadata else None
|
|
||||||
),
|
|
||||||
published=(
|
|
||||||
metadata['published'].strftime('%b %d, %Y')
|
|
||||||
if metadata.get('published') and not metadata.get('published_inferred')
|
|
||||||
else None
|
else None
|
||||||
),
|
),
|
||||||
content=markdown(f.read(), extensions=['fenced_code', 'codehilite', MarkdownLatex()]),
|
author_email=(
|
||||||
|
re.match(r"(.+?)\s+<([^>]+)>", metadata["author"])[2]
|
||||||
|
if "author" in metadata
|
||||||
|
else None
|
||||||
|
),
|
||||||
|
published=(
|
||||||
|
metadata["published"].strftime("%b %d, %Y")
|
||||||
|
if metadata.get("published")
|
||||||
|
and not metadata.get("published_inferred")
|
||||||
|
else None
|
||||||
|
),
|
||||||
|
content=markdown(
|
||||||
|
f.read(), extensions=["fenced_code", "codehilite", MarkdownLatex()]
|
||||||
|
),
|
||||||
skip_header=skip_header,
|
skip_header=skip_header,
|
||||||
skip_html_head=skip_html_head,
|
skip_html_head=skip_html_head,
|
||||||
)
|
)
|
||||||
|
|
@ -145,26 +157,25 @@ class BlogApp(Flask):
|
||||||
sorter: Type[PagesSorter] = PagesSortByTime,
|
sorter: Type[PagesSorter] = PagesSortByTime,
|
||||||
reverse: bool = True,
|
reverse: bool = True,
|
||||||
) -> List[Tuple[int, dict]]:
|
) -> List[Tuple[int, dict]]:
|
||||||
pages_dir = app.pages_dir.rstrip('/')
|
pages_dir = app.pages_dir.rstrip("/")
|
||||||
pages = [
|
pages = [
|
||||||
{
|
{
|
||||||
'path': os.path.join(root[len(pages_dir)+1:], f),
|
"path": os.path.join(root[len(pages_dir) + 1 :], f),
|
||||||
'folder': root[len(pages_dir)+1:],
|
"folder": root[len(pages_dir) + 1 :],
|
||||||
'content': (
|
"content": (
|
||||||
self.get_page(
|
self.get_page(
|
||||||
os.path.join(root, f),
|
os.path.join(root, f),
|
||||||
skip_header=skip_header,
|
skip_header=skip_header,
|
||||||
skip_html_head=skip_html_head,
|
skip_html_head=skip_html_head,
|
||||||
)
|
)
|
||||||
if with_content else ''
|
if with_content
|
||||||
),
|
else ""
|
||||||
**self.get_page_metadata(
|
|
||||||
os.path.join(root[len(pages_dir)+1:], f)
|
|
||||||
),
|
),
|
||||||
|
**self.get_page_metadata(os.path.join(root[len(pages_dir) + 1 :], f)),
|
||||||
}
|
}
|
||||||
for root, _, files in os.walk(pages_dir, followlinks=True)
|
for root, _, files in os.walk(pages_dir, followlinks=True)
|
||||||
for f in files
|
for f in files
|
||||||
if f.endswith('.md')
|
if f.endswith(".md")
|
||||||
]
|
]
|
||||||
|
|
||||||
sorter_func = sorter(pages)
|
sorter_func = sorter(pages)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue