From 0cc472876f6933cef535eb21944b77ea2974d266 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Fri, 25 Mar 2022 02:01:43 +1000 Subject: [PATCH] trying to get this stupid build working --- src/build/kitaab.py | 2 +- src/grab/kitaab.py | 4 ++-- src/grab/network.py | 4 ++-- src/main.py | 22 ++++++++-------------- src/shared/TagHelper.py | 4 ++-- src/shared/config.py | 2 +- 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/build/kitaab.py b/src/build/kitaab.py index d8376bf..195a817 100644 --- a/src/build/kitaab.py +++ b/src/build/kitaab.py @@ -283,6 +283,7 @@ def replacement_function(replace): if replace == 'name-generation': # TODO gross hardcoded lines = [] + # this file should probably be an asset?? with open('raw/210124-0033.wiki') as f: lines = f.readlines() lines = lines[-2:] @@ -513,7 +514,6 @@ def create_home_page(template, site_folder): return template -# Create RSS Feed def create_rss_feed(rss_entries, rss_template, rss_item_template, site_folder): template = open(rss_template, 'r').read() itemTemplate = open(rss_item_template, 'r').read() diff --git a/src/grab/kitaab.py b/src/grab/kitaab.py index d12f2e8..ce96593 100644 --- a/src/grab/kitaab.py +++ b/src/grab/kitaab.py @@ -5,8 +5,8 @@ # censor - burn all mentions of this word wherever it appears in Kitaab # filter - leave names in tact but do not link to relevant documents # create - list in an index file for website -from shared.censor import privateList from shared import TagHelper, config, helpers +import shared.censor 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 = shared.censor.privateList # TODO put this in config too... filter = ["dream", "gratitude", "review", "jrnl", "work", "job", "debt", "people", "priv", "threatdefence", "info"] diff --git a/src/grab/network.py b/src/grab/network.py index e3d8e4b..d2cb973 100644 --- a/src/grab/network.py +++ b/src/grab/network.py @@ -1,9 +1,9 @@ import json import random from shared import helpers -from shared.censor import privateList +import shared.censor -censor = privateList +censor = shared.censor.privateList def loadNetwork(path='network.json'): diff --git a/src/main.py b/src/main.py index 91550b6..c6c47dc 100644 --- a/src/main.py +++ b/src/main.py @@ -1,31 +1,25 @@ -from grab import makePublic +import grab.kitaab from shared import TagHelper -from build import build -import os +import build.kitaab -def grab(): - # We're in src/kitaab-public/ - os.chdir('./grab/') +def get_raw_files(): all_files = TagHelper.getAllFiles() - filtered_files = makePublic.filterFiles(all_files) - makePublic.copyFiles(filtered_files) + filtered_files = grab.kitaab.filterFiles(all_files) + grab.kitaab.copyFiles(filtered_files) print("Censoring files...") - makePublic.censorFiles() + grab.kitaab.censorFiles() def build_website(): - # we're in src/kitaab-public/grab/ - os.chdir('../') print('building websites') - build.generate_website() + build.kitaab.generate_website() def main(): - grab() + get_raw_files() build_website() if __name__ == '__main__': - os.chdir('./src/kitaab-public/') main() diff --git a/src/shared/TagHelper.py b/src/shared/TagHelper.py index 5280d17..b11d06a 100644 --- a/src/shared/TagHelper.py +++ b/src/shared/TagHelper.py @@ -2,11 +2,11 @@ from ctags import CTags, TagEntry import sys from icecream import ic from os import listdir, path -from shared.censor import privateList +import shared.censor # TODO don't hardcode the path -censor = privateList +censor = shared.censor.privateList def getAllFiles(): diff --git a/src/shared/config.py b/src/shared/config.py index 58594a0..1a237a0 100644 --- a/src/shared/config.py +++ b/src/shared/config.py @@ -5,7 +5,7 @@ relative_build_url = "" absolute_build_url = "https://anish.lakhwara.com/" files_folder = '' # TODO build_folder = "output/" -assets_folder = "asset/" +assets_folder = "assets/" medias_folder = "media/" raw_folder = "raw/" template_main = "build/partial/main.html"