diff --git a/layout/paging.html b/layout/paging.html
new file mode 100644
index 0000000..de79be5
--- /dev/null
+++ b/layout/paging.html
@@ -0,0 +1 @@
+
page précédente / page suivante
diff --git a/makesite.py b/makesite.py
index e414dce..e7530ec 100755
--- a/makesite.py
+++ b/makesite.py
@@ -41,11 +41,12 @@ import unicodedata
import locale
# set user locale
-locale.setlocale(locale.LC_ALL, '')
+locale.setlocale(locale.LC_ALL, "")
+
def fread(filename):
"""Read file and close the file."""
- with open(filename, 'r') as f:
+ with open(filename, "r") as f:
return f.read()
@@ -55,23 +56,23 @@ def fwrite(filename, text):
if not os.path.isdir(basedir):
os.makedirs(basedir)
- with open(filename, 'w') as f:
+ with open(filename, "w") as f:
f.write(text)
def log(msg, *args):
"""Log message with specified arguments."""
- sys.stderr.write(msg.format(*args) + '\n')
+ sys.stderr.write(msg.format(*args) + "\n")
def truncate(text, words=25):
"""Remove tags and truncate text to the specified number of words."""
- return ' '.join(re.sub('(?s)<.*?>', ' ', text).split()[:words])
+ return " ".join(re.sub("(?s)<.*?>", " ", text).split()[:words])
def read_headers(text):
"""Parse headers in text and yield (key, value, end-index) tuples."""
- for match in re.finditer(r'\s*\s*|.+', text):
+ for match in re.finditer(r"\s*\s*|.+", text):
if not match.group(1):
break
yield match.group(1), match.group(2), match.end()
@@ -79,10 +80,10 @@ def read_headers(text):
def rfc_2822_format(date_str):
"""Convert yyyy-mm-dd date string to RFC 2822 format date string."""
- d = datetime.datetime.strptime(date_str, '%Y-%m-%d')
+ d = datetime.datetime.strptime(date_str, "%Y-%m-%d")
dtuple = d.timetuple()
dtimestamp = time.mktime(dtuple)
- return utils.formatdate(dtimestamp)
+ return utils.formatdate(dtimestamp)
def slugify(value):
@@ -91,9 +92,11 @@ def slugify(value):
underscores) and converts spaces to hyphens. Also strips leading and
trailing whitespace.
"""
- value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii')
- value = re.sub('[^\w\s-]', '', value).strip().lower()
- return re.sub('[-\s]+', '-', value)
+ value = (
+ unicodedata.normalize("NFKD", value).encode("ascii", "ignore").decode("ascii")
+ )
+ value = re.sub("[^\w\s-]", "", value).strip().lower()
+ return re.sub("[-\s]+", "-", value)
def read_content(filename):
@@ -102,12 +105,9 @@ def read_content(filename):
text = fread(filename)
# Read metadata and save it in a dictionary.
- date_slug = os.path.basename(filename).split('.')[0]
- match = re.search(r'^(?:(\d\d\d\d-\d\d-\d\d)-)?(.+)$', date_slug)
- content = {
- 'date': match.group(1) or '1970-01-01',
- 'slug': match.group(2),
- }
+ date_slug = os.path.basename(filename).split(".")[0]
+ match = re.search(r"^(?:(\d\d\d\d-\d\d-\d\d)-)?(.+)$", date_slug)
+ content = {"date": match.group(1) or "1970-01-01", "slug": match.group(2)}
# Read headers.
end = 0
@@ -118,20 +118,18 @@ def read_content(filename):
text = text[end:]
# Convert Markdown content to HTML.
- if filename.endswith(('.md', '.mkd', '.mkdn', '.mdown', '.markdown')):
+ if filename.endswith((".md", ".mkd", ".mkdn", ".mdown", ".markdown")):
try:
- if _test == 'ImportError':
- raise ImportError('Error forced by test')
+ if _test == "ImportError":
+ raise ImportError("Error forced by test")
import commonmark
+
text = commonmark.commonmark(text)
except ImportError as e:
- log('WARNING: Cannot render Markdown in {}: {}', filename, str(e))
+ log("WARNING: Cannot render Markdown in {}: {}", filename, str(e))
# Update the dictionary with content and RFC 2822 date.
- content.update({
- 'content': text,
- 'rfc_2822_date': rfc_2822_format(content['date'])
- })
+ content.update({"content": text, "rfc_2822_date": rfc_2822_format(content["date"])})
return content
@@ -140,8 +138,8 @@ def clean_html_tag(text):
"""Remove HTML tags."""
while True:
original_text = text
- text = re.sub('<\w+.*?>', '', text)
- text = re.sub('<\/\w+>', '', text)
+ text = re.sub("<\w+.*?>", "", text)
+ text = re.sub("<\/\w+>", "", text)
if original_text == text:
break
return text
@@ -149,14 +147,16 @@ def clean_html_tag(text):
def render(template, **params):
"""Replace placeholders in template with values from params."""
- return re.sub(r'{{\s*([^}\s]+)\s*}}',
- lambda match: str(params.get(match.group(1), match.group(0))),
- template)
+ return re.sub(
+ r"{{\s*([^}\s]+)\s*}}",
+ lambda match: str(params.get(match.group(1), match.group(0))),
+ template,
+ )
def get_categories(page_params):
cat = []
- for s in page_params['category'].split(' '):
+ for s in page_params["category"].split(" "):
if s.strip():
cat.append(s.strip())
return cat
@@ -170,27 +170,20 @@ def make_pages(src, dst, layout, **params):
content = read_content(src_path)
page_params = dict(params, **content)
-
- # Populate placeholders in content if content-rendering is enabled.
- # if page_params.get('render') == 'yes':
- # rendered_content = render(page_params['content'], **page_params)
- # page_params['content'] = rendered_content
- # content['content'] = rendered_content
-
items.append(content)
dst_path = render(dst, **page_params)
output = render(layout, **page_params)
- log('Rendering {} => {} ...', src_path, dst_path)
+ log("Rendering {} => {} ...", src_path, dst_path)
fwrite(dst_path, output)
- return sorted(items, key=lambda x: x['date'], reverse=True)
+ return sorted(items, key=lambda x: x["date"], reverse=True)
def get_friendly_date(date_str):
- dt = datetime.datetime.strptime(date_str, '%Y-%m-%d')
- return dt.strftime('%d %b %Y')
+ dt = datetime.datetime.strptime(date_str, "%Y-%m-%d")
+ return dt.strftime("%d %b %Y")
def make_posts(src, src_pattern, dst, layout, category_layout, **params):
@@ -202,10 +195,11 @@ def make_posts(src, src_pattern, dst, layout, category_layout, **params):
content = read_content(src_path)
page_params = dict(params, **content)
- page_params['banner'] =' '
- page_params['date_path'] = page_params['date'].replace('-', '/')
- page_params['friendly_date'] = get_friendly_date(page_params['date'])
- page_params['year'] = page_params['date'].split('-')[0]
+ page_params["header"] = ""
+ page_params["footer"] = ""
+ page_params["date_path"] = page_params["date"].replace("-", "/")
+ page_params["friendly_date"] = get_friendly_date(page_params["date"])
+ page_params["year"] = page_params["date"].split("-")[0]
# categories
categories = get_categories(page_params)
@@ -213,135 +207,199 @@ def make_posts(src, src_pattern, dst, layout, category_layout, **params):
for category in categories:
out_cat = render(category_layout, category=category, url=slugify(category))
out_cats.append(out_cat.strip())
- page_params['categories'] = categories
- page_params['category_label'] = ''.join(out_cats)
+ page_params["categories"] = categories
+ page_params["category_label"] = "".join(out_cats)
- summary_index = page_params['content'].find('