games

From: Zachary Vance Date: Wed, 3 Jul 2024 04:15:08 +0000 (-0400) Subject: Add monitoring and auto-reload code X-Git-Url: https://git.za3k.com/?a=commitdiff_plain;h=f5db60314a04784d552e231d1dcc29f56d624ca6;p=blog.git Add monitoring and auto-reload code --- diff --git a/blog-gen.py b/blog old mode 100644 new mode 100755 similarity index 50% rename from blog-gen.py rename to blog index fbaa354..c1c8c34 --- a/blog-gen.py +++ b/blog @@ -1,9 +1,14 @@ -import frontmatter +#!/bin/python3 +import argparse import yaml import chevron as mustache from pathlib import Path -from collections import ChainMap +import collections import os.path +import sys + +import frontmatter +import monitor class PseudoMap(): def __getitem__(self, key): @@ -21,6 +26,8 @@ def url_slug(title): title = "".join(x for x in title if x in allowable) return title +RELOAD_HTML = b"""""" + class Templatable(PseudoMap): def __init__(self, blog): self.blog = blog @@ -45,13 +52,15 @@ class Templatable(PseudoMap): def output(self): output = self.content() + if self.blog.reload: + output += RELOAD_HTML self.output_path.parent.mkdir(parents=True, exist_ok=True) with open(self.output_path, "wb") as f: f.write(output) @property def context(self): - return ChainMap(self, self.blog) + return collections.ChainMap(self, self.blog) class Static(Templatable): def __init__(self, path, blog): @@ -74,12 +83,18 @@ class Post(Templatable): def id(self): if hasattr(self, "wordpress_slug"): return self.wordpress_slug if hasattr(self, "slug"): return self.slug - return utrl_slug(self.title) + return url_slug(self.title) + + def __hash__(self): + return hash(self.id) class Tag(Templatable): def __init__(self, tag, blog): super().__init__(blog) self.tag = tag + self.posts = set() + def add_post(self, post): + self.posts.add(post) def __hash__(self): return hash(self.tag) class Category(Tag): @@ -90,10 +105,11 @@ class Image(Templatable): pass class Blog(PseudoMap): - def __init__(self, config="config.yaml"): - self.tags = set() - self.categories = set() + def __init__(self, config="config.yaml", reload=False): + self.tags = {} + self.categories = {} self.posts = [] + self.reload = reload self.load_config(config) self.load_posts() @@ -115,10 +131,21 @@ class Blog(PseudoMap): def add_post(self, post): self.posts.append(post) + for tag in post.tags: - self.tags.add(Tag(tag, self)) + self.tag_for(tag).add_post(post) for category in post.categories: - self.categories.add(Category(category, self)) + self.category_for(category).add_post(post) + + def category_for(self, category): + if category not in self.categories: + self.categories[category] = Category(category, self) + return self.categories[category] + + def tag_for(self, tag): + if tag not in self.tags: + self.tags[tag] = Tag(tag, self) + return self.tags[tag] @property def images(self): @@ -133,17 +160,70 @@ class Blog(PseudoMap): def pages(self): return [] # TODO + def generate_all(blog): + for image in blog.images: + image.output() + for static in blog.static: + static.output() + for post in blog.posts: + post.output() + for tag in blog.tags.values(): + tag.output() + for category in blog.categories.values(): + category.output() + for page in blog.pages: + page.output() + + def updates_happened(self, paths): + for path in paths: + self._update_happened(path) + + def _update_happened(self, path): + path = Path(path) + global_update = [ + self.tag_template, self.category_template, self.post_template, + Path(self.static_dir) / "wp-includes", + Path(self.static_dir) / "wp-content/themes", + self.page_dir, + ] + local_update = [ + self.post_dir, + self.static_dir, # aside from those two subdirs + self.image_dir, + ] + if any(path.is_relative_to(top) for top in global_update): + print(path, "updated, generating all...", file=sys.stderr) + self.generate_all() + elif any(path.is_relative_to(top) for top in local_update): + print(path, "updated, generating all (needlessly)...", file=sys.stderr) + self.generate_all() # TODO: Don't generate everything + else: + #print(path, "updated, ignoring...", file=sys.stderr) + pass + + # TODO: Reload when 'blog' executable or config file is changed? + if __name__ == "__main__": - blog = Blog() - for image in blog.images: - image.output() - for static in blog.static: - static.output() - for post in blog.posts: - post.output() - for tag in blog.tags: - tag.output() - for category in blog.categories: - category.output() - for page in blog.pages: - page.output() + parser = argparse.ArgumentParser( + prog="blog", + description="Generate za3k's blog from HTML/markdown files with YAML frontmatter and some templates", + ) + parser.add_argument("-a", "--all", action='store_true') + parser.add_argument('changed_files', metavar="FILE", type=argparse.FileType('r'), nargs="*", help='blog posts to re-generate (source paths)') + parser.add_argument("-f", "--follow", action='store_true', help="continue running and monitoring for file changes") + args = parser.parse_args() + + if len(args.changed_files) == 0: + args.all = True + + blog = Blog(reload=args.follow) + if args.all: + blog.generate_all() + else: + blog.updates_happened(changed_files) + + if args.follow: + print("monitoring for changes...", file=sys.stderr) + # Discard updates within 5s of one another + for changed_file in monitor.Monitor(blog.source, discard_rapid=5): + blog.updates_happened([changed_file]) diff --git a/monitor.py b/monitor.py new file mode 100644 index 0000000..33ef598 --- /dev/null +++ b/monitor.py @@ -0,0 +1,58 @@ +""" +Yield each changed source file, as a pathlib.Path + +Runs indefinitely. Exit with Ctrl-C +""" + +import collections +import queue +import watchdog.observers +import watchdog.events +import time + +class FunctionEventHandler(watchdog.events.FileSystemEventHandler): + def __init__(self, f): + self.f = f + def on_any_event(self, event): + self.f(event) + +class Monitor(): + def __init__(self, path, discard_rapid=None): + self.observer = watchdog.observers.Observer() + self.updates = queue.Queue() + self.observer.schedule( + FunctionEventHandler(self.updates.put), + path, + recursive=True + ) + self.last_update = collections.defaultdict(int) + self.discard_rapid = discard_rapid + self.observer.start() + + @staticmethod + def time(): + return time.time() + + def is_rapid(self, path): + now = self.time() + last = self.last_update[path] + elapsed = now - last + return (self.discard_rapid is not None and + elapsed < self.discard_rapid) + + def _iter(self): + try: + while True: + event = self.updates.get() + yield event.src_path + if hasattr(event, "dest_path"): + yield event.dest_path + self.updates.task_done() + except KeyboardInterrupt: + self.observer.stop() + self.observer.join() + + def __iter__(self): + for x in self._iter(): + if not self.is_rapid(x): + yield x diff --git a/templates/tag.mustache.html b/templates/tag.mustache.html new file mode 100644 index 0000000..eb3e5a3 --- /dev/null +++ b/templates/tag.mustache.html @@ -0,0 +1,273 @@ + + + + + + + + +games + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ +

+ + + +

+ +

+ + +

+ +

+ + + + + + + + {{# posts }} + {{& post }} + {{/ posts }} + +

+ + +

+ +

+ + + + +

+ + + + + + diff --git a/blog2html.py b/wordpress2frontmatter.py similarity index 100% rename from blog2html.py rename to wordpress2frontmatter.py