ari/blog.ari.lt
1
0
Fork 0
mirror of https://git.ari.lt/ari.lt/blog.ari.lt.git synced 2025-02-04 09:39:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update @ Fri 11 Mar 13:46:45 EET 2022

Browse source 
Signed-off-by: Ari Archer <ari.web.xyz@gmail.com>
This commit is contained in:
Ari Archer 2022-03-11 13:46:45 +02:00
parent 5839aebed4
commit 2612200ffe
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: A50D5B4B599AF8A2
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -8,6 +8,8 @@
<img src="https://img.shields.io/github/stars/TruncatedDinosour/blog.ari-web.xyz?color=red&style=flat-square"> <img src="https://img.shields.io/github/stars/TruncatedDinosour/blog.ari-web.xyz?color=red&style=flat-square">
</p> </p>
[![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 ## Installing dependencies
```sh ```sh

1
requirements.txt
View file

@ -4,4 +4,5 @@ datetime
markdown markdown
plumbum plumbum
pyfzf pyfzf
typing

37
scripts/blog
View file

@ -16,6 +16,7 @@ from shutil import rmtree
from threading import Thread from threading import Thread
from time import strftime as format_system_time from time import strftime as format_system_time
from timeit import default_timer as code_timer from timeit import default_timer as code_timer
from typing import Dict, List, Tuple
from warnings import filterwarnings as filter_warnings from warnings import filterwarnings as filter_warnings
from css_html_js_minify import html_minify # type: ignore 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_OK: int = 0
EXIT_ERR: int = 1 EXIT_ERR: int = 1
DEFAULT_CONFIG: dict = { DEFAULT_CONFIG: Dict = {
"editor-command": f"{os.environ.get('EDITOR', 'vim')} -- %s", "editor-command": f"{os.environ.get('EDITOR', 'vim')} -- %s",
"blog-dir": "b", "blog-dir": "b",
"git-url": "/git", "git-url": "/git",
@ -120,7 +121,7 @@ def log(message: str, header: str = "ERROR", code: int = EXIT_ERR) -> int:
return code return code
def sanitise_title(title: str, titleset: dict) -> str: def sanitise_title(title: str, titleset: Dict) -> str:
_title: str = "" _title: str = ""
for char in title: for char in title:
@ -165,7 +166,7 @@ def new_config() -> None:
json.dump(DEFAULT_CONFIG, cfg, indent=4) json.dump(DEFAULT_CONFIG, cfg, indent=4)
def pick_blog(config: dict) -> str: def pick_blog(config: Dict) -> str:
try: try:
blog_id: str = ( blog_id: str = (
FzfPrompt() FzfPrompt()
@ -189,7 +190,7 @@ def pick_blog(config: dict) -> str:
return blog_id return blog_id
def new_blog(config: dict) -> tuple[int, dict]: def new_blog(config: Dict) -> Tuple[int, Dict]:
"""Make a new blog""" """Make a new blog"""
if title := iinput("blog title"): if title := iinput("blog title"):
@ -230,7 +231,7 @@ def new_blog(config: dict) -> tuple[int, dict]:
return EXIT_OK, config return EXIT_OK, config
def build(config: dict) -> tuple[int, dict]: def build(config: Dict) -> Tuple[int, Dict]:
"""Build, minimise and generate site""" """Build, minimise and generate site"""
if len(config["blogs"]) < 1: if len(config["blogs"]) < 1:
@ -259,7 +260,7 @@ def build(config: dict) -> tuple[int, dict]:
log("Building blogs...", "INFO") 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) blog_dir: str = os.path.join(config["blog-dir"], blog_name)
os.makedirs(blog_dir, exist_ok=True) 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") log(f"Finished building blog {blog_name!r}", "BUILD")
_tmp_threads: list = [] _tmp_threads: List = []
for blog_name, blog_meta in config["blogs"].items(): for blog_name, blog_meta in config["blogs"].items():
t: Thread = Thread(target=thread, args=(blog_name, blog_meta), daemon=True) 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: with open("index.html", "w") as index:
latest_blog_id: str = tuple(config["blogs"].keys())[-1] 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"]) lastest_blog_time: str = format_time(lastest_blog["time"])
blog_list = "<ul>" blog_list = "<ul>"
@ -346,7 +347,7 @@ def build(config: dict) -> tuple[int, dict]:
return EXIT_OK, config return EXIT_OK, config
def list_blogs(config: dict) -> tuple[int, dict]: def list_blogs(config: Dict) -> Tuple[int, Dict]:
"""List blogs""" """List blogs"""
for blog_id, blog_meta in config["blogs"].items(): for blog_id, blog_meta in config["blogs"].items():
@ -362,7 +363,7 @@ Keywords: {blog_meta['keywords'].replace(' ', ', ')}
return EXIT_OK, config return EXIT_OK, config
def remove_blog(config: dict) -> tuple[int, dict]: def remove_blog(config: Dict) -> Tuple[int, Dict]:
"""Remove a blog page""" """Remove a blog page"""
blog_id: str = pick_blog(config) blog_id: str = pick_blog(config)
@ -378,7 +379,7 @@ def dummy() -> None:
"""Print help/usage information""" """Print help/usage information"""
def edit_title(blog: str, config: dict) -> int: def edit_title(blog: str, config: Dict) -> int:
new_title: str = iinput( new_title: str = iinput(
"edit title", b64decode(config["blogs"][blog]["title"]).decode() "edit title", b64decode(config["blogs"][blog]["title"]).decode()
) )
@ -391,7 +392,7 @@ def edit_title(blog: str, config: dict) -> int:
return EXIT_OK return EXIT_OK
def edit_keywords(blog: str, config: dict) -> int: def edit_keywords(blog: str, config: Dict) -> int:
new_keywords: str = iinput("edit keywords", config["blogs"][blog]["keywords"]) new_keywords: str = iinput("edit keywords", config["blogs"][blog]["keywords"])
if not new_keywords.strip(): if not new_keywords.strip():
@ -402,7 +403,7 @@ def edit_keywords(blog: str, config: dict) -> int:
return EXIT_OK return EXIT_OK
def edit_content(blog: str, config: dict) -> int: def edit_content(blog: str, config: Dict) -> int:
file: str = f"/tmp/{blog}.md" file: str = f"/tmp/{blog}.md"
with open(file, "w") as blog_md: with open(file, "w") as blog_md:
@ -422,14 +423,14 @@ def edit_content(blog: str, config: dict) -> int:
return EXIT_OK return EXIT_OK
EDIT_HOOKS: dict = { EDIT_HOOKS: Dict = {
"title": edit_title, "title": edit_title,
"keywords": edit_keywords, "keywords": edit_keywords,
"content": edit_content, "content": edit_content,
} }
def edit(config: dict) -> tuple[int, dict]: def edit(config: Dict) -> Tuple[int, Dict]:
"""Edit a blog""" """Edit a blog"""
blog_id: str = pick_blog(config) blog_id: str = pick_blog(config)
@ -450,7 +451,7 @@ def edit(config: dict) -> tuple[int, dict]:
return EXIT_OK, config return EXIT_OK, config
def gen_new_config(config: dict) -> tuple[int, dict]: def gen_new_config(config: Dict) -> Tuple[int, Dict]:
"""Make default config""" """Make default config"""
if os.path.exists(DEFAULT_CONFIG_FILE): if os.path.exists(DEFAULT_CONFIG_FILE):
@ -465,7 +466,7 @@ def gen_new_config(config: dict) -> tuple[int, dict]:
return EXIT_OK, config return EXIT_OK, config
SUBCOMMANDS: dict = { SUBCOMMANDS: Dict = {
"help": dummy, "help": dummy,
"new": new_blog, "new": new_blog,
"build": build, "build": build,
@ -476,7 +477,7 @@ SUBCOMMANDS: dict = {
} }
def usage(code: int = EXIT_ERR, config: dict = None) -> int: def usage(code: int = EXIT_ERR, config: Dict = None) -> int:
sys.stderr.write(f"Usage: {sys.argv[0]} <subcommand>\n") sys.stderr.write(f"Usage: {sys.argv[0]} <subcommand>\n")
for subcommand, func in SUBCOMMANDS.items(): for subcommand, func in SUBCOMMANDS.items():