Compare commits
2 commits
88a21c7112
...
d18adc5220
Author | SHA1 | Date | |
---|---|---|---|
d18adc5220 | |||
1cfa8c27db |
6 changed files with 26 additions and 13 deletions
|
@ -1 +1 @@
|
||||||
__version__ = '0.2.10'
|
__version__ = '0.2.11'
|
||||||
|
|
|
@ -97,7 +97,13 @@ class BlogApp(Flask):
|
||||||
|
|
||||||
return metadata
|
return metadata
|
||||||
|
|
||||||
def get_page(self, page: str, title: Optional[str] = None, skip_header: bool = False):
|
def get_page(
|
||||||
|
self,
|
||||||
|
page: str,
|
||||||
|
title: Optional[str] = None,
|
||||||
|
skip_header: bool = False,
|
||||||
|
skip_html_head: bool = False
|
||||||
|
):
|
||||||
if not page.endswith('.md'):
|
if not page.endswith('.md'):
|
||||||
page = page + '.md'
|
page = page + '.md'
|
||||||
|
|
||||||
|
@ -127,13 +133,15 @@ class BlogApp(Flask):
|
||||||
else None
|
else None
|
||||||
),
|
),
|
||||||
content=markdown(f.read(), extensions=['fenced_code', 'codehilite', MarkdownLatex()]),
|
content=markdown(f.read(), extensions=['fenced_code', 'codehilite', MarkdownLatex()]),
|
||||||
skip_header=skip_header
|
skip_header=skip_header,
|
||||||
|
skip_html_head=skip_html_head,
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_pages(
|
def get_pages(
|
||||||
self,
|
self,
|
||||||
with_content: bool = False,
|
with_content: bool = False,
|
||||||
skip_header: bool = False,
|
skip_header: bool = False,
|
||||||
|
skip_html_head: bool = False,
|
||||||
sorter: Type[PagesSorter] = PagesSortByTime,
|
sorter: Type[PagesSorter] = PagesSortByTime,
|
||||||
reverse: bool = True,
|
reverse: bool = True,
|
||||||
) -> List[Tuple[int, dict]]:
|
) -> List[Tuple[int, dict]]:
|
||||||
|
@ -145,7 +153,8 @@ class BlogApp(Flask):
|
||||||
'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,
|
||||||
)
|
)
|
||||||
if with_content else ''
|
if with_content else ''
|
||||||
),
|
),
|
||||||
|
|
|
@ -75,7 +75,7 @@ def article_route(article: str):
|
||||||
|
|
||||||
@app.route('/rss', methods=['GET'])
|
@app.route('/rss', methods=['GET'])
|
||||||
def rss_route():
|
def rss_route():
|
||||||
pages = app.get_pages(with_content=True, skip_header=True)
|
pages = app.get_pages(with_content=True, skip_header=True, skip_html_head=True)
|
||||||
short_description = 'short' in request.args
|
short_description = 'short' in request.args
|
||||||
|
|
||||||
return Response('''<?xml version="1.0" encoding="UTF-8" ?>
|
return Response('''<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
{% with title=title, skip_header=skip_header or not config.header, styles=['/css/blog.css', '/css/code.css'] %}
|
{% if not skip_html_head %}
|
||||||
|
{% with title=title, skip_header=skip_header or not config.header, styles=['/css/blog.css', '/css/code.css'] %}
|
||||||
{% include 'common-head.html' %}
|
{% include 'common-head.html' %}
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
|
|
||||||
<main>
|
<main>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
{% if not skip_header %}
|
{% if not skip_header %}
|
||||||
{% if title %}
|
{% if title %}
|
||||||
|
@ -48,6 +51,8 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% include 'footer.html' %}
|
{% include 'footer.html' %}
|
||||||
</main>
|
|
||||||
|
|
||||||
{% include 'common-tail.html' %}
|
{% if not skip_html_head %}
|
||||||
|
</main>
|
||||||
|
{% include 'common-tail.html' %}
|
||||||
|
{% endif %}
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 0.2.10
|
current_version = 0.2.11
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
|
|
||||||
[metadata]
|
[metadata]
|
||||||
description-file = README.md
|
description-file = README.md
|
||||||
|
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -11,7 +11,7 @@ def readfile(file):
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='madblog',
|
name='madblog',
|
||||||
version='0.2.10',
|
version='0.2.11',
|
||||||
author='Fabio Manganiello',
|
author='Fabio Manganiello',
|
||||||
author_email='info@fabiomanganiello.com',
|
author_email='info@fabiomanganiello.com',
|
||||||
description='A minimal platform for Markdown-based blogs',
|
description='A minimal platform for Markdown-based blogs',
|
||||||
|
|
Loading…
Reference in a new issue