From 155513a8bd7cda3aa941d5fe606883a981c136cf Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Sun, 3 Apr 2022 22:57:45 +1000 Subject: [PATCH] remove references to relative paths --- .envrc | 2 +- .gitignore | 2 ++ basant/grab/kitaab.py | 10 +++++----- basant/shared/TagHelper.py | 7 ++++--- basant/shared/config.py | 2 +- basant/shared/tag-fixer.py | 9 +++++---- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.envrc b/.envrc index 1d953f4..3550a30 100644 --- a/.envrc +++ b/.envrc @@ -1 +1 @@ -use nix +use flake diff --git a/.gitignore b/.gitignore index eac1c43..72119e2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ censor.py raw/* result/* ./result/* +result +.envrc diff --git a/basant/grab/kitaab.py b/basant/grab/kitaab.py index ce96593..f772387 100644 --- a/basant/grab/kitaab.py +++ b/basant/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 import TagHelper, config, helpers -import shared.censor +from basant.shared import TagHelper, config, helpers +from basant.shared.censor import privateList 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 = shared.censor.privateList +censor = privateList # TODO put this in config too... filter = ["dream", "gratitude", "review", "jrnl", "work", "job", "debt", "people", "priv", "threatdefence", "info"] @@ -35,8 +35,8 @@ def filterFiles(AllFileList): def copyFiles(fileList): - baseFilePath = '/home/anish/vimwiki/' - outputFilePath = '../raw/' # TODO relative path.... + baseFilePath = config.files_folder + outputFilePath = outputBasePath try: mkdir(outputFilePath) except FileExistsError: diff --git a/basant/shared/TagHelper.py b/basant/shared/TagHelper.py index a552d53..5a5fee3 100644 --- a/basant/shared/TagHelper.py +++ b/basant/shared/TagHelper.py @@ -1,12 +1,13 @@ from ctags import CTags, TagEntry import sys from os import listdir, path -# from shared.censor import privateList +from . import config +from .censor import privateList def getAllFiles(): files = [f for f in listdir( - '/home/anish/vimwiki') if '.wiki' in f and path.isfile('/home/anish/vimwiki/' + f)] + config.files_folder) if '.wiki' in f and path.isfile(config.files_folder + f)] files = set(files) return files @@ -25,7 +26,7 @@ def untaggedFiles(AllFileList=getAllFiles()): return set.difference(AllFileList, doNotTakeFiles) -def loadTagFile(path='/home/anish/vimwiki/.vimwiki_tags'): +def loadTagFile(path=config.files_folder + '.vimwiki_tags'): # Available file information keys: # opened - was the tag file successfully opened? # error_number - errno value when 'opened' is false diff --git a/basant/shared/config.py b/basant/shared/config.py index 1a237a0..7b5e900 100644 --- a/basant/shared/config.py +++ b/basant/shared/config.py @@ -3,7 +3,7 @@ nav_tags = ['dev', 'way', 'recipe', 'ops', 'blog', 'rock', 'phil', 'story', 'blog', 'untagged'] relative_build_url = "" absolute_build_url = "https://anish.lakhwara.com/" -files_folder = '' # TODO +files_folder = '/home/anish/vimwiki' build_folder = "output/" assets_folder = "assets/" medias_folder = "media/" diff --git a/basant/shared/tag-fixer.py b/basant/shared/tag-fixer.py index 5e5a415..a8a71cc 100644 --- a/basant/shared/tag-fixer.py +++ b/basant/shared/tag-fixer.py @@ -5,6 +5,7 @@ from ctags import CTags, TagEntry import sys from icecream import ic import shutil +from . import config def loadTagFile(path='.vimwiki_tags'): @@ -55,7 +56,7 @@ def loopThrough(tagFile): def fixErrors(errors): ''' Replaces :: with :, which seems to be the error for many of the tags ''' - fileBase = '/home/anish/vimwiki/' + fileBase = config.files_folder for v in errors: print("Fixing {}...".format(v)) fileName = fileBase + getFileName(v) @@ -73,7 +74,7 @@ def fixErrors(errors): def printErrors(errors): - fileBase = '/home/anish/vimwiki/' + fileBase = config.files_folder for v in errors: fileName = fileBase + getFileName(v) print("Reading {}...".format(v)) @@ -87,8 +88,8 @@ def getFileName(f): def getBackupFiles(errors): - fileBase = '/home/anish/vimwiki/' - backupBase = '/home/anish/vimwiki/jrnl/' + fileBase = config.files_folder + backupBase = config.files_folder + '/jrnl/' for files in errors.values(): for f in files: f = getFileName(f)