From e8528296b00bcac109910a3ce1be796e779b34fa Mon Sep 17 00:00:00 2001 From: Zachary Vance Date: Fri, 2 Aug 2024 23:21:42 -0400 Subject: [PATCH] Switch to final absolute URLs --- blog | 13 +++++++------ config.yaml | 19 +++++++++++-------- static/{ => css}/style-wordpress.css | 0 static/{resources => }/images/RSS.png | Bin static/resources/images/Twitter.png | Bin 3360 -> 0 bytes templates/author.mustache.html | 2 +- templates/feed.mustache.html | 2 +- templates/layout.mustache.html | 11 ++++------- templates/post.mustache.html | 6 +++--- templates/tagcloud.mustache.html | 2 +- 10 files changed, 28 insertions(+), 27 deletions(-) rename static/{ => css}/style-wordpress.css (100%) rename static/{resources => }/images/RSS.png (100%) delete mode 100644 static/resources/images/Twitter.png diff --git a/blog b/blog index 92f2e5a..38d2a9f 100755 --- a/blog +++ b/blog @@ -179,7 +179,11 @@ class Templatable(PseudoMap): @property def url(self): - return self.blog.web_root + "/" + str(self.output_path.relative_to(Path(self.blog.destination))) + url_template = self.blog["{}_url".format(self.type)] + if url_template is None: + return self.blog.web_root + "/" + str(self.output_path.relative_to(Path(self.blog.destination))) + else: + return mustache.render(url_template, self.context) def render_template(source, blog, name, context, replace_links=True): template_path = blog["{}_template".format(name)] @@ -343,7 +347,7 @@ class Image(Templatable): class Blog(PseudoMap): def __init__(self, config="config.yaml", reload=False): - self.tags = {} + self.tags = {} # Tag -> str self.categories = {} self.authors = {} self._posts = [] @@ -366,6 +370,7 @@ class Blog(PseudoMap): if k.endswith("_dir") or k.endswith("_template") or k.endswith("_path"): v = os.path.join(self.source, os.path.expanduser(v)) self[k] = v + self.feed_url = mustache.render(self.feed_url, self) @property def deadlinks(self): @@ -487,10 +492,6 @@ class Blog(PseudoMap): return Templatable.render_template(Templatable, blog, "tagcloud", self) - @property - def feed_url(self): - return Page("feed", self, use_layout=False).url - def _update_happened(self, path): path = Path(path) reload_update = [ diff --git a/config.yaml b/config.yaml index 88d1a99..ea1ec32 100644 --- a/config.yaml +++ b/config.yaml @@ -1,9 +1,11 @@ # These two properties are always first, and always absolute paths source: "/home/zachary/blog" destination: "/home/zachary/blog/public" + web_root: "https://blog2.za3k.com" -domain: "blog2.za3k.com" title: 'blog of zachary "za3k" vance' +# For search bar +domain: "blog2.za3k.com" post_dir: "posts" comments_dir: "comments" @@ -13,26 +15,27 @@ static_dir: "static" author_template: "templates/author.mustache.html" category_template: "templates/category.mustache.html" -deadlinks_template: "templates/deadlinks.mustache.html" -links_template: "templates/links.mustache.html" index_template: "templates/index.mustache.html" feed_template: "templates/feed.mustache.html" layout_template: "templates/layout.mustache.html" post_template: "templates/post.mustache.html" -postcombined_template: "templates/postcombined.mustache.html" tag_template: "templates/tag.mustache.html" tagcloud_template: "templates/tagcloud.mustache.html" +# Non-local mode, preferred link address +author_url: "{{web_root}}/author/{{slug}}/" +category_url: "{{web_root}}/category/{{slug}}/" +tag_url: "{{web_root}}/tag/{{slug}}/" +index_url: "{{web_root}}" +post_url: "{{web_root}}/{{id}}/" +feed_url: "{{web_root}}/feed/" + author_destination: "{{destination}}/author/{{slug}}.html" category_destination: "{{destination}}/category/{{slug}}.html" -deadlinks_destination: "{{destination}}/page/deadlinks.html" -links_destination: "{{destination}}/page/links.html" index_destination: "{{destination}}/page/index.html" feed_destination: "{{destination}}/page/feed.xml" image_destination: "{{destination}}/images/{{image}}" page_destination: "{{destination}}/{{page}}" post_destination: "{{destination}}/posts/{{id}}.html" -post_md_destination: "{{destination}}/posts/{{id}}.md.html" -post_html_destination: "{{destination}}/posts/{{id}}.orig.html" static_destination: "{{destination}}/{{relative_path}}" tag_destination: "{{destination}}/tag/{{slug}}.html" diff --git a/static/style-wordpress.css b/static/css/style-wordpress.css similarity index 100% rename from static/style-wordpress.css rename to static/css/style-wordpress.css diff --git a/static/resources/images/RSS.png b/static/images/RSS.png similarity index 100% rename from static/resources/images/RSS.png rename to static/images/RSS.png diff --git a/static/resources/images/Twitter.png b/static/resources/images/Twitter.png deleted file mode 100644 index 8e2d0aa0fc2dad3d5ad21a12432889ff58794959..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3360 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 q`@mlN)vg8wKNwpaS3& -

Author Archives: {{ tag }}

+

Author Archives: {{ tag }}

{{# posts.first10 }} diff --git a/templates/feed.mustache.html b/templates/feed.mustache.html index 22b7ce5..7ab22f9 100644 --- a/templates/feed.mustache.html +++ b/templates/feed.mustache.html @@ -19,7 +19,7 @@ {{# posts.first10 }} {{title}} - {{web_root}}/post/{{id}}.html + {{url}} {{date_rfc822}} {{# categories }} diff --git a/templates/layout.mustache.html b/templates/layout.mustache.html index 1576180..85dfdeb 100644 --- a/templates/layout.mustache.html +++ b/templates/layout.mustache.html @@ -7,7 +7,7 @@ - + @@ -24,10 +24,7 @@
blog of zachary "za3k" vance
@@ -37,8 +34,8 @@ diff --git a/templates/post.mustache.html b/templates/post.mustache.html index f0a6f18..a6309d7 100644 --- a/templates/post.mustache.html +++ b/templates/post.mustache.html @@ -7,7 +7,7 @@
- By | | + By | | {{#has_categories}} @@ -24,11 +24,11 @@
{{#has_tags}} Tagged - {{# tags_list }}{{^last}}, {{/last}}{{/ tags_list }}{{#main_display}}.{{/main_display}} + {{# tags_list }}{{^last}}, {{/last}}{{/ tags_list }}{{#main_display}}.{{/main_display}} {{/has_tags}} {{#main_display}} - Bookmark the permalink. + Bookmark the permalink. {{/main_display}}
diff --git a/templates/tagcloud.mustache.html b/templates/tagcloud.mustache.html index 9db1f35..34de6f3 100644 --- a/templates/tagcloud.mustache.html +++ b/templates/tagcloud.mustache.html @@ -1,6 +1,6 @@

{{# top_tags }} - {{ tag }} + {{ tag }} {{/ top_tags }}

-- 2.47.3