From b03568cfcc347c631de7a86541ea8f6a17bf31cb Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Sun, 3 Apr 2022 23:22:35 +1000 Subject: [PATCH] getting closer --- .gitignore | 2 +- basant/build/kitaab.py | 2 +- basant/grab/kitaab.py | 4 ++-- basant/grab/network.py | 6 +++--- basant/main.py | 8 ++++---- basant/{build => }/partial/index_table.html | 0 basant/{build => }/partial/item.xml | 0 basant/{build => }/partial/list.html | 0 basant/{build => }/partial/main.html | 0 basant/{build => }/partial/nav.html | 0 basant/{build => }/partial/rss.xml | 0 basant/shared/TagHelper.py | 5 +++-- basant/shared/censor.py | 2 ++ basant/shared/config.py | 12 ++++++------ flake.nix | 1 + 15 files changed, 23 insertions(+), 19 deletions(-) rename basant/{build => }/partial/index_table.html (100%) rename basant/{build => }/partial/item.xml (100%) rename basant/{build => }/partial/list.html (100%) rename basant/{build => }/partial/main.html (100%) rename basant/{build => }/partial/nav.html (100%) rename basant/{build => }/partial/rss.xml (100%) create mode 100644 basant/shared/censor.py diff --git a/.gitignore b/.gitignore index 72119e2..ae7442e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ __pycache__/* .tags .vimwiki_tags .vim/* -censor.py +.lsp/ .envrc .direnv/* ./raw/* diff --git a/basant/build/kitaab.py b/basant/build/kitaab.py index 195a817..927e155 100644 --- a/basant/build/kitaab.py +++ b/basant/build/kitaab.py @@ -1,5 +1,5 @@ from . import mistune -from shared import TagHelper, config +from basant.shared import TagHelper, config from jinja2 import Environment, FileSystemLoader import argparse import glob diff --git a/basant/grab/kitaab.py b/basant/grab/kitaab.py index f772387..50c2cd5 100644 --- a/basant/grab/kitaab.py +++ b/basant/grab/kitaab.py @@ -6,7 +6,7 @@ # filter - leave names in tact but do not link to relevant documents # create - list in an index file for website from basant.shared import TagHelper, config, helpers -from basant.shared.censor import privateList +from basant.shared import censor as c from os import listdir, mkdir, path, remove import shutil from . import convert @@ -14,7 +14,7 @@ import os # TODO: generalize based on headings(?) in index.wiki -censor = privateList +censor = c.privateList # TODO put this in config too... filter = ["dream", "gratitude", "review", "jrnl", "work", "job", "debt", "people", "priv", "threatdefence", "info"] diff --git a/basant/grab/network.py b/basant/grab/network.py index d2cb973..79b4a31 100644 --- a/basant/grab/network.py +++ b/basant/grab/network.py @@ -1,9 +1,9 @@ import json import random -from shared import helpers -import shared.censor +from basant.shared import helpers +import basant.shared.censor -censor = shared.censor.privateList +censor = basant.shared.censor.privateList def loadNetwork(path='network.json'): diff --git a/basant/main.py b/basant/main.py index c6c47dc..837ed9c 100644 --- a/basant/main.py +++ b/basant/main.py @@ -1,6 +1,6 @@ -import grab.kitaab -from shared import TagHelper -import build.kitaab +import basant.grab.kitaab as grab +from basant.shared import TagHelper +import basant.build.kitaab as build def get_raw_files(): @@ -17,7 +17,7 @@ def build_website(): def main(): - get_raw_files() + # get_raw_files() build_website() diff --git a/basant/build/partial/index_table.html b/basant/partial/index_table.html similarity index 100% rename from basant/build/partial/index_table.html rename to basant/partial/index_table.html diff --git a/basant/build/partial/item.xml b/basant/partial/item.xml similarity index 100% rename from basant/build/partial/item.xml rename to basant/partial/item.xml diff --git a/basant/build/partial/list.html b/basant/partial/list.html similarity index 100% rename from basant/build/partial/list.html rename to basant/partial/list.html diff --git a/basant/build/partial/main.html b/basant/partial/main.html similarity index 100% rename from basant/build/partial/main.html rename to basant/partial/main.html diff --git a/basant/build/partial/nav.html b/basant/partial/nav.html similarity index 100% rename from basant/build/partial/nav.html rename to basant/partial/nav.html diff --git a/basant/build/partial/rss.xml b/basant/partial/rss.xml similarity index 100% rename from basant/build/partial/rss.xml rename to basant/partial/rss.xml diff --git a/basant/shared/TagHelper.py b/basant/shared/TagHelper.py index 5a5fee3..f4af00f 100644 --- a/basant/shared/TagHelper.py +++ b/basant/shared/TagHelper.py @@ -1,8 +1,9 @@ from ctags import CTags, TagEntry import sys from os import listdir, path -from . import config -from .censor import privateList +from . import config, censor as c + +privateList = c.privateList def getAllFiles(): diff --git a/basant/shared/censor.py b/basant/shared/censor.py new file mode 100644 index 0000000..985d4fe --- /dev/null +++ b/basant/shared/censor.py @@ -0,0 +1,2 @@ +privateList = ['y0x3y', 'piracy', 'weed', 'drugs', 'gel capsules', + 'no weed', 'hackres town', 'hackers.town', 'radicalEd'] diff --git a/basant/shared/config.py b/basant/shared/config.py index 7b5e900..59d617b 100644 --- a/basant/shared/config.py +++ b/basant/shared/config.py @@ -8,12 +8,12 @@ build_folder = "output/" assets_folder = "assets/" medias_folder = "media/" raw_folder = "raw/" -template_main = "build/partial/main.html" -template_nav = "build/partial/nav.html" -template_index = "build/partial/index_table.html" -template_list = "build/partial/list.html" -rss_template = "build/partial/rss.xml" -rss_item_template = "build/partial/item.xml" +template_main = "partial/main.html" +template_nav = "partial/nav.html" +template_index = "partial/index_table.html" +template_list = "partial/list.html" +rss_template = "partial/rss.xml" +rss_item_template = "partial/item.xml" name_of_site = "Kitaab" site_meta_description = "" twitter_name = "@aynish@merveilles.town" diff --git a/flake.nix b/flake.nix index 26661f3..39a2fb5 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,7 @@ src = ./.; version = "0.1"; propagatedBuildInputs = [ python-with-my-packages ]; + doCheck = false; }; }); }