compile

.gitignore

@@ -1,5 +1,4 @@
 venv
-dist
 feedback
 backup
 *.sh

README.md

@@ -12,15 +12,15 @@ Compile the content into a static site using
 python app.py
 ```
 
-This creates the "dist" directory, with all of the HTML in there. 
+This creates the "dist" directory, with all of the HTML in there.
 At the moment, `dist` is part of the `.gitignore`!
 
 
 ### Writing Content
-Within the `content` directory, you can create/edit markdown files. When compiling the markdown content, `app.py` will look for jinja templates in the `templates` directory. If the markdown file is in the root of `content`, it will try to load a template with the same filename as the markdown file. For instance, `about.md` will look for `about.jinja`. 
+Within the `content` directory, you can create/edit markdown files. When compiling the markdown content, `app.py` will look for jinja templates in the `templates` directory. If the markdown file is in the root of `content`, it will try to load a template with the same filename as the markdown file. For instance, `about.md` will look for `about.jinja`.
 If the markdown file is in a subdirectory, it will look for a template with the same name as the subdirectory. At the moment, there is no functionality for deep nested folders. So, `recipes/tomato-soup.md` wants `recipes.jinja`. If the template does not exist, the default template is `post.jinja`.
 
-The project uses [Jinja](https://jinja.palletsprojects.com/), which allows for extending templates, using variables, looping trough variables, and other funky features!
+The project uses [Jinja](https://jinja.palletsprojects.com/), which allows for extending templates, using variables, looping through variables, and other funky features!
 
 Additionally, `component-inventory.csv` is loaded as a dataset.
 

app.py

@@ -16,28 +16,13 @@ from slugify import slugify
 env = Environment(loader=PackageLoader("src"), autoescape=select_autoescape())
 
 CONTENT_D = os.path.abspath("src/content")
-OUTPUT_D = "dist"
-OUT_ASSETS = "dist/assets"
-SRC_ASSETS = "src/assets"
+OUTPUT_D = "publication"
+
 documents = {}
 now = datetime.now()
 word_count = 0
 ins_count = 0
 
-def imageSpread(params):
-    global documents
-    param = params.split(" ")
-    print(param[1])
-    for item in documents[param[0]]:
-        print(item.get("filename"))
-
-    d = [item for item in documents[param[0]] if item.get("filename") == param[1]]
-    print(d)
-    template = env.select_template(["snippets/spread-images.jinja"])
-    html = template.render(documents=documents, content=d[0], type=param[1])
-
-    return html
-
 # jinja filter that can list documents
 def listDocuments(params):
     param = params.split(" ")
@@ -91,7 +76,7 @@ def get_ins_count(html_string):
 # jinja filter to replace shortcodes in HTML
 def shortcode_filter(value):
 
-    shortcode_callbacks = {"show": listDocuments, "showImages": imageSpread}
+    shortcode_callbacks = {"show": listDocuments}
 
     def shortcode_replacer(match):
 
@@ -236,7 +221,7 @@ def preload_documents():
         .strip()
     )
 
-    documents["meta"] = {"now": now.strftime("%d %B %Y - %H:%M:%S"), "version": version}
+    documents["meta"] = {"now": now.strftime("%d %B %Y"), "version": version}
 
     for subdir in os.listdir(CONTENT_D):
         path = os.path.join(CONTENT_D, subdir)
@@ -270,7 +255,7 @@ def get_inventory():
 
 def get_wordcount():
     global word_count, ins_count
-    word_count += count_words_in_markdown(documents["thesis"].body)
+    word_count += count_words_in_markdown(documents["index"].body)
 
     for section in ["chapters", "components", "recipes"]:
         for c in documents[section]:
@@ -304,10 +289,6 @@ def main():
         elif Path(path).suffix in [".csv"]:
             print("Compile: not compiling ", Path(path).name)
 
-    if os.path.exists(OUT_ASSETS):
-        shutil.rmtree(OUT_ASSETS)
-
-    shutil.copytree(SRC_ASSETS, OUT_ASSETS)
     global ins_count
     print(f"total words: {word_count}")
     print(f"total ins left: {ins_count}")