From 1c4f58ef028f20e14564392c9c7346883b0b6cf2 Mon Sep 17 00:00:00 2001
From: Bastian Venthur <venthur@debian.org>
Date: Sun, 31 Jan 2021 13:10:34 +0100
Subject: [PATCH] WIP

---
 sg/sg.py               | 31 ++++++++++++-------------------
 templates/archive.html | 15 ++++++---------
 templates/base.html    |  1 -
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/sg/sg.py b/sg/sg.py
index e71db3e..171e930 100644
--- a/sg/sg.py
+++ b/sg/sg.py
@@ -72,22 +72,21 @@ def build(args):
     convertibles = []
     for root, dirnames, filenames in os.walk(args.input_dir):
         for filename in filenames:
-            relpath = os.path.relpath(f'{root}/{filename}', start=args.input_dir)
-            abspath = os.path.abspath(f'{root}/{filename}')
+            rel_src = os.path.relpath(f'{root}/{filename}', start=args.input_dir)
             # all non-markdown files are just copied over, the markdown
             # files are converted to html
-            if abspath.endswith('.md'):
-                dstpath = os.path.abspath(f'{args.output_dir}/{relpath}')
-                dstpath = dstpath[:-3] + '.html'
-                convertibles.append((abspath, dstpath))
+            if rel_src.endswith('.md'):
+                rel_dst = rel_src
+                rel_dst = rel_dst[:-3] + '.html'
+                convertibles.append((rel_src, rel_dst))
             else:
-                shutil.copy(abspath, f'{args.output_dir}/{relpath}')
+                shutil.copy(f'{args.input_dir}/{rel_src}', f'{args.output_dir}/{rel_src}')
         for dirname in dirnames:
             # all directories are copied into the output directory
             path = os.path.relpath(f'{root}/{dirname}', start=args.input_dir)
             os.makedirs(f'{args.output_dir}/{path}', exist_ok=True)
 
-    convert_to_html(convertibles)
+    convert_to_html(convertibles, args.input_dir, args.output_dir)
 
 
 def markdown_factory():
@@ -111,7 +110,7 @@ def markdown_factory():
     return md
 
 
-def convert_to_html(convertibles):
+def convert_to_html(convertibles, input_dir, output_dir):
 
     env = Environment(
             loader=ChoiceLoader([
@@ -122,12 +121,11 @@ def convert_to_html(convertibles):
 
     md = markdown_factory()
 
-    pages = []
     articles = []
 
     for src, dst in convertibles:
         logger.debug(f'Processing {src}')
-        with open(src, 'r') as fh:
+        with open(f'{input_dir}/{src}', 'r') as fh:
             body = fh.read()
 
         content, meta = convert_markdown(md, body)
@@ -135,16 +133,11 @@ def convert_to_html(convertibles):
         context = dict(content=content)
         context.update(meta)
 
-        # for now, treat all pages as articles
-        if not meta:
-            pages.append((dst, context))
-            #template = env.get_template('page.html')
-        else:
+        if meta and 'date' in meta:
             articles.append((dst, context))
-            #template = env.get_template('article.html')
         template = env.get_template('article.html')
         result = template.render(context)
-        with open(dst, 'w') as fh_dest:
+        with open(f'{output_dir}/{dst}', 'w') as fh_dest:
             fh_dest.write(result)
 
     # generate feed
@@ -177,7 +170,7 @@ def convert_to_html(convertibles):
     ctx['archive'] = archive
     template = env.get_template('archive.html')
     result = template.render(ctx)
-    with open('build/archive.html', 'w') as fh:
+    with open('build/index.html', 'w') as fh:
         fh.write(result)
 
     ## generate tags
diff --git a/templates/archive.html b/templates/archive.html
index df92d5c..741daa0 100644
--- a/templates/archive.html
+++ b/templates/archive.html
@@ -9,17 +9,14 @@
 
 {% block content %}
 
-<h1>Archive</h1>
-
 {% for entry in archive %}
 
-  {% if entry.title %}
-  <h1><a href="{{entry.dst}}">{{entry.title}}</a></h1>
-  {% endif %}
-
-  {% if entry.date %}
-  <p>Written on {{ entry.date.date() }}.</p>
-  {% endif %}
+  <article>
+    <header>
+      <time datetime="{{entry.date}}">{{entry.date.date()}}</time>
+      <h1><a href="{{entry.dst}}">{{entry.title}}</a></h1>
+    </header>
+  </article>
 
 {% endfor %}
 
diff --git a/templates/base.html b/templates/base.html
index 17d0dcc..a5acf64 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -18,7 +18,6 @@
       <nav>
         <ul>
           <li><a href="/">Blog</a></li>
-          <li><a href="/archive.html">Archive</a></li>
           <li><a href="/tags.html">Tags</a></li>
           <li><a href="https://venthur.de/pages/about-me.html">About&nbsp;Me</a></li>
         </ul>