From 2612200ffe15c40da3bb3542775c4684be14e530 Mon Sep 17 00:00:00 2001 From: Ari Archer Date: Fri, 11 Mar 2022 13:46:45 +0200 Subject: [PATCH] update @ Fri 11 Mar 13:46:45 EET 2022 Signed-off-by: Ari Archer --- README.md | 2 ++ requirements.txt | 1 + scripts/blog | 37 +++++++++++++++++++------------------ 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 0c6faf4..9074370 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@

+[![Netlify Status](https://api.netlify.com/api/v1/badges/bbd7d670-9152-41a8-8c99-df57e4669606/deploy-status)](https://app.netlify.com/sites/blog-ari-web/deploys) + ## Installing dependencies ```sh diff --git a/requirements.txt b/requirements.txt index 743b067..9f76247 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,5 @@ datetime markdown plumbum pyfzf +typing diff --git a/scripts/blog b/scripts/blog index 5ef34e3..3c19e9e 100755 --- a/scripts/blog +++ b/scripts/blog @@ -16,6 +16,7 @@ from shutil import rmtree from threading import Thread from time import strftime as format_system_time from timeit import default_timer as code_timer +from typing import Dict, List, Tuple from warnings import filterwarnings as filter_warnings from css_html_js_minify import html_minify # type: ignore @@ -27,7 +28,7 @@ from pyfzf import FzfPrompt # type: ignore EXIT_OK: int = 0 EXIT_ERR: int = 1 -DEFAULT_CONFIG: dict = { +DEFAULT_CONFIG: Dict = { "editor-command": f"{os.environ.get('EDITOR', 'vim')} -- %s", "blog-dir": "b", "git-url": "/git", @@ -120,7 +121,7 @@ def log(message: str, header: str = "ERROR", code: int = EXIT_ERR) -> int: return code -def sanitise_title(title: str, titleset: dict) -> str: +def sanitise_title(title: str, titleset: Dict) -> str: _title: str = "" for char in title: @@ -165,7 +166,7 @@ def new_config() -> None: json.dump(DEFAULT_CONFIG, cfg, indent=4) -def pick_blog(config: dict) -> str: +def pick_blog(config: Dict) -> str: try: blog_id: str = ( FzfPrompt() @@ -189,7 +190,7 @@ def pick_blog(config: dict) -> str: return blog_id -def new_blog(config: dict) -> tuple[int, dict]: +def new_blog(config: Dict) -> Tuple[int, Dict]: """Make a new blog""" if title := iinput("blog title"): @@ -230,7 +231,7 @@ def new_blog(config: dict) -> tuple[int, dict]: return EXIT_OK, config -def build(config: dict) -> tuple[int, dict]: +def build(config: Dict) -> Tuple[int, Dict]: """Build, minimise and generate site""" if len(config["blogs"]) < 1: @@ -259,7 +260,7 @@ def build(config: dict) -> tuple[int, dict]: log("Building blogs...", "INFO") - def thread(blog_name: str, blog_meta: dict): + def thread(blog_name: str, blog_meta: Dict): blog_dir: str = os.path.join(config["blog-dir"], blog_name) os.makedirs(blog_dir, exist_ok=True) @@ -296,7 +297,7 @@ def build(config: dict) -> tuple[int, dict]: log(f"Finished building blog {blog_name!r}", "BUILD") - _tmp_threads: list = [] + _tmp_threads: List = [] for blog_name, blog_meta in config["blogs"].items(): t: Thread = Thread(target=thread, args=(blog_name, blog_meta), daemon=True) @@ -311,7 +312,7 @@ def build(config: dict) -> tuple[int, dict]: with open("index.html", "w") as index: latest_blog_id: str = tuple(config["blogs"].keys())[-1] - lastest_blog: dict = config["blogs"][latest_blog_id] + lastest_blog: Dict = config["blogs"][latest_blog_id] lastest_blog_time: str = format_time(lastest_blog["time"]) blog_list = "