From a9878954298e80547335e37375a263caaa734d3d Mon Sep 17 00:00:00 2001 From: Max Value Date: Tue, 17 Dec 2024 10:37:54 +0000 Subject: [PATCH] Re-organizaton and photos + Added homepage.md - Moved recent posts to the homepage + Information to sidebar + Images to the sidebar + Images to the homepage --- blog.py | 23 ++++++++++++++++++++--- media/homepage/challah.jpg | Bin 0 -> 883797 bytes media/homepage/fruit.jpg | Bin 0 -> 1124078 bytes media/sidebar/iiw1.jpeg | Bin 0 -> 60144 bytes media/sidebar/iiw2.jpeg | Bin 0 -> 72323 bytes templates/homepage.md | 4 ++++ templates/page.html | 6 +++--- templates/sidebar.md | 9 +++++++-- 8 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 media/homepage/challah.jpg create mode 100644 media/homepage/fruit.jpg create mode 100644 media/sidebar/iiw1.jpeg create mode 100644 media/sidebar/iiw2.jpeg create mode 100644 templates/homepage.md diff --git a/blog.py b/blog.py index 27b5b07..f8bcf57 100755 --- a/blog.py +++ b/blog.py @@ -7,6 +7,8 @@ from os.path import getmtime from markdown.extensions.toc import TocExtension import re import mmap +import time +from git import Repo app = Flask(__name__) md = markdown.Markdown(extensions = ['meta', 'tables', 'footnotes', TocExtension(title = "Table of contents")]) @@ -44,7 +46,7 @@ class Page(): template_string = open(f"{blog_path}/templates/{self.template}", "r").read() - recent = get_recent(10) + history = get_history(6) with open(f"{blog_path}/templates/sidebar.md", "r") as f: sidebar = md.convert(f.read()) @@ -56,7 +58,7 @@ class Page(): keywords = format_keywords, content = self.content, filename = self.filename, - recent = recent, + history = history, sidebar = sidebar ) @@ -91,11 +93,22 @@ def get_metadata(file_name: str): return title, abstract, keywords +def get_history(n): + repo = Repo.init(blog_path) + commits = list(repo.iter_commits("main", max_count=n)) + commits_string = "" + for c in commits: + time_string = time.strftime("%d %b %Y", time.gmtime(c.committed_date)) + link = f"https://git.ozva.co.uk/?p=blog;a=commit;h={c.hexsha}" + commits_string += f"⛁ {time_string} {c.message}
" + + return "

" + commits_string + "

" + def get_recent(n): modification_times = {file_name: getmtime(f"{blog_path}/pages/{file_name}") for file_name in listdir(f"{blog_path}/pages")} pages = sorted(modification_times.items(), key=lambda x: x[1])[:n] - content = "