diff --git a/src/kitaab-public/TODO b/src/TODO
similarity index 100%
rename from src/kitaab-public/TODO
rename to src/TODO
diff --git a/src/kitaab-public/asset/android-icon-144x144.png b/src/assets/android-icon-144x144.png
similarity index 100%
rename from src/kitaab-public/asset/android-icon-144x144.png
rename to src/assets/android-icon-144x144.png
diff --git a/src/kitaab-public/asset/android-icon-192x192.png b/src/assets/android-icon-192x192.png
similarity index 100%
rename from src/kitaab-public/asset/android-icon-192x192.png
rename to src/assets/android-icon-192x192.png
diff --git a/src/kitaab-public/asset/android-icon-36x36.png b/src/assets/android-icon-36x36.png
similarity index 100%
rename from src/kitaab-public/asset/android-icon-36x36.png
rename to src/assets/android-icon-36x36.png
diff --git a/src/kitaab-public/asset/android-icon-48x48.png b/src/assets/android-icon-48x48.png
similarity index 100%
rename from src/kitaab-public/asset/android-icon-48x48.png
rename to src/assets/android-icon-48x48.png
diff --git a/src/kitaab-public/asset/android-icon-72x72.png b/src/assets/android-icon-72x72.png
similarity index 100%
rename from src/kitaab-public/asset/android-icon-72x72.png
rename to src/assets/android-icon-72x72.png
diff --git a/src/kitaab-public/asset/android-icon-96x96.png b/src/assets/android-icon-96x96.png
similarity index 100%
rename from src/kitaab-public/asset/android-icon-96x96.png
rename to src/assets/android-icon-96x96.png
diff --git a/src/kitaab-public/asset/apple-icon-114x114.png b/src/assets/apple-icon-114x114.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-114x114.png
rename to src/assets/apple-icon-114x114.png
diff --git a/src/kitaab-public/asset/apple-icon-120x120.png b/src/assets/apple-icon-120x120.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-120x120.png
rename to src/assets/apple-icon-120x120.png
diff --git a/src/kitaab-public/asset/apple-icon-144x144.png b/src/assets/apple-icon-144x144.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-144x144.png
rename to src/assets/apple-icon-144x144.png
diff --git a/src/kitaab-public/asset/apple-icon-152x152.png b/src/assets/apple-icon-152x152.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-152x152.png
rename to src/assets/apple-icon-152x152.png
diff --git a/src/kitaab-public/asset/apple-icon-180x180.png b/src/assets/apple-icon-180x180.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-180x180.png
rename to src/assets/apple-icon-180x180.png
diff --git a/src/kitaab-public/asset/apple-icon-57x57.png b/src/assets/apple-icon-57x57.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-57x57.png
rename to src/assets/apple-icon-57x57.png
diff --git a/src/kitaab-public/asset/apple-icon-60x60.png b/src/assets/apple-icon-60x60.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-60x60.png
rename to src/assets/apple-icon-60x60.png
diff --git a/src/kitaab-public/asset/apple-icon-72x72.png b/src/assets/apple-icon-72x72.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-72x72.png
rename to src/assets/apple-icon-72x72.png
diff --git a/src/kitaab-public/asset/apple-icon-76x76.png b/src/assets/apple-icon-76x76.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-76x76.png
rename to src/assets/apple-icon-76x76.png
diff --git a/src/kitaab-public/asset/apple-icon-precomposed.png b/src/assets/apple-icon-precomposed.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon-precomposed.png
rename to src/assets/apple-icon-precomposed.png
diff --git a/src/kitaab-public/asset/apple-icon.png b/src/assets/apple-icon.png
similarity index 100%
rename from src/kitaab-public/asset/apple-icon.png
rename to src/assets/apple-icon.png
diff --git a/src/kitaab-public/asset/favicon-16x16.png b/src/assets/favicon-16x16.png
similarity index 100%
rename from src/kitaab-public/asset/favicon-16x16.png
rename to src/assets/favicon-16x16.png
diff --git a/src/kitaab-public/asset/favicon-32x32.png b/src/assets/favicon-32x32.png
similarity index 100%
rename from src/kitaab-public/asset/favicon-32x32.png
rename to src/assets/favicon-32x32.png
diff --git a/src/kitaab-public/asset/favicon-96x96.png b/src/assets/favicon-96x96.png
similarity index 100%
rename from src/kitaab-public/asset/favicon-96x96.png
rename to src/assets/favicon-96x96.png
diff --git a/src/kitaab-public/asset/favicon.ico b/src/assets/favicon.ico
similarity index 100%
rename from src/kitaab-public/asset/favicon.ico
rename to src/assets/favicon.ico
diff --git a/src/kitaab-public/asset/header.css b/src/assets/header.css
similarity index 100%
rename from src/kitaab-public/asset/header.css
rename to src/assets/header.css
diff --git a/src/kitaab-public/asset/main.css b/src/assets/main.css
similarity index 100%
rename from src/kitaab-public/asset/main.css
rename to src/assets/main.css
diff --git a/src/kitaab-public/asset/ms-icon-144x144.png b/src/assets/ms-icon-144x144.png
similarity index 100%
rename from src/kitaab-public/asset/ms-icon-144x144.png
rename to src/assets/ms-icon-144x144.png
diff --git a/src/kitaab-public/asset/ms-icon-150x150.png b/src/assets/ms-icon-150x150.png
similarity index 100%
rename from src/kitaab-public/asset/ms-icon-150x150.png
rename to src/assets/ms-icon-150x150.png
diff --git a/src/kitaab-public/asset/ms-icon-310x310.png b/src/assets/ms-icon-310x310.png
similarity index 100%
rename from src/kitaab-public/asset/ms-icon-310x310.png
rename to src/assets/ms-icon-310x310.png
diff --git a/src/kitaab-public/asset/ms-icon-70x70.png b/src/assets/ms-icon-70x70.png
similarity index 100%
rename from src/kitaab-public/asset/ms-icon-70x70.png
rename to src/assets/ms-icon-70x70.png
diff --git a/src/kitaab-public/asset/rss.png b/src/assets/rss.png
similarity index 100%
rename from src/kitaab-public/asset/rss.png
rename to src/assets/rss.png
diff --git a/src/kitaab-public/asset/social.png b/src/assets/social.png
similarity index 100%
rename from src/kitaab-public/asset/social.png
rename to src/assets/social.png
diff --git a/src/kitaab-public/asset/style.css b/src/assets/style.css
similarity index 100%
rename from src/kitaab-public/asset/style.css
rename to src/assets/style.css
diff --git a/src/kitaab-public/build/README.md b/src/build/README.md
similarity index 100%
rename from src/kitaab-public/build/README.md
rename to src/build/README.md
diff --git a/src/kitaab-public/__init__.py b/src/build/__init__.py
similarity index 100%
rename from src/kitaab-public/__init__.py
rename to src/build/__init__.py
diff --git a/src/kitaab-public/build/build.py b/src/build/kitaab.py
similarity index 83%
rename from src/kitaab-public/build/build.py
rename to src/build/kitaab.py
index 79cfb0f..d8376bf 100644
--- a/src/kitaab-public/build/build.py
+++ b/src/build/kitaab.py
@@ -1,3 +1,5 @@
+from . import mistune
+from shared import TagHelper, config
from jinja2 import Environment, FileSystemLoader
import argparse
import glob
@@ -7,11 +9,6 @@ import platform
import re
import shutil
from datetime import datetime
-# TODO flith
-import sys
-sys.path.append("./")
-from shared import TagHelper, config
-from . import mistune
# Default encoding
encoding = 'utf-8'
@@ -32,12 +29,15 @@ build_url = config.relative_build_url
if args.prod:
build_url = config.absolute_build_url
+
def generate_config():
pass
+
def generate_page(template_file=config.template_main, options=generate_config()):
pass
+
def generate_navigation(template_nav=config.template_nav):
file_loader = FileSystemLoader('')
env = Environment(loader=file_loader)
@@ -47,6 +47,7 @@ def generate_navigation(template_nav=config.template_nav):
output = template.render(index_urls=[f.split(".")[0] for f in index_tags])
return output
+
def add_file_path(pages, root_dir):
ret = set()
for page in pages:
@@ -64,18 +65,21 @@ def generate_index_pages(template=config.template_main, template_nav=config.temp
pages = add_file_path(pages, config.content_folder[0])
entries = create_entries(pages)
# TODO this broke as well, not sure what happened to entries, but the whole page is blank?
- subPages = generate_sub_pages(entries, len(entries), config.content_folder[0], False)
+ subPages = generate_sub_pages(entries, len(
+ entries), config.content_folder[0], False)
# Build the files by filling out the template
file_loader = FileSystemLoader('')
env = Environment(loader=file_loader)
# regular index pagse use main template
template = env.get_template(template)
- current_index_template = template.render(page_body=subPages, page_date=None, page_tags=None, page_navigation=generate_navigation(template_nav), page_title=index.capitalize() + ' index', config=config)
+ current_index_template = template.render(page_body=subPages, page_date=None, page_tags=None, page_navigation=generate_navigation(
+ template_nav), page_title=index.capitalize() + ' index', config=config)
slugfile = config.build_folder + index + '_index.html'
with open(slugfile, 'w', encoding=encoding) as fobj:
fobj.write(current_index_template)
generate_table_index()
+
def generate_table_index(template=config.template_index, template_nav=config.template_nav):
# build the metaIndex page
# This function creates the tag_index.html page
@@ -87,11 +91,12 @@ def generate_table_index(template=config.template_index, template_nav=config.tem
for k, v in all_tags.items():
parsed_set[k] = len(v)
current_index_template = template.render(index_urls=parsed_set,
- page_date=None,
- page_tags=None,
- page_navigation=generate_navigation(template_nav),
- page_title='Piles',
- config=config)
+ page_date=None,
+ page_tags=None,
+ page_navigation=generate_navigation(
+ template_nav),
+ page_title='Piles',
+ config=config)
slugfile = config.build_folder + 'tag_index.html'
with open(slugfile, 'w', encoding=encoding) as fobj:
fobj.write(current_index_template)
@@ -102,7 +107,7 @@ def generate_html_pages(site_folder, entries, template, sub_pages_list, template
for entry in entries:
# Creating navigation
nav_html = generate_navigation(template_nav)
- # Replaces all occurrences of build_url in the template
+ # Replaces all occurrences of build_url in the template
# (assets, urls, etc)
file_loader = FileSystemLoader('')
@@ -110,7 +115,8 @@ def generate_html_pages(site_folder, entries, template, sub_pages_list, template
template = env.get_template(template)
if len(entry['tags']) > 1:
entry['tags'] = entry['tags'].split(' ')
- page_template = template.render(page_body=entry['pageContent'], page_date="%s"%entry['date'], page_tags=entry['tags'], name_of_site="Kitaab", page_navigation=nav_html, page_title=entry['title'], build_url=entry['parent_text'], config=config)
+ page_template = template.render(page_body=entry['pageContent'], page_date="%s" % entry['date'], page_tags=entry['tags'],
+ name_of_site="Kitaab", page_navigation=nav_html, page_title=entry['title'], build_url=entry['parent_text'], config=config)
# Checking if content folder exists
folderExists = os.path.exists(site_folder+entry['folder'])
@@ -137,9 +143,10 @@ def get_entry_title(page):
textContent = textContent[0]
textContent = textContent.replace('# ', '')
if '%title' in textContent:
- textContent = textContent.replace('%title','')
+ textContent = textContent.replace('%title', '')
else:
- textContent = page.split('/')[1][:-5] # remove .wiki from the end of the file name
+ # remove .wiki from the end of the file name
+ textContent = page.split('/')[1][:-5]
except FileNotFoundError:
#print(f"Page not found, but present in tags: {page}")
return None
@@ -172,6 +179,8 @@ def style_iframes(page):
return page
# Get a list of the tags in the page
+
+
def get_tags(page):
regex = r":[a-zA-Z:]*:"
matches = re.finditer(regex, page, re.MULTILINE)
@@ -209,6 +218,7 @@ def fix_amp(page):
print(f"{page} is not a string")
return ""
+
def fix_wiki_links(page, path):
regex = r"\[\[([\s\S]+?\|?[\s\S]+?)\]\]"
matches = re.finditer(regex, page, re.MULTILINE)
@@ -217,15 +227,22 @@ def fix_wiki_links(page, path):
captured_group = match.group(groupNum + 1)
link_elem = captured_group.split("|")
if len(link_elem) > 1:
- full_url = "" + link_elem[1].strip() + ""
+ full_url = "" + \
+ link_elem[1].strip() + ""
else:
if config.flat_build:
- full_url = "" + link_elem[0].strip() + ""
+ full_url = "" + \
+ link_elem[0].strip() + ""
else:
- full_url = "" + link_elem[0].strip() + ""
+ full_url = "" + \
+ link_elem[0].strip() + ""
page = page.replace(match[0], full_url)
return page
+
def remove_tags(page):
try:
regex = r":[a-zA-Z:]*:"
@@ -235,6 +252,7 @@ def remove_tags(page):
print(f'Unexpected error in removing tags in {page}')
return page
+
def remove_title(page):
try:
textContent = page.splitlines()
@@ -247,6 +265,7 @@ def remove_title(page):
print(f'Unexpected error in removing title in {page}')
return page
+
def remove_date(page):
try:
regex = r"%date [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}"
@@ -269,7 +288,7 @@ def replacement_function(replace):
lines = lines[-2:]
line1 = lines[0].split(',')
line2 = lines[1].split(',')
- line1len = len(line1)
+ line1len = len(line1)
line2len = len(line2)
first = line1[random.randrange(line1len)]
second = line2[random.randrange(line2len)]
@@ -277,12 +296,12 @@ def replacement_function(replace):
def replace_generated(page):
- #try:
- page = re.sub(r'@<[A-Za-z- ]*>',
- replacement_function,
- page)
+ # try:
+ page = re.sub(r'@<[A-Za-z- ]*>',
+ replacement_function,
+ page)
return page
- #except Exception as e:
+ # except Exception as e:
# print(e)
# print(f"Could not replace generated in {page}")
# return page
@@ -294,20 +313,23 @@ def get_date(page):
match = re.findall(regex, page)[0].strip('%date')
return match
except:
- #print(f"Could not parse date")
+ # print(f"Could not parse date")
return None
+
def parse_headings(page):
try:
page = re.sub(r'= [\[\]a-zA-Z0-9:|+& ]* =',
- lambda x: x.group().replace('=','###', 1).strip('='),
- page)
+ lambda x: x.group().replace('=', '###', 1).strip('='),
+ page)
return page
except Exception as e:
print(f"Could not parse headers {e}")
return page
# From the list of files, creates the main array of entries that will be processed later
+
+
def create_entries(pages):
fullContent = []
noTitle = []
@@ -327,7 +349,7 @@ def create_entries(pages):
markdown_text = style_iframes(markdown_text)
markdown_text = fix_images_urls(markdown_text)
markdown_text = fix_wiki_links(markdown_text, path["folder"])
- tags = get_tags(markdown_text)
+ tags = get_tags(markdown_text)
date = get_date(markdown_text)
markdown_text = remove_tags(markdown_text)
markdown_text = remove_title(markdown_text)
@@ -374,10 +396,10 @@ def clean_path(path):
items = path_clean.split('\\')
else:
items = path_clean.split('/')
-
+
path_items = {
- "slug" : None,
- "date" : None,
+ "slug": None,
+ "date": None,
"folder": items[0],
"file": items[1]
}
@@ -394,24 +416,27 @@ def clean_path(path):
has_date = True
else:
pass
- #print(f"{path} does not have a date")
+ # print(f"{path} does not have a date")
if has_date:
if match[0] != path_items["file"]:
path_items["date"] = match[0]
- path_items["slug"] = path_items["file"].replace(match[0] + "-", "") + ".html"
+ path_items["slug"] = path_items["file"].replace(
+ match[0] + "-", "") + ".html"
else:
path_items["date"] = match[0]
path_items["slug"] = path_items["file"] + ".html"
# Converts the EU date to US date to allow page sorting
if config.date_format == "EU":
- path_items["iso_date"] = str(datetime.strptime(path_items["date"], '%y%m%d-%H%M'))
+ path_items["iso_date"] = str(
+ datetime.strptime(path_items["date"], '%y%m%d-%H%M'))
if config.date_format == "ISO":
- path_items["iso_date"] = str(datetime.strptime(path_items["date"], '%Y-%m-%d'))
+ path_items["iso_date"] = str(
+ datetime.strptime(path_items["date"], '%Y-%m-%d'))
else:
path_items["slug"] = path_items["file"] + ".html"
- #last_edit = str(subprocess.check_output('git log -1 --format="%ci" ' + path, shell=True)).replace("b'", "").replace("\\n'", '')
+ # last_edit = str(subprocess.check_output('git log -1 --format="%ci" ' + path, shell=True)).replace("b'", "").replace("\\n'", '')
# get last edited time from system
try:
last_edit = os.path.getmtime('/home/anish/'+path)
@@ -439,11 +464,12 @@ def clean_path(path):
else:
if config.flat_build:
path_items["parent_url"] = path_items["folder"] + ".html"
- path_items["parent_text"] = path_items["folder"].replace("-", " ").capitalize()
+ path_items["parent_text"] = path_items["folder"].replace(
+ "-", " ").capitalize()
else:
path_items["parent_url"] = path_items["folder"]
- path_items["parent_text"] = path_items["folder"].replace("-", " ").capitalize()
-
+ path_items["parent_text"] = path_items["folder"].replace(
+ "-", " ").capitalize()
return path_items
@@ -457,8 +483,10 @@ def generate_sub_pages(entries, num, folder, title, title_name=""):
# Create the list
file_loader = FileSystemLoader('')
env = Environment(loader=file_loader)
- template = env.get_template(config.template_list) # TODO maybe not hardcode
- sub_page_list = template.render(entries=selected_entries, title_name=title_name, title=title)
+ # TODO maybe not hardcode
+ template = env.get_template(config.template_list)
+ sub_page_list = template.render(
+ entries=selected_entries, title_name=title_name, title=title)
return sub_page_list
@@ -531,8 +559,9 @@ def generate_website():
# Get main html template
file_loader = FileSystemLoader('')
env = Environment(loader=file_loader)
- home_page = env.get_template(config.template_main) # TODO maybe not hardcode
- #home_page = create_home_page(template, config.build_folder)
+ home_page = env.get_template(
+ config.template_main) # TODO maybe not hardcode
+ # home_page = create_home_page(template, config.build_folder)
generate_index_pages(config.template_main, config.template_nav)
@@ -544,11 +573,12 @@ def generate_website():
sub_pages_list = generate_sub_pages(
entries, len(entries), folder, False)
- # For each section, create a short listing of sub pages and add it to the home page
+ # For each section, create a short listing of sub pages
+ # and add it to the home page
home_pageSubList = generate_sub_pages(entries, 50, folder, False)
- #home_page = home_page.replace('content_list', home_pageSubList +
+ # home_page = home_page.replace('content_list', home_pageSubList +
# "content_list")
- #home_page = home_page.replace('page_date', "")
+ # home_page = home_page.replace('page_date', "")
generate_html_pages(config.build_folder, entries, config.template_main,
sub_pages_list, config.template_nav)
@@ -556,19 +586,20 @@ def generate_website():
for entry in entries:
rss_entries.append(entry)
- # Move the assets
+ # Move the assets
move_files(config.build_folder, config.assets_folder)
move_files(config.build_folder, config.medias_folder)
# Once all sections have been processed, finish the home page
# Removes the "content_list" in the partial
- #home_page = home_page.replace('content_list', "")
- #home_page = home_page.replace('name_of_site', config.name_of_site)
- #home_page = home_page.replace('site_meta_description',
+ # home_page = home_page.replace('content_list', "")
+ # home_page = home_page.replace('name_of_site', config.name_of_site)
+ # home_page = home_page.replace('site_meta_description',
# config.site_meta_description)
- #home_page = home_page.replace(
+ # home_page = home_page.replace(
# 'twitter_name', config.twitter_name)
- home_page = home_page.render(page_body=home_pageSubList, page_date=None, page_tags=None, page_navigation=generate_navigation(), page_title="Recent Files", config=config)
+ home_page = home_page.render(page_body=home_pageSubList, page_date=None, page_tags=None,
+ page_navigation=generate_navigation(), page_title="Recent Files", config=config)
slug_file = config.build_folder + "recents.html"
with open(slug_file, 'w', encoding=encoding) as fobj:
diff --git a/src/kitaab-public/build/mistune.py b/src/build/mistune.py
similarity index 100%
rename from src/kitaab-public/build/mistune.py
rename to src/build/mistune.py
diff --git a/src/kitaab-public/partial/index_table.html b/src/build/partial/index_table.html
similarity index 100%
rename from src/kitaab-public/partial/index_table.html
rename to src/build/partial/index_table.html
diff --git a/src/kitaab-public/partial/item.xml b/src/build/partial/item.xml
similarity index 100%
rename from src/kitaab-public/partial/item.xml
rename to src/build/partial/item.xml
diff --git a/src/kitaab-public/partial/list.html b/src/build/partial/list.html
similarity index 100%
rename from src/kitaab-public/partial/list.html
rename to src/build/partial/list.html
diff --git a/src/kitaab-public/partial/main.html b/src/build/partial/main.html
similarity index 100%
rename from src/kitaab-public/partial/main.html
rename to src/build/partial/main.html
diff --git a/src/kitaab-public/partial/nav.html b/src/build/partial/nav.html
similarity index 100%
rename from src/kitaab-public/partial/nav.html
rename to src/build/partial/nav.html
diff --git a/src/kitaab-public/partial/rss.xml b/src/build/partial/rss.xml
similarity index 100%
rename from src/kitaab-public/partial/rss.xml
rename to src/build/partial/rss.xml
diff --git a/src/kitaab-public/build/__init__.py b/src/grab/__init__.py
similarity index 100%
rename from src/kitaab-public/build/__init__.py
rename to src/grab/__init__.py
diff --git a/src/kitaab-public/grab/convert.py b/src/grab/convert.py
similarity index 100%
rename from src/kitaab-public/grab/convert.py
rename to src/grab/convert.py
diff --git a/src/kitaab-public/grab/makePublic.py b/src/grab/kitaab.py
similarity index 63%
rename from src/kitaab-public/grab/makePublic.py
rename to src/grab/kitaab.py
index 9879f5a..d12f2e8 100644
--- a/src/kitaab-public/grab/makePublic.py
+++ b/src/grab/kitaab.py
@@ -6,15 +6,11 @@
# 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
+from shared import TagHelper, config, helpers
from os import listdir, mkdir, path, remove
import shutil
-import random
-import json
from . import convert
import os
-import sys
-sys.path.append("../")
# TODO: generalize based on headings(?) in index.wiki
@@ -23,22 +19,7 @@ censor = privateList
filter = ["dream", "gratitude", "review", "jrnl", "work", "job", "debt",
"people", "priv", "threatdefence", "info"]
# TODO create = ...
-
-
-def loadNetwork(path='network.json'):
- # Loads the network.json file
- with open(path, 'r') as f:
- everything = json.load(f)
- return everything
-
-
-def setNetwork(everything):
- # Everything is loaded from the network.json file
- # keys = set(everything.network())
- network = ""
- values = set(everything.values())
- everything = network + values
- return everything
+outputBasePath = config.raw_folder
def filterFiles(AllFileList):
@@ -53,43 +34,6 @@ def filterFiles(AllFileList):
return AllFileList - doNotTakeFiles
-def untaggedFiles(AllFileList=TagHelper.getAllFiles()):
- toFilter = filter + censor
- tagList = TagHelper.getAllTags()
- doNotTakeFiles = set()
- for mask in toFilter:
- try:
- doNotTakeFiles.update(tagList[mask])
- except KeyError:
- print("Key not found: {}".format(mask))
- return set.difference(AllFileList, doNotTakeFiles)
-
-
-def censorNetwork(network):
- # Takes network as a set
- for c in censor:
- if c in network:
- network.add(generateBlocks(len(c) + random.randint(0, 5)))
- network.remove(c)
- return network
-
-
-def generateBlocks(size=1):
- # Generates a length size unicode string that is formed from blocks
- charList = ['▐', '░', '▒', '▓', '▔', '▕', '▖▗',
- '▘▙', '▚', '▛', '▜', '▝', '▞', '▟']
- ret = ""
- while size > 0:
- size = size - 1
- rand = random.randint(0, 13)
- ret = ret + charList[rand]
- return ret
-
-
-def createIndexNode(network):
- pass
-
-
def copyFiles(fileList):
baseFilePath = '/home/anish/vimwiki/'
outputFilePath = '../raw/' # TODO relative path....
@@ -105,7 +49,7 @@ def copyFiles(fileList):
outputFilePath+f))
-def censorFiles(outputBasePath='../raw/'):
+def censorFiles(outputBasePath=outputBasePath):
for fileName in listdir(outputBasePath):
if not path.isfile(outputBasePath + fileName):
continue
@@ -114,14 +58,14 @@ def censorFiles(outputBasePath='../raw/'):
with open(fileName, 'r', errors='ignore') as f:
for line in f.readlines():
for c in censor:
- line = line.replace(c, generateBlocks(len(c)))
+ line = line.replace(c, helpers.generateBlocks(len(c)))
newFile = newFile + line
with open(fileName, 'w') as f:
for line in newFile:
f.write(line)
-def convertFiles(outputBasePath='../raw/'):
+def convertFiles(outputBasePath=outputBasePath):
for filename in listdir(outputBasePath):
if not path.isfile(outputBasePath + filename):
continue
diff --git a/src/kitaab-public/grab/network-builder.py b/src/grab/network-builder.py
similarity index 100%
rename from src/kitaab-public/grab/network-builder.py
rename to src/grab/network-builder.py
diff --git a/src/grab/network.py b/src/grab/network.py
new file mode 100644
index 0000000..e3d8e4b
--- /dev/null
+++ b/src/grab/network.py
@@ -0,0 +1,35 @@
+import json
+import random
+from shared import helpers
+from shared.censor import privateList
+
+censor = privateList
+
+
+def loadNetwork(path='network.json'):
+ # Loads the network.json file
+ with open(path, 'r') as f:
+ everything = json.load(f)
+ return everything
+
+
+def setNetwork(everything):
+ # Everything is loaded from the network.json file
+ # keys = set(everything.network())
+ network = ""
+ values = set(everything.values())
+ everything = network + values
+ return everything
+
+
+def censorNetwork(network):
+ # Takes network as a set
+ for c in censor:
+ if c in network:
+ network.add(helpers.generateBlocks(len(c) + random.randint(0, 5)))
+ network.remove(c)
+ return network
+
+
+def createIndexNode(network):
+ pass
diff --git a/src/kitaab-public/grab/tree.py b/src/grab/tree.py
similarity index 100%
rename from src/kitaab-public/grab/tree.py
rename to src/grab/tree.py
diff --git a/src/kitaab-public/.gitignore b/src/kitaab-public/.gitignore
deleted file mode 100644
index d920cb8..0000000
--- a/src/kitaab-public/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-output/
-media/big-self.jpg
diff --git a/src/kitaab-public/build/config.py b/src/kitaab-public/build/config.py
deleted file mode 100644
index 2ef5493..0000000
--- a/src/kitaab-public/build/config.py
+++ /dev/null
@@ -1,22 +0,0 @@
-content_folder = ['raw']
-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
-build_folder = "output/"
-assets_folder = "asset/"
-medias_folder = "media/"
-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"
-home_name = "Home"
-see_all = "See more"
-go_back = "Go back to"
-date_format = "EU" # Choose between EU day-month-year or ISO year-mont-day
-flat_build = True # True or False, if True, all files will be written in the root of the website
diff --git a/src/kitaab-public/shared/__init__.py b/src/kitaab-public/shared/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/kitaab-public/shared/config.py b/src/kitaab-public/shared/config.py
deleted file mode 100644
index b4c7006..0000000
--- a/src/kitaab-public/shared/config.py
+++ /dev/null
@@ -1,23 +0,0 @@
-content_folder = ['raw']
-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
-build_folder = "output/"
-assets_folder = "asset/"
-medias_folder = "media/"
-raw_folder = "raw/"
-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"
-home_name = "Home"
-see_all = "See more"
-go_back = "Go back to"
-date_format = "EU" # Choose between EU day-month-year or ISO year-mont-day
-flat_build = True # True or False, if True, all files will be written in the root of the website
diff --git a/src/kitaab-public/main.py b/src/main.py
similarity index 100%
rename from src/kitaab-public/main.py
rename to src/main.py
diff --git a/src/kitaab-public/media/2c5030bc48b4bfa9.jpeg b/src/media/2c5030bc48b4bfa9.jpeg
similarity index 100%
rename from src/kitaab-public/media/2c5030bc48b4bfa9.jpeg
rename to src/media/2c5030bc48b4bfa9.jpeg
diff --git a/src/media/big-self.jpg b/src/media/big-self.jpg
new file mode 100644
index 0000000..e656645
Binary files /dev/null and b/src/media/big-self.jpg differ
diff --git a/src/kitaab-public/media/blue-man.png b/src/media/blue-man.png
similarity index 100%
rename from src/kitaab-public/media/blue-man.png
rename to src/media/blue-man.png
diff --git a/src/kitaab-public/media/chihiro.jpg b/src/media/chihiro.jpg
similarity index 100%
rename from src/kitaab-public/media/chihiro.jpg
rename to src/media/chihiro.jpg
diff --git a/src/kitaab-public/media/chisai_square.png b/src/media/chisai_square.png
similarity index 100%
rename from src/kitaab-public/media/chisai_square.png
rename to src/media/chisai_square.png
diff --git a/src/kitaab-public/media/city.jpeg b/src/media/city.jpeg
similarity index 100%
rename from src/kitaab-public/media/city.jpeg
rename to src/media/city.jpeg
diff --git a/src/kitaab-public/media/kaguya.jpg b/src/media/kaguya.jpg
similarity index 100%
rename from src/kitaab-public/media/kaguya.jpg
rename to src/media/kaguya.jpg
diff --git a/src/kitaab-public/media/lady.jpeg b/src/media/lady.jpeg
similarity index 100%
rename from src/kitaab-public/media/lady.jpeg
rename to src/media/lady.jpeg
diff --git a/src/kitaab-public/media/self.jpg b/src/media/self.jpg
similarity index 100%
rename from src/kitaab-public/media/self.jpg
rename to src/media/self.jpg
diff --git a/src/kitaab-public/raw/1ProjectAMonth.wiki b/src/raw/1ProjectAMonth.wiki
similarity index 100%
rename from src/kitaab-public/raw/1ProjectAMonth.wiki
rename to src/raw/1ProjectAMonth.wiki
diff --git a/src/kitaab-public/raw/1thingaday.wiki b/src/raw/1thingaday.wiki
similarity index 100%
rename from src/kitaab-public/raw/1thingaday.wiki
rename to src/raw/1thingaday.wiki
diff --git a/src/kitaab-public/raw/200921-1454.wiki b/src/raw/200921-1454.wiki
similarity index 100%
rename from src/kitaab-public/raw/200921-1454.wiki
rename to src/raw/200921-1454.wiki
diff --git a/src/kitaab-public/raw/200921-1454a.wiki b/src/raw/200921-1454a.wiki
similarity index 100%
rename from src/kitaab-public/raw/200921-1454a.wiki
rename to src/raw/200921-1454a.wiki
diff --git a/src/kitaab-public/raw/200926-2245.wiki b/src/raw/200926-2245.wiki
similarity index 100%
rename from src/kitaab-public/raw/200926-2245.wiki
rename to src/raw/200926-2245.wiki
diff --git a/src/kitaab-public/raw/200927-0010.wiki b/src/raw/200927-0010.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-0010.wiki
rename to src/raw/200927-0010.wiki
diff --git a/src/kitaab-public/raw/200927-0028.wiki b/src/raw/200927-0028.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-0028.wiki
rename to src/raw/200927-0028.wiki
diff --git a/src/kitaab-public/raw/200927-0111.wiki b/src/raw/200927-0111.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-0111.wiki
rename to src/raw/200927-0111.wiki
diff --git a/src/kitaab-public/raw/200927-0149.wiki b/src/raw/200927-0149.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-0149.wiki
rename to src/raw/200927-0149.wiki
diff --git a/src/kitaab-public/raw/200927-0158.wiki b/src/raw/200927-0158.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-0158.wiki
rename to src/raw/200927-0158.wiki
diff --git a/src/kitaab-public/raw/200927-1627.wiki b/src/raw/200927-1627.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-1627.wiki
rename to src/raw/200927-1627.wiki
diff --git a/src/kitaab-public/raw/200927-1651.wiki b/src/raw/200927-1651.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-1651.wiki
rename to src/raw/200927-1651.wiki
diff --git a/src/kitaab-public/raw/200927-1730.wiki b/src/raw/200927-1730.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-1730.wiki
rename to src/raw/200927-1730.wiki
diff --git a/src/kitaab-public/raw/200927-1936.wiki b/src/raw/200927-1936.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-1936.wiki
rename to src/raw/200927-1936.wiki
diff --git a/src/kitaab-public/raw/200927-2151.wiki b/src/raw/200927-2151.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-2151.wiki
rename to src/raw/200927-2151.wiki
diff --git a/src/kitaab-public/raw/200927-2157.wiki b/src/raw/200927-2157.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-2157.wiki
rename to src/raw/200927-2157.wiki
diff --git a/src/kitaab-public/raw/200927-2244.wiki b/src/raw/200927-2244.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-2244.wiki
rename to src/raw/200927-2244.wiki
diff --git a/src/kitaab-public/raw/200927-2247.wiki b/src/raw/200927-2247.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-2247.wiki
rename to src/raw/200927-2247.wiki
diff --git a/src/kitaab-public/raw/200927-2247a.wiki b/src/raw/200927-2247a.wiki
similarity index 100%
rename from src/kitaab-public/raw/200927-2247a.wiki
rename to src/raw/200927-2247a.wiki
diff --git a/src/kitaab-public/raw/200928-0048.wiki b/src/raw/200928-0048.wiki
similarity index 100%
rename from src/kitaab-public/raw/200928-0048.wiki
rename to src/raw/200928-0048.wiki
diff --git a/src/kitaab-public/raw/200928-0059.wiki b/src/raw/200928-0059.wiki
similarity index 100%
rename from src/kitaab-public/raw/200928-0059.wiki
rename to src/raw/200928-0059.wiki
diff --git a/src/kitaab-public/raw/200928-1351.wiki b/src/raw/200928-1351.wiki
similarity index 100%
rename from src/kitaab-public/raw/200928-1351.wiki
rename to src/raw/200928-1351.wiki
diff --git a/src/kitaab-public/raw/200929-2026.wiki b/src/raw/200929-2026.wiki
similarity index 100%
rename from src/kitaab-public/raw/200929-2026.wiki
rename to src/raw/200929-2026.wiki
diff --git a/src/kitaab-public/raw/200930-1921.wiki b/src/raw/200930-1921.wiki
similarity index 100%
rename from src/kitaab-public/raw/200930-1921.wiki
rename to src/raw/200930-1921.wiki
diff --git a/src/kitaab-public/raw/200930-2316.wiki b/src/raw/200930-2316.wiki
similarity index 100%
rename from src/kitaab-public/raw/200930-2316.wiki
rename to src/raw/200930-2316.wiki
diff --git a/src/kitaab-public/raw/200930-2317.wiki b/src/raw/200930-2317.wiki
similarity index 100%
rename from src/kitaab-public/raw/200930-2317.wiki
rename to src/raw/200930-2317.wiki
diff --git a/src/kitaab-public/raw/200930-2319.wiki b/src/raw/200930-2319.wiki
similarity index 100%
rename from src/kitaab-public/raw/200930-2319.wiki
rename to src/raw/200930-2319.wiki
diff --git a/src/kitaab-public/raw/201001-1906.wiki b/src/raw/201001-1906.wiki
similarity index 100%
rename from src/kitaab-public/raw/201001-1906.wiki
rename to src/raw/201001-1906.wiki
diff --git a/src/kitaab-public/raw/201001-1949.wiki b/src/raw/201001-1949.wiki
similarity index 100%
rename from src/kitaab-public/raw/201001-1949.wiki
rename to src/raw/201001-1949.wiki
diff --git a/src/kitaab-public/raw/201003-1607.wiki b/src/raw/201003-1607.wiki
similarity index 100%
rename from src/kitaab-public/raw/201003-1607.wiki
rename to src/raw/201003-1607.wiki
diff --git a/src/kitaab-public/raw/201006-2310.wiki b/src/raw/201006-2310.wiki
similarity index 100%
rename from src/kitaab-public/raw/201006-2310.wiki
rename to src/raw/201006-2310.wiki
diff --git a/src/kitaab-public/raw/201013-0546.wiki b/src/raw/201013-0546.wiki
similarity index 100%
rename from src/kitaab-public/raw/201013-0546.wiki
rename to src/raw/201013-0546.wiki
diff --git a/src/kitaab-public/raw/201013-2143.wiki b/src/raw/201013-2143.wiki
similarity index 100%
rename from src/kitaab-public/raw/201013-2143.wiki
rename to src/raw/201013-2143.wiki
diff --git a/src/kitaab-public/raw/201013-2144.wiki b/src/raw/201013-2144.wiki
similarity index 100%
rename from src/kitaab-public/raw/201013-2144.wiki
rename to src/raw/201013-2144.wiki
diff --git a/src/kitaab-public/raw/201013-2206.wiki b/src/raw/201013-2206.wiki
similarity index 100%
rename from src/kitaab-public/raw/201013-2206.wiki
rename to src/raw/201013-2206.wiki
diff --git a/src/kitaab-public/raw/201013-2207.wiki b/src/raw/201013-2207.wiki
similarity index 100%
rename from src/kitaab-public/raw/201013-2207.wiki
rename to src/raw/201013-2207.wiki
diff --git a/src/kitaab-public/raw/201015-2222.wiki b/src/raw/201015-2222.wiki
similarity index 100%
rename from src/kitaab-public/raw/201015-2222.wiki
rename to src/raw/201015-2222.wiki
diff --git a/src/kitaab-public/raw/201015-2226.wiki b/src/raw/201015-2226.wiki
similarity index 100%
rename from src/kitaab-public/raw/201015-2226.wiki
rename to src/raw/201015-2226.wiki
diff --git a/src/kitaab-public/raw/201015-2229.wiki b/src/raw/201015-2229.wiki
similarity index 100%
rename from src/kitaab-public/raw/201015-2229.wiki
rename to src/raw/201015-2229.wiki
diff --git a/src/kitaab-public/raw/201015-2233.wiki b/src/raw/201015-2233.wiki
similarity index 100%
rename from src/kitaab-public/raw/201015-2233.wiki
rename to src/raw/201015-2233.wiki
diff --git a/src/kitaab-public/raw/201015-2306.wiki b/src/raw/201015-2306.wiki
similarity index 100%
rename from src/kitaab-public/raw/201015-2306.wiki
rename to src/raw/201015-2306.wiki
diff --git a/src/kitaab-public/raw/201015-2306a.wiki b/src/raw/201015-2306a.wiki
similarity index 100%
rename from src/kitaab-public/raw/201015-2306a.wiki
rename to src/raw/201015-2306a.wiki
diff --git a/src/kitaab-public/raw/201015-2313.wiki b/src/raw/201015-2313.wiki
similarity index 100%
rename from src/kitaab-public/raw/201015-2313.wiki
rename to src/raw/201015-2313.wiki
diff --git a/src/kitaab-public/raw/201017-1546.wiki b/src/raw/201017-1546.wiki
similarity index 100%
rename from src/kitaab-public/raw/201017-1546.wiki
rename to src/raw/201017-1546.wiki
diff --git a/src/kitaab-public/raw/201018-2128.wiki b/src/raw/201018-2128.wiki
similarity index 100%
rename from src/kitaab-public/raw/201018-2128.wiki
rename to src/raw/201018-2128.wiki
diff --git a/src/kitaab-public/raw/201018-2141.wiki b/src/raw/201018-2141.wiki
similarity index 100%
rename from src/kitaab-public/raw/201018-2141.wiki
rename to src/raw/201018-2141.wiki
diff --git a/src/kitaab-public/raw/201018-2147.wiki b/src/raw/201018-2147.wiki
similarity index 100%
rename from src/kitaab-public/raw/201018-2147.wiki
rename to src/raw/201018-2147.wiki
diff --git a/src/kitaab-public/raw/201018-2232.wiki b/src/raw/201018-2232.wiki
similarity index 100%
rename from src/kitaab-public/raw/201018-2232.wiki
rename to src/raw/201018-2232.wiki
diff --git a/src/kitaab-public/raw/201018-2304.wiki b/src/raw/201018-2304.wiki
similarity index 100%
rename from src/kitaab-public/raw/201018-2304.wiki
rename to src/raw/201018-2304.wiki
diff --git a/src/kitaab-public/raw/201019-1905.wiki b/src/raw/201019-1905.wiki
similarity index 100%
rename from src/kitaab-public/raw/201019-1905.wiki
rename to src/raw/201019-1905.wiki
diff --git a/src/kitaab-public/raw/201019-2020.wiki b/src/raw/201019-2020.wiki
similarity index 100%
rename from src/kitaab-public/raw/201019-2020.wiki
rename to src/raw/201019-2020.wiki
diff --git a/src/kitaab-public/raw/201019-2038.wiki b/src/raw/201019-2038.wiki
similarity index 100%
rename from src/kitaab-public/raw/201019-2038.wiki
rename to src/raw/201019-2038.wiki
diff --git a/src/kitaab-public/raw/201019-2220.wiki b/src/raw/201019-2220.wiki
similarity index 100%
rename from src/kitaab-public/raw/201019-2220.wiki
rename to src/raw/201019-2220.wiki
diff --git a/src/kitaab-public/raw/201019-2221.wiki b/src/raw/201019-2221.wiki
similarity index 100%
rename from src/kitaab-public/raw/201019-2221.wiki
rename to src/raw/201019-2221.wiki
diff --git a/src/kitaab-public/raw/201020-1926.wiki b/src/raw/201020-1926.wiki
similarity index 100%
rename from src/kitaab-public/raw/201020-1926.wiki
rename to src/raw/201020-1926.wiki
diff --git a/src/kitaab-public/raw/201021-2043.wiki b/src/raw/201021-2043.wiki
similarity index 100%
rename from src/kitaab-public/raw/201021-2043.wiki
rename to src/raw/201021-2043.wiki
diff --git a/src/kitaab-public/raw/201021-2102.wiki b/src/raw/201021-2102.wiki
similarity index 100%
rename from src/kitaab-public/raw/201021-2102.wiki
rename to src/raw/201021-2102.wiki
diff --git a/src/kitaab-public/raw/201021-2233.wiki b/src/raw/201021-2233.wiki
similarity index 100%
rename from src/kitaab-public/raw/201021-2233.wiki
rename to src/raw/201021-2233.wiki
diff --git a/src/kitaab-public/raw/201025-2352.wiki b/src/raw/201025-2352.wiki
similarity index 100%
rename from src/kitaab-public/raw/201025-2352.wiki
rename to src/raw/201025-2352.wiki
diff --git a/src/kitaab-public/raw/201031-0042.wiki b/src/raw/201031-0042.wiki
similarity index 100%
rename from src/kitaab-public/raw/201031-0042.wiki
rename to src/raw/201031-0042.wiki
diff --git a/src/kitaab-public/raw/201031-0114.wiki b/src/raw/201031-0114.wiki
similarity index 100%
rename from src/kitaab-public/raw/201031-0114.wiki
rename to src/raw/201031-0114.wiki
diff --git a/src/kitaab-public/raw/201103-2109.wiki b/src/raw/201103-2109.wiki
similarity index 100%
rename from src/kitaab-public/raw/201103-2109.wiki
rename to src/raw/201103-2109.wiki
diff --git a/src/kitaab-public/raw/201105-1933.wiki b/src/raw/201105-1933.wiki
similarity index 100%
rename from src/kitaab-public/raw/201105-1933.wiki
rename to src/raw/201105-1933.wiki
diff --git a/src/kitaab-public/raw/201105-1945.wiki b/src/raw/201105-1945.wiki
similarity index 100%
rename from src/kitaab-public/raw/201105-1945.wiki
rename to src/raw/201105-1945.wiki
diff --git a/src/kitaab-public/raw/201105-2043.wiki b/src/raw/201105-2043.wiki
similarity index 100%
rename from src/kitaab-public/raw/201105-2043.wiki
rename to src/raw/201105-2043.wiki
diff --git a/src/kitaab-public/raw/201105-2104.wiki b/src/raw/201105-2104.wiki
similarity index 100%
rename from src/kitaab-public/raw/201105-2104.wiki
rename to src/raw/201105-2104.wiki
diff --git a/src/kitaab-public/raw/201105-2306.wiki b/src/raw/201105-2306.wiki
similarity index 100%
rename from src/kitaab-public/raw/201105-2306.wiki
rename to src/raw/201105-2306.wiki
diff --git a/src/kitaab-public/raw/201105-2309.wiki b/src/raw/201105-2309.wiki
similarity index 100%
rename from src/kitaab-public/raw/201105-2309.wiki
rename to src/raw/201105-2309.wiki
diff --git a/src/kitaab-public/raw/201105-2316.wiki b/src/raw/201105-2316.wiki
similarity index 100%
rename from src/kitaab-public/raw/201105-2316.wiki
rename to src/raw/201105-2316.wiki
diff --git a/src/kitaab-public/raw/201105-2321.wiki b/src/raw/201105-2321.wiki
similarity index 100%
rename from src/kitaab-public/raw/201105-2321.wiki
rename to src/raw/201105-2321.wiki
diff --git a/src/kitaab-public/raw/201105-2338.wiki b/src/raw/201105-2338.wiki
similarity index 100%
rename from src/kitaab-public/raw/201105-2338.wiki
rename to src/raw/201105-2338.wiki
diff --git a/src/kitaab-public/raw/201106-0258.wiki b/src/raw/201106-0258.wiki
similarity index 100%
rename from src/kitaab-public/raw/201106-0258.wiki
rename to src/raw/201106-0258.wiki
diff --git a/src/kitaab-public/raw/201106-0311.wiki b/src/raw/201106-0311.wiki
similarity index 100%
rename from src/kitaab-public/raw/201106-0311.wiki
rename to src/raw/201106-0311.wiki
diff --git a/src/kitaab-public/raw/201108-0205.wiki b/src/raw/201108-0205.wiki
similarity index 100%
rename from src/kitaab-public/raw/201108-0205.wiki
rename to src/raw/201108-0205.wiki
diff --git a/src/kitaab-public/raw/201118-1520.wiki b/src/raw/201118-1520.wiki
similarity index 100%
rename from src/kitaab-public/raw/201118-1520.wiki
rename to src/raw/201118-1520.wiki
diff --git a/src/kitaab-public/raw/201118-1522.wiki b/src/raw/201118-1522.wiki
similarity index 100%
rename from src/kitaab-public/raw/201118-1522.wiki
rename to src/raw/201118-1522.wiki
diff --git a/src/kitaab-public/raw/201119-1157.wiki b/src/raw/201119-1157.wiki
similarity index 100%
rename from src/kitaab-public/raw/201119-1157.wiki
rename to src/raw/201119-1157.wiki
diff --git a/src/kitaab-public/raw/201121-1417.wiki b/src/raw/201121-1417.wiki
similarity index 100%
rename from src/kitaab-public/raw/201121-1417.wiki
rename to src/raw/201121-1417.wiki
diff --git a/src/kitaab-public/raw/201122-2122.wiki b/src/raw/201122-2122.wiki
similarity index 100%
rename from src/kitaab-public/raw/201122-2122.wiki
rename to src/raw/201122-2122.wiki
diff --git a/src/kitaab-public/raw/201122-2123.wiki b/src/raw/201122-2123.wiki
similarity index 100%
rename from src/kitaab-public/raw/201122-2123.wiki
rename to src/raw/201122-2123.wiki
diff --git a/src/kitaab-public/raw/201122-2142.wiki b/src/raw/201122-2142.wiki
similarity index 100%
rename from src/kitaab-public/raw/201122-2142.wiki
rename to src/raw/201122-2142.wiki
diff --git a/src/kitaab-public/raw/201128-1301.wiki b/src/raw/201128-1301.wiki
similarity index 100%
rename from src/kitaab-public/raw/201128-1301.wiki
rename to src/raw/201128-1301.wiki
diff --git a/src/kitaab-public/raw/201128-1326.wiki b/src/raw/201128-1326.wiki
similarity index 100%
rename from src/kitaab-public/raw/201128-1326.wiki
rename to src/raw/201128-1326.wiki
diff --git a/src/kitaab-public/raw/201128-1333.wiki b/src/raw/201128-1333.wiki
similarity index 100%
rename from src/kitaab-public/raw/201128-1333.wiki
rename to src/raw/201128-1333.wiki
diff --git a/src/kitaab-public/raw/201128-1333a.wiki b/src/raw/201128-1333a.wiki
similarity index 100%
rename from src/kitaab-public/raw/201128-1333a.wiki
rename to src/raw/201128-1333a.wiki
diff --git a/src/kitaab-public/raw/201128-1456.wiki b/src/raw/201128-1456.wiki
similarity index 100%
rename from src/kitaab-public/raw/201128-1456.wiki
rename to src/raw/201128-1456.wiki
diff --git a/src/kitaab-public/raw/201129-2055.wiki b/src/raw/201129-2055.wiki
similarity index 100%
rename from src/kitaab-public/raw/201129-2055.wiki
rename to src/raw/201129-2055.wiki
diff --git a/src/kitaab-public/raw/201206-2150.wiki b/src/raw/201206-2150.wiki
similarity index 100%
rename from src/kitaab-public/raw/201206-2150.wiki
rename to src/raw/201206-2150.wiki
diff --git a/src/kitaab-public/raw/201213-1641.wiki b/src/raw/201213-1641.wiki
similarity index 100%
rename from src/kitaab-public/raw/201213-1641.wiki
rename to src/raw/201213-1641.wiki
diff --git a/src/kitaab-public/raw/201215-1308.wiki b/src/raw/201215-1308.wiki
similarity index 100%
rename from src/kitaab-public/raw/201215-1308.wiki
rename to src/raw/201215-1308.wiki
diff --git a/src/kitaab-public/raw/201215-1310.wiki b/src/raw/201215-1310.wiki
similarity index 100%
rename from src/kitaab-public/raw/201215-1310.wiki
rename to src/raw/201215-1310.wiki
diff --git a/src/kitaab-public/raw/201218-1505.wiki b/src/raw/201218-1505.wiki
similarity index 100%
rename from src/kitaab-public/raw/201218-1505.wiki
rename to src/raw/201218-1505.wiki
diff --git a/src/kitaab-public/raw/201219-1825.wiki b/src/raw/201219-1825.wiki
similarity index 100%
rename from src/kitaab-public/raw/201219-1825.wiki
rename to src/raw/201219-1825.wiki
diff --git a/src/kitaab-public/raw/201219-1839.wiki b/src/raw/201219-1839.wiki
similarity index 100%
rename from src/kitaab-public/raw/201219-1839.wiki
rename to src/raw/201219-1839.wiki
diff --git a/src/kitaab-public/raw/201223-0101.wiki b/src/raw/201223-0101.wiki
similarity index 100%
rename from src/kitaab-public/raw/201223-0101.wiki
rename to src/raw/201223-0101.wiki
diff --git a/src/kitaab-public/raw/201229-1053.wiki b/src/raw/201229-1053.wiki
similarity index 100%
rename from src/kitaab-public/raw/201229-1053.wiki
rename to src/raw/201229-1053.wiki
diff --git a/src/kitaab-public/raw/2019-resolutions.wiki b/src/raw/2019-resolutions.wiki
similarity index 100%
rename from src/kitaab-public/raw/2019-resolutions.wiki
rename to src/raw/2019-resolutions.wiki
diff --git a/src/kitaab-public/raw/20201106-1540.wiki b/src/raw/20201106-1540.wiki
similarity index 100%
rename from src/kitaab-public/raw/20201106-1540.wiki
rename to src/raw/20201106-1540.wiki
diff --git a/src/kitaab-public/raw/210102-2223.wiki b/src/raw/210102-2223.wiki
similarity index 100%
rename from src/kitaab-public/raw/210102-2223.wiki
rename to src/raw/210102-2223.wiki
diff --git a/src/kitaab-public/raw/210103-2319.wiki b/src/raw/210103-2319.wiki
similarity index 100%
rename from src/kitaab-public/raw/210103-2319.wiki
rename to src/raw/210103-2319.wiki
diff --git a/src/kitaab-public/raw/210109-2114.wiki b/src/raw/210109-2114.wiki
similarity index 100%
rename from src/kitaab-public/raw/210109-2114.wiki
rename to src/raw/210109-2114.wiki
diff --git a/src/kitaab-public/raw/210115-1804.wiki b/src/raw/210115-1804.wiki
similarity index 100%
rename from src/kitaab-public/raw/210115-1804.wiki
rename to src/raw/210115-1804.wiki
diff --git a/src/kitaab-public/raw/210115-1809.wiki b/src/raw/210115-1809.wiki
similarity index 100%
rename from src/kitaab-public/raw/210115-1809.wiki
rename to src/raw/210115-1809.wiki
diff --git a/src/kitaab-public/raw/210123-1414.wiki b/src/raw/210123-1414.wiki
similarity index 100%
rename from src/kitaab-public/raw/210123-1414.wiki
rename to src/raw/210123-1414.wiki
diff --git a/src/kitaab-public/raw/210123-1417.wiki b/src/raw/210123-1417.wiki
similarity index 100%
rename from src/kitaab-public/raw/210123-1417.wiki
rename to src/raw/210123-1417.wiki
diff --git a/src/kitaab-public/raw/210124-0033.wiki b/src/raw/210124-0033.wiki
similarity index 100%
rename from src/kitaab-public/raw/210124-0033.wiki
rename to src/raw/210124-0033.wiki
diff --git a/src/kitaab-public/raw/210124-0135.wiki b/src/raw/210124-0135.wiki
similarity index 100%
rename from src/kitaab-public/raw/210124-0135.wiki
rename to src/raw/210124-0135.wiki
diff --git a/src/kitaab-public/raw/210124-0140.wiki b/src/raw/210124-0140.wiki
similarity index 100%
rename from src/kitaab-public/raw/210124-0140.wiki
rename to src/raw/210124-0140.wiki
diff --git a/src/kitaab-public/raw/210124-0144.wiki b/src/raw/210124-0144.wiki
similarity index 100%
rename from src/kitaab-public/raw/210124-0144.wiki
rename to src/raw/210124-0144.wiki
diff --git a/src/kitaab-public/raw/210124-0407.wiki b/src/raw/210124-0407.wiki
similarity index 100%
rename from src/kitaab-public/raw/210124-0407.wiki
rename to src/raw/210124-0407.wiki
diff --git a/src/kitaab-public/raw/210222-0046.wiki b/src/raw/210222-0046.wiki
similarity index 100%
rename from src/kitaab-public/raw/210222-0046.wiki
rename to src/raw/210222-0046.wiki
diff --git a/src/kitaab-public/raw/210222-0114.wiki b/src/raw/210222-0114.wiki
similarity index 100%
rename from src/kitaab-public/raw/210222-0114.wiki
rename to src/raw/210222-0114.wiki
diff --git a/src/kitaab-public/raw/210314-1815.wiki b/src/raw/210314-1815.wiki
similarity index 100%
rename from src/kitaab-public/raw/210314-1815.wiki
rename to src/raw/210314-1815.wiki
diff --git a/src/kitaab-public/raw/210407-1501.wiki b/src/raw/210407-1501.wiki
similarity index 100%
rename from src/kitaab-public/raw/210407-1501.wiki
rename to src/raw/210407-1501.wiki
diff --git a/src/kitaab-public/raw/210409-1109.wiki b/src/raw/210409-1109.wiki
similarity index 100%
rename from src/kitaab-public/raw/210409-1109.wiki
rename to src/raw/210409-1109.wiki
diff --git a/src/kitaab-public/raw/210416-2252.wiki b/src/raw/210416-2252.wiki
similarity index 100%
rename from src/kitaab-public/raw/210416-2252.wiki
rename to src/raw/210416-2252.wiki
diff --git a/src/kitaab-public/raw/210417-0308.wiki b/src/raw/210417-0308.wiki
similarity index 100%
rename from src/kitaab-public/raw/210417-0308.wiki
rename to src/raw/210417-0308.wiki
diff --git a/src/kitaab-public/raw/210417-0322.wiki b/src/raw/210417-0322.wiki
similarity index 100%
rename from src/kitaab-public/raw/210417-0322.wiki
rename to src/raw/210417-0322.wiki
diff --git a/src/kitaab-public/raw/210417-0324.wiki b/src/raw/210417-0324.wiki
similarity index 100%
rename from src/kitaab-public/raw/210417-0324.wiki
rename to src/raw/210417-0324.wiki
diff --git a/src/kitaab-public/raw/210417-1243.wiki b/src/raw/210417-1243.wiki
similarity index 100%
rename from src/kitaab-public/raw/210417-1243.wiki
rename to src/raw/210417-1243.wiki
diff --git a/src/kitaab-public/raw/210509-1322.wiki b/src/raw/210509-1322.wiki
similarity index 100%
rename from src/kitaab-public/raw/210509-1322.wiki
rename to src/raw/210509-1322.wiki
diff --git a/src/kitaab-public/raw/210522-1436.wiki b/src/raw/210522-1436.wiki
similarity index 100%
rename from src/kitaab-public/raw/210522-1436.wiki
rename to src/raw/210522-1436.wiki
diff --git a/src/kitaab-public/raw/210530-1305.wiki b/src/raw/210530-1305.wiki
similarity index 100%
rename from src/kitaab-public/raw/210530-1305.wiki
rename to src/raw/210530-1305.wiki
diff --git a/src/kitaab-public/raw/210611-1631.wiki b/src/raw/210611-1631.wiki
similarity index 100%
rename from src/kitaab-public/raw/210611-1631.wiki
rename to src/raw/210611-1631.wiki
diff --git a/src/kitaab-public/raw/210618-1038.wiki b/src/raw/210618-1038.wiki
similarity index 100%
rename from src/kitaab-public/raw/210618-1038.wiki
rename to src/raw/210618-1038.wiki
diff --git a/src/kitaab-public/raw/210618-1227.wiki b/src/raw/210618-1227.wiki
similarity index 100%
rename from src/kitaab-public/raw/210618-1227.wiki
rename to src/raw/210618-1227.wiki
diff --git a/src/kitaab-public/raw/210707-0544.wiki b/src/raw/210707-0544.wiki
similarity index 100%
rename from src/kitaab-public/raw/210707-0544.wiki
rename to src/raw/210707-0544.wiki
diff --git a/src/kitaab-public/raw/210731-2033.wiki b/src/raw/210731-2033.wiki
similarity index 100%
rename from src/kitaab-public/raw/210731-2033.wiki
rename to src/raw/210731-2033.wiki
diff --git a/src/kitaab-public/raw/210829-0712.wiki b/src/raw/210829-0712.wiki
similarity index 100%
rename from src/kitaab-public/raw/210829-0712.wiki
rename to src/raw/210829-0712.wiki
diff --git a/src/kitaab-public/raw/211004-2002.wiki b/src/raw/211004-2002.wiki
similarity index 100%
rename from src/kitaab-public/raw/211004-2002.wiki
rename to src/raw/211004-2002.wiki
diff --git a/src/kitaab-public/raw/211022-1728.wiki b/src/raw/211022-1728.wiki
similarity index 100%
rename from src/kitaab-public/raw/211022-1728.wiki
rename to src/raw/211022-1728.wiki
diff --git a/src/kitaab-public/raw/211029-1128.wiki b/src/raw/211029-1128.wiki
similarity index 100%
rename from src/kitaab-public/raw/211029-1128.wiki
rename to src/raw/211029-1128.wiki
diff --git a/src/kitaab-public/raw/211029-1324.wiki b/src/raw/211029-1324.wiki
similarity index 100%
rename from src/kitaab-public/raw/211029-1324.wiki
rename to src/raw/211029-1324.wiki
diff --git a/src/kitaab-public/raw/211102-2358.wiki b/src/raw/211102-2358.wiki
similarity index 100%
rename from src/kitaab-public/raw/211102-2358.wiki
rename to src/raw/211102-2358.wiki
diff --git a/src/kitaab-public/raw/211104-0150.wiki b/src/raw/211104-0150.wiki
similarity index 100%
rename from src/kitaab-public/raw/211104-0150.wiki
rename to src/raw/211104-0150.wiki
diff --git a/src/kitaab-public/raw/211104-0210.wiki b/src/raw/211104-0210.wiki
similarity index 100%
rename from src/kitaab-public/raw/211104-0210.wiki
rename to src/raw/211104-0210.wiki
diff --git a/src/kitaab-public/raw/211107-2158.wiki b/src/raw/211107-2158.wiki
similarity index 100%
rename from src/kitaab-public/raw/211107-2158.wiki
rename to src/raw/211107-2158.wiki
diff --git a/src/kitaab-public/raw/211107-2309.wiki b/src/raw/211107-2309.wiki
similarity index 100%
rename from src/kitaab-public/raw/211107-2309.wiki
rename to src/raw/211107-2309.wiki
diff --git a/src/kitaab-public/raw/211116-2244.wiki b/src/raw/211116-2244.wiki
similarity index 100%
rename from src/kitaab-public/raw/211116-2244.wiki
rename to src/raw/211116-2244.wiki
diff --git a/src/kitaab-public/raw/211116-2255.wiki b/src/raw/211116-2255.wiki
similarity index 100%
rename from src/kitaab-public/raw/211116-2255.wiki
rename to src/raw/211116-2255.wiki
diff --git a/src/kitaab-public/raw/211120-0228.wiki b/src/raw/211120-0228.wiki
similarity index 100%
rename from src/kitaab-public/raw/211120-0228.wiki
rename to src/raw/211120-0228.wiki
diff --git a/src/kitaab-public/raw/211121-0144.wiki b/src/raw/211121-0144.wiki
similarity index 100%
rename from src/kitaab-public/raw/211121-0144.wiki
rename to src/raw/211121-0144.wiki
diff --git a/src/kitaab-public/raw/211130-2052.wiki b/src/raw/211130-2052.wiki
similarity index 100%
rename from src/kitaab-public/raw/211130-2052.wiki
rename to src/raw/211130-2052.wiki
diff --git a/src/kitaab-public/raw/211204-0155.wiki b/src/raw/211204-0155.wiki
similarity index 100%
rename from src/kitaab-public/raw/211204-0155.wiki
rename to src/raw/211204-0155.wiki
diff --git a/src/kitaab-public/raw/211211-2254.wiki b/src/raw/211211-2254.wiki
similarity index 100%
rename from src/kitaab-public/raw/211211-2254.wiki
rename to src/raw/211211-2254.wiki
diff --git a/src/kitaab-public/raw/211212-1150.wiki b/src/raw/211212-1150.wiki
similarity index 100%
rename from src/kitaab-public/raw/211212-1150.wiki
rename to src/raw/211212-1150.wiki
diff --git a/src/kitaab-public/raw/211212-1939.wiki b/src/raw/211212-1939.wiki
similarity index 100%
rename from src/kitaab-public/raw/211212-1939.wiki
rename to src/raw/211212-1939.wiki
diff --git a/src/kitaab-public/raw/211218-0150.wiki b/src/raw/211218-0150.wiki
similarity index 100%
rename from src/kitaab-public/raw/211218-0150.wiki
rename to src/raw/211218-0150.wiki
diff --git a/src/kitaab-public/raw/211220-1658.wiki b/src/raw/211220-1658.wiki
similarity index 100%
rename from src/kitaab-public/raw/211220-1658.wiki
rename to src/raw/211220-1658.wiki
diff --git a/src/kitaab-public/raw/211220-1838.wiki b/src/raw/211220-1838.wiki
similarity index 100%
rename from src/kitaab-public/raw/211220-1838.wiki
rename to src/raw/211220-1838.wiki
diff --git a/src/kitaab-public/raw/211226-1526.wiki b/src/raw/211226-1526.wiki
similarity index 100%
rename from src/kitaab-public/raw/211226-1526.wiki
rename to src/raw/211226-1526.wiki
diff --git a/src/kitaab-public/raw/211227-2301.wiki b/src/raw/211227-2301.wiki
similarity index 100%
rename from src/kitaab-public/raw/211227-2301.wiki
rename to src/raw/211227-2301.wiki
diff --git a/src/kitaab-public/raw/220104-2114.wiki b/src/raw/220104-2114.wiki
similarity index 100%
rename from src/kitaab-public/raw/220104-2114.wiki
rename to src/raw/220104-2114.wiki
diff --git a/src/kitaab-public/raw/220106-2211.wiki b/src/raw/220106-2211.wiki
similarity index 100%
rename from src/kitaab-public/raw/220106-2211.wiki
rename to src/raw/220106-2211.wiki
diff --git a/src/kitaab-public/raw/220115-1438.wiki b/src/raw/220115-1438.wiki
similarity index 100%
rename from src/kitaab-public/raw/220115-1438.wiki
rename to src/raw/220115-1438.wiki
diff --git a/src/kitaab-public/raw/220116-0453.wiki b/src/raw/220116-0453.wiki
similarity index 100%
rename from src/kitaab-public/raw/220116-0453.wiki
rename to src/raw/220116-0453.wiki
diff --git a/src/kitaab-public/raw/220116-0509.wiki b/src/raw/220116-0509.wiki
similarity index 100%
rename from src/kitaab-public/raw/220116-0509.wiki
rename to src/raw/220116-0509.wiki
diff --git a/src/kitaab-public/raw/220117-0131.wiki b/src/raw/220117-0131.wiki
similarity index 100%
rename from src/kitaab-public/raw/220117-0131.wiki
rename to src/raw/220117-0131.wiki
diff --git a/src/kitaab-public/raw/220122-0146.wiki b/src/raw/220122-0146.wiki
similarity index 100%
rename from src/kitaab-public/raw/220122-0146.wiki
rename to src/raw/220122-0146.wiki
diff --git a/src/kitaab-public/raw/220128-0244.wiki b/src/raw/220128-0244.wiki
similarity index 100%
rename from src/kitaab-public/raw/220128-0244.wiki
rename to src/raw/220128-0244.wiki
diff --git a/src/kitaab-public/raw/220203-0332.wiki b/src/raw/220203-0332.wiki
similarity index 100%
rename from src/kitaab-public/raw/220203-0332.wiki
rename to src/raw/220203-0332.wiki
diff --git a/src/kitaab-public/raw/220208-2310.wiki b/src/raw/220208-2310.wiki
similarity index 100%
rename from src/kitaab-public/raw/220208-2310.wiki
rename to src/raw/220208-2310.wiki
diff --git a/src/kitaab-public/raw/220212-1401.wiki b/src/raw/220212-1401.wiki
similarity index 100%
rename from src/kitaab-public/raw/220212-1401.wiki
rename to src/raw/220212-1401.wiki
diff --git a/src/kitaab-public/raw/220213-2040.wiki b/src/raw/220213-2040.wiki
similarity index 100%
rename from src/kitaab-public/raw/220213-2040.wiki
rename to src/raw/220213-2040.wiki
diff --git a/src/kitaab-public/raw/220226-0007.wiki b/src/raw/220226-0007.wiki
similarity index 100%
rename from src/kitaab-public/raw/220226-0007.wiki
rename to src/raw/220226-0007.wiki
diff --git a/src/kitaab-public/raw/220226-2025.wiki b/src/raw/220226-2025.wiki
similarity index 100%
rename from src/kitaab-public/raw/220226-2025.wiki
rename to src/raw/220226-2025.wiki
diff --git a/src/kitaab-public/raw/2420-w3.wiki b/src/raw/2420-w3.wiki
similarity index 100%
rename from src/kitaab-public/raw/2420-w3.wiki
rename to src/raw/2420-w3.wiki
diff --git a/src/kitaab-public/raw/2420-w4.wiki b/src/raw/2420-w4.wiki
similarity index 100%
rename from src/kitaab-public/raw/2420-w4.wiki
rename to src/raw/2420-w4.wiki
diff --git a/src/kitaab-public/raw/2420.wiki b/src/raw/2420.wiki
similarity index 100%
rename from src/kitaab-public/raw/2420.wiki
rename to src/raw/2420.wiki
diff --git a/src/kitaab-public/raw/4450-week2.wiki b/src/raw/4450-week2.wiki
similarity index 100%
rename from src/kitaab-public/raw/4450-week2.wiki
rename to src/raw/4450-week2.wiki
diff --git a/src/kitaab-public/raw/4880-w1.wiki b/src/raw/4880-w1.wiki
similarity index 100%
rename from src/kitaab-public/raw/4880-w1.wiki
rename to src/raw/4880-w1.wiki
diff --git a/src/kitaab-public/raw/Archive.wiki b/src/raw/Archive.wiki
similarity index 100%
rename from src/kitaab-public/raw/Archive.wiki
rename to src/raw/Archive.wiki
diff --git a/src/kitaab-public/raw/Backups.wiki b/src/raw/Backups.wiki
similarity index 100%
rename from src/kitaab-public/raw/Backups.wiki
rename to src/raw/Backups.wiki
diff --git a/src/kitaab-public/raw/Blog.sync-conflict-20201019-094152-KZ7HRBJ.wiki b/src/raw/Blog.sync-conflict-20201019-094152-KZ7HRBJ.wiki
similarity index 100%
rename from src/kitaab-public/raw/Blog.sync-conflict-20201019-094152-KZ7HRBJ.wiki
rename to src/raw/Blog.sync-conflict-20201019-094152-KZ7HRBJ.wiki
diff --git a/src/kitaab-public/raw/Blog.wiki b/src/raw/Blog.wiki
similarity index 100%
rename from src/kitaab-public/raw/Blog.wiki
rename to src/raw/Blog.wiki
diff --git a/src/kitaab-public/raw/COMP2420.wiki b/src/raw/COMP2420.wiki
similarity index 100%
rename from src/kitaab-public/raw/COMP2420.wiki
rename to src/raw/COMP2420.wiki
diff --git a/src/kitaab-public/raw/COMP4450.wiki b/src/raw/COMP4450.wiki
similarity index 100%
rename from src/kitaab-public/raw/COMP4450.wiki
rename to src/raw/COMP4450.wiki
diff --git a/src/kitaab-public/raw/COMP4880.wiki b/src/raw/COMP4880.wiki
similarity index 100%
rename from src/kitaab-public/raw/COMP4880.wiki
rename to src/raw/COMP4880.wiki
diff --git a/src/kitaab-public/raw/Expand-Your-We.wiki b/src/raw/Expand-Your-We.wiki
similarity index 100%
rename from src/kitaab-public/raw/Expand-Your-We.wiki
rename to src/raw/Expand-Your-We.wiki
diff --git a/src/kitaab-public/raw/Experiments.wiki b/src/raw/Experiments.wiki
similarity index 100%
rename from src/kitaab-public/raw/Experiments.wiki
rename to src/raw/Experiments.wiki
diff --git a/src/kitaab-public/raw/Fava.wiki b/src/raw/Fava.wiki
similarity index 100%
rename from src/kitaab-public/raw/Fava.wiki
rename to src/raw/Fava.wiki
diff --git a/src/kitaab-public/raw/HUMN1001.wiki b/src/raw/HUMN1001.wiki
similarity index 100%
rename from src/kitaab-public/raw/HUMN1001.wiki
rename to src/raw/HUMN1001.wiki
diff --git a/src/kitaab-public/raw/HackingArtOfExploitation.wiki b/src/raw/HackingArtOfExploitation.wiki
similarity index 100%
rename from src/kitaab-public/raw/HackingArtOfExploitation.wiki
rename to src/raw/HackingArtOfExploitation.wiki
diff --git a/src/kitaab-public/raw/Industrial-Ops.wiki b/src/raw/Industrial-Ops.wiki
similarity index 100%
rename from src/kitaab-public/raw/Industrial-Ops.wiki
rename to src/raw/Industrial-Ops.wiki
diff --git a/src/kitaab-public/raw/Infrastructure.sync-conflict-20201012-130837-KZ7HRBJ.wiki b/src/raw/Infrastructure.sync-conflict-20201012-130837-KZ7HRBJ.wiki
similarity index 100%
rename from src/kitaab-public/raw/Infrastructure.sync-conflict-20201012-130837-KZ7HRBJ.wiki
rename to src/raw/Infrastructure.sync-conflict-20201012-130837-KZ7HRBJ.wiki
diff --git a/src/kitaab-public/raw/Infrastructure.wiki b/src/raw/Infrastructure.wiki
similarity index 100%
rename from src/kitaab-public/raw/Infrastructure.wiki
rename to src/raw/Infrastructure.wiki
diff --git a/src/kitaab-public/raw/Kitaab.wiki b/src/raw/Kitaab.wiki
similarity index 100%
rename from src/kitaab-public/raw/Kitaab.wiki
rename to src/raw/Kitaab.wiki
diff --git a/src/kitaab-public/raw/Nextcloud.wiki b/src/raw/Nextcloud.wiki
similarity index 100%
rename from src/kitaab-public/raw/Nextcloud.wiki
rename to src/raw/Nextcloud.wiki
diff --git a/src/kitaab-public/raw/Norns.wiki b/src/raw/Norns.wiki
similarity index 100%
rename from src/kitaab-public/raw/Norns.wiki
rename to src/raw/Norns.wiki
diff --git a/src/kitaab-public/raw/ORCA.wiki b/src/raw/ORCA.wiki
similarity index 100%
rename from src/kitaab-public/raw/ORCA.wiki
rename to src/raw/ORCA.wiki
diff --git a/src/kitaab-public/raw/Punya.wiki b/src/raw/Punya.wiki
similarity index 100%
rename from src/kitaab-public/raw/Punya.wiki
rename to src/raw/Punya.wiki
diff --git a/src/kitaab-public/raw/Puralek.wiki b/src/raw/Puralek.wiki
similarity index 100%
rename from src/kitaab-public/raw/Puralek.wiki
rename to src/raw/Puralek.wiki
diff --git a/src/kitaab-public/raw/ReverseEngineering.wiki b/src/raw/ReverseEngineering.wiki
similarity index 100%
rename from src/kitaab-public/raw/ReverseEngineering.wiki
rename to src/raw/ReverseEngineering.wiki
diff --git a/src/kitaab-public/raw/SM-jira-meeting-notes.wiki b/src/raw/SM-jira-meeting-notes.wiki
similarity index 100%
rename from src/kitaab-public/raw/SM-jira-meeting-notes.wiki
rename to src/raw/SM-jira-meeting-notes.wiki
diff --git a/src/kitaab-public/raw/SQLi.wiki b/src/raw/SQLi.wiki
similarity index 100%
rename from src/kitaab-public/raw/SQLi.wiki
rename to src/raw/SQLi.wiki
diff --git a/src/kitaab-public/raw/Uni.wiki b/src/raw/Uni.wiki
similarity index 100%
rename from src/kitaab-public/raw/Uni.wiki
rename to src/raw/Uni.wiki
diff --git a/src/kitaab-public/raw/Website.wiki b/src/raw/Website.wiki
similarity index 100%
rename from src/kitaab-public/raw/Website.wiki
rename to src/raw/Website.wiki
diff --git a/src/kitaab-public/raw/Writing.sync-conflict-20210105-170339-3AWSEIW.wiki b/src/raw/Writing.sync-conflict-20210105-170339-3AWSEIW.wiki
similarity index 100%
rename from src/kitaab-public/raw/Writing.sync-conflict-20210105-170339-3AWSEIW.wiki
rename to src/raw/Writing.sync-conflict-20210105-170339-3AWSEIW.wiki
diff --git a/src/kitaab-public/raw/Writing.sync-conflict-20210105-172913-3AWSEIW.wiki b/src/raw/Writing.sync-conflict-20210105-172913-3AWSEIW.wiki
similarity index 100%
rename from src/kitaab-public/raw/Writing.sync-conflict-20210105-172913-3AWSEIW.wiki
rename to src/raw/Writing.sync-conflict-20210105-172913-3AWSEIW.wiki
diff --git a/src/kitaab-public/raw/Writing.wiki b/src/raw/Writing.wiki
similarity index 100%
rename from src/kitaab-public/raw/Writing.wiki
rename to src/raw/Writing.wiki
diff --git a/src/kitaab-public/raw/XSS.wiki b/src/raw/XSS.wiki
similarity index 100%
rename from src/kitaab-public/raw/XSS.wiki
rename to src/raw/XSS.wiki
diff --git a/src/kitaab-public/raw/Yaad.wiki b/src/raw/Yaad.wiki
similarity index 100%
rename from src/kitaab-public/raw/Yaad.wiki
rename to src/raw/Yaad.wiki
diff --git a/src/kitaab-public/raw/aardwolf.wiki b/src/raw/aardwolf.wiki
similarity index 100%
rename from src/kitaab-public/raw/aardwolf.wiki
rename to src/raw/aardwolf.wiki
diff --git a/src/kitaab-public/raw/alert-matrix.wiki b/src/raw/alert-matrix.wiki
similarity index 100%
rename from src/kitaab-public/raw/alert-matrix.wiki
rename to src/raw/alert-matrix.wiki
diff --git a/src/kitaab-public/raw/america-travel-2018.wiki b/src/raw/america-travel-2018.wiki
similarity index 100%
rename from src/kitaab-public/raw/america-travel-2018.wiki
rename to src/raw/america-travel-2018.wiki
diff --git a/src/kitaab-public/raw/auggar.wiki b/src/raw/auggar.wiki
similarity index 100%
rename from src/kitaab-public/raw/auggar.wiki
rename to src/raw/auggar.wiki
diff --git a/src/kitaab-public/raw/auto-curate.wiki b/src/raw/auto-curate.wiki
similarity index 100%
rename from src/kitaab-public/raw/auto-curate.wiki
rename to src/raw/auto-curate.wiki
diff --git a/src/kitaab-public/raw/aws-tail.wiki b/src/raw/aws-tail.wiki
similarity index 100%
rename from src/kitaab-public/raw/aws-tail.wiki
rename to src/raw/aws-tail.wiki
diff --git a/src/kitaab-public/raw/baking.wiki b/src/raw/baking.wiki
similarity index 100%
rename from src/kitaab-public/raw/baking.wiki
rename to src/raw/baking.wiki
diff --git a/src/kitaab-public/raw/blog.wiki b/src/raw/blog.wiki
similarity index 100%
rename from src/kitaab-public/raw/blog.wiki
rename to src/raw/blog.wiki
diff --git a/src/kitaab-public/raw/bots.wiki b/src/raw/bots.wiki
similarity index 100%
rename from src/kitaab-public/raw/bots.wiki
rename to src/raw/bots.wiki
diff --git a/src/kitaab-public/raw/bowl.wiki b/src/raw/bowl.wiki
similarity index 100%
rename from src/kitaab-public/raw/bowl.wiki
rename to src/raw/bowl.wiki
diff --git a/src/kitaab-public/raw/box.wiki b/src/raw/box.wiki
similarity index 100%
rename from src/kitaab-public/raw/box.wiki
rename to src/raw/box.wiki
diff --git a/src/kitaab-public/raw/bread.wiki b/src/raw/bread.wiki
similarity index 100%
rename from src/kitaab-public/raw/bread.wiki
rename to src/raw/bread.wiki
diff --git a/src/kitaab-public/raw/brisbane.wiki b/src/raw/brisbane.wiki
similarity index 100%
rename from src/kitaab-public/raw/brisbane.wiki
rename to src/raw/brisbane.wiki
diff --git a/src/kitaab-public/raw/brooyar2020.wiki b/src/raw/brooyar2020.wiki
similarity index 100%
rename from src/kitaab-public/raw/brooyar2020.wiki
rename to src/raw/brooyar2020.wiki
diff --git a/src/kitaab-public/raw/canberra2020.wiki b/src/raw/canberra2020.wiki
similarity index 100%
rename from src/kitaab-public/raw/canberra2020.wiki
rename to src/raw/canberra2020.wiki
diff --git a/src/kitaab-public/raw/cherry-pick.wiki b/src/raw/cherry-pick.wiki
similarity index 100%
rename from src/kitaab-public/raw/cherry-pick.wiki
rename to src/raw/cherry-pick.wiki
diff --git a/src/kitaab-public/raw/chores.wiki b/src/raw/chores.wiki
similarity index 100%
rename from src/kitaab-public/raw/chores.wiki
rename to src/raw/chores.wiki
diff --git a/src/kitaab-public/raw/click-to-jira.wiki b/src/raw/click-to-jira.wiki
similarity index 100%
rename from src/kitaab-public/raw/click-to-jira.wiki
rename to src/raw/click-to-jira.wiki
diff --git a/src/kitaab-public/raw/coffee.wiki b/src/raw/coffee.wiki
similarity index 100%
rename from src/kitaab-public/raw/coffee.wiki
rename to src/raw/coffee.wiki
diff --git a/src/kitaab-public/raw/contributions.sync-conflict-20201003-153925-KZ7HRBJ.wiki b/src/raw/contributions.sync-conflict-20201003-153925-KZ7HRBJ.wiki
similarity index 100%
rename from src/kitaab-public/raw/contributions.sync-conflict-20201003-153925-KZ7HRBJ.wiki
rename to src/raw/contributions.sync-conflict-20201003-153925-KZ7HRBJ.wiki
diff --git a/src/kitaab-public/raw/contributions.wiki b/src/raw/contributions.wiki
similarity index 100%
rename from src/kitaab-public/raw/contributions.wiki
rename to src/raw/contributions.wiki
diff --git a/src/kitaab-public/raw/counsellor.wiki b/src/raw/counsellor.wiki
similarity index 100%
rename from src/kitaab-public/raw/counsellor.wiki
rename to src/raw/counsellor.wiki
diff --git a/src/kitaab-public/raw/craft.wiki b/src/raw/craft.wiki
similarity index 100%
rename from src/kitaab-public/raw/craft.wiki
rename to src/raw/craft.wiki
diff --git a/src/kitaab-public/raw/crafts.wiki b/src/raw/crafts.wiki
similarity index 100%
rename from src/kitaab-public/raw/crafts.wiki
rename to src/raw/crafts.wiki
diff --git a/src/kitaab-public/raw/css.wiki b/src/raw/css.wiki
similarity index 100%
rename from src/kitaab-public/raw/css.wiki
rename to src/raw/css.wiki
diff --git a/src/kitaab-public/raw/cube.wiki b/src/raw/cube.wiki
similarity index 100%
rename from src/kitaab-public/raw/cube.wiki
rename to src/raw/cube.wiki
diff --git a/src/kitaab-public/raw/curve.wiki b/src/raw/curve.wiki
similarity index 100%
rename from src/kitaab-public/raw/curve.wiki
rename to src/raw/curve.wiki
diff --git a/src/kitaab-public/raw/datalife.wiki b/src/raw/datalife.wiki
similarity index 100%
rename from src/kitaab-public/raw/datalife.wiki
rename to src/raw/datalife.wiki
diff --git a/src/kitaab-public/raw/dev.wiki b/src/raw/dev.wiki
similarity index 100%
rename from src/kitaab-public/raw/dev.wiki
rename to src/raw/dev.wiki
diff --git a/src/kitaab-public/raw/django.wiki b/src/raw/django.wiki
similarity index 100%
rename from src/kitaab-public/raw/django.wiki
rename to src/raw/django.wiki
diff --git a/src/kitaab-public/raw/dmi.wiki b/src/raw/dmi.wiki
similarity index 100%
rename from src/kitaab-public/raw/dmi.wiki
rename to src/raw/dmi.wiki
diff --git a/src/kitaab-public/raw/dot.wiki b/src/raw/dot.wiki
similarity index 100%
rename from src/kitaab-public/raw/dot.wiki
rename to src/raw/dot.wiki
diff --git a/src/kitaab-public/raw/dotgarden.wiki b/src/raw/dotgarden.wiki
similarity index 100%
rename from src/kitaab-public/raw/dotgarden.wiki
rename to src/raw/dotgarden.wiki
diff --git a/src/kitaab-public/raw/electronics.wiki b/src/raw/electronics.wiki
similarity index 100%
rename from src/kitaab-public/raw/electronics.wiki
rename to src/raw/electronics.wiki
diff --git a/src/kitaab-public/raw/fermentation.wiki b/src/raw/fermentation.wiki
similarity index 100%
rename from src/kitaab-public/raw/fermentation.wiki
rename to src/raw/fermentation.wiki
diff --git a/src/kitaab-public/raw/finances.wiki b/src/raw/finances.wiki
similarity index 100%
rename from src/kitaab-public/raw/finances.wiki
rename to src/raw/finances.wiki
diff --git a/src/kitaab-public/raw/gardening.wiki b/src/raw/gardening.wiki
similarity index 100%
rename from src/kitaab-public/raw/gardening.wiki
rename to src/raw/gardening.wiki
diff --git a/src/kitaab-public/raw/generative.wiki b/src/raw/generative.wiki
similarity index 100%
rename from src/kitaab-public/raw/generative.wiki
rename to src/raw/generative.wiki
diff --git a/src/kitaab-public/raw/goals.wiki b/src/raw/goals.wiki
similarity index 100%
rename from src/kitaab-public/raw/goals.wiki
rename to src/raw/goals.wiki
diff --git a/src/kitaab-public/raw/godemodemay.wiki b/src/raw/godemodemay.wiki
similarity index 100%
rename from src/kitaab-public/raw/godemodemay.wiki
rename to src/raw/godemodemay.wiki
diff --git a/src/kitaab-public/raw/godmodemay.wiki b/src/raw/godmodemay.wiki
similarity index 100%
rename from src/kitaab-public/raw/godmodemay.wiki
rename to src/raw/godmodemay.wiki
diff --git a/src/kitaab-public/raw/grasp.wiki b/src/raw/grasp.wiki
similarity index 100%
rename from src/kitaab-public/raw/grasp.wiki
rename to src/raw/grasp.wiki
diff --git a/src/kitaab-public/raw/gratitude.wiki b/src/raw/gratitude.wiki
similarity index 100%
rename from src/kitaab-public/raw/gratitude.wiki
rename to src/raw/gratitude.wiki
diff --git a/src/kitaab-public/raw/groceries.sync-conflict-20210102-225658-LX5ZRTJ.wiki b/src/raw/groceries.sync-conflict-20210102-225658-LX5ZRTJ.wiki
similarity index 100%
rename from src/kitaab-public/raw/groceries.sync-conflict-20210102-225658-LX5ZRTJ.wiki
rename to src/raw/groceries.sync-conflict-20210102-225658-LX5ZRTJ.wiki
diff --git a/src/kitaab-public/raw/groceries.wiki b/src/raw/groceries.wiki
similarity index 100%
rename from src/kitaab-public/raw/groceries.wiki
rename to src/raw/groceries.wiki
diff --git a/src/kitaab-public/raw/habitsGtk.wiki b/src/raw/habitsGtk.wiki
similarity index 100%
rename from src/kitaab-public/raw/habitsGtk.wiki
rename to src/raw/habitsGtk.wiki
diff --git a/src/kitaab-public/raw/hack.wiki b/src/raw/hack.wiki
similarity index 100%
rename from src/kitaab-public/raw/hack.wiki
rename to src/raw/hack.wiki
diff --git a/src/kitaab-public/raw/hacker101.wiki b/src/raw/hacker101.wiki
similarity index 100%
rename from src/kitaab-public/raw/hacker101.wiki
rename to src/raw/hacker101.wiki
diff --git a/src/kitaab-public/raw/helix.wiki b/src/raw/helix.wiki
similarity index 100%
rename from src/kitaab-public/raw/helix.wiki
rename to src/raw/helix.wiki
diff --git a/src/kitaab-public/raw/hitman-roguelike.wiki b/src/raw/hitman-roguelike.wiki
similarity index 100%
rename from src/kitaab-public/raw/hitman-roguelike.wiki
rename to src/raw/hitman-roguelike.wiki
diff --git a/src/kitaab-public/raw/home.wiki b/src/raw/home.wiki
similarity index 100%
rename from src/kitaab-public/raw/home.wiki
rename to src/raw/home.wiki
diff --git a/src/kitaab-public/raw/humn1001-week3.wiki b/src/raw/humn1001-week3.wiki
similarity index 100%
rename from src/kitaab-public/raw/humn1001-week3.wiki
rename to src/raw/humn1001-week3.wiki
diff --git a/src/kitaab-public/raw/hyperplane.wiki b/src/raw/hyperplane.wiki
similarity index 100%
rename from src/kitaab-public/raw/hyperplane.wiki
rename to src/raw/hyperplane.wiki
diff --git a/src/kitaab-public/raw/ideas.wiki b/src/raw/ideas.wiki
similarity index 100%
rename from src/kitaab-public/raw/ideas.wiki
rename to src/raw/ideas.wiki
diff --git a/src/kitaab-public/raw/index.wiki b/src/raw/index.wiki
similarity index 100%
rename from src/kitaab-public/raw/index.wiki
rename to src/raw/index.wiki
diff --git a/src/kitaab-public/raw/india-2018.wiki b/src/raw/india-2018.wiki
similarity index 100%
rename from src/kitaab-public/raw/india-2018.wiki
rename to src/raw/india-2018.wiki
diff --git a/src/kitaab-public/raw/indieWeb.wiki b/src/raw/indieWeb.wiki
similarity index 100%
rename from src/kitaab-public/raw/indieWeb.wiki
rename to src/raw/indieWeb.wiki
diff --git a/src/kitaab-public/raw/intro.wiki b/src/raw/intro.wiki
similarity index 100%
rename from src/kitaab-public/raw/intro.wiki
rename to src/raw/intro.wiki
diff --git a/src/kitaab-public/raw/isit420yet.wiki b/src/raw/isit420yet.wiki
similarity index 100%
rename from src/kitaab-public/raw/isit420yet.wiki
rename to src/raw/isit420yet.wiki
diff --git a/src/kitaab-public/raw/job.wiki b/src/raw/job.wiki
similarity index 100%
rename from src/kitaab-public/raw/job.wiki
rename to src/raw/job.wiki
diff --git a/src/kitaab-public/raw/just so.wiki b/src/raw/just so.wiki
similarity index 100%
rename from src/kitaab-public/raw/just so.wiki
rename to src/raw/just so.wiki
diff --git a/src/kitaab-public/raw/kendrit-vim.wiki b/src/raw/kendrit-vim.wiki
similarity index 100%
rename from src/kitaab-public/raw/kendrit-vim.wiki
rename to src/raw/kendrit-vim.wiki
diff --git a/src/kitaab-public/raw/kendrit.wiki b/src/raw/kendrit.wiki
similarity index 100%
rename from src/kitaab-public/raw/kendrit.wiki
rename to src/raw/kendrit.wiki
diff --git a/src/kitaab-public/raw/korea2019.wiki b/src/raw/korea2019.wiki
similarity index 100%
rename from src/kitaab-public/raw/korea2019.wiki
rename to src/raw/korea2019.wiki
diff --git a/src/kitaab-public/raw/lifeTracker.wiki b/src/raw/lifeTracker.wiki
similarity index 100%
rename from src/kitaab-public/raw/lifeTracker.wiki
rename to src/raw/lifeTracker.wiki
diff --git a/src/kitaab-public/raw/line.wiki b/src/raw/line.wiki
similarity index 100%
rename from src/kitaab-public/raw/line.wiki
rename to src/raw/line.wiki
diff --git a/src/kitaab-public/raw/link-store.wiki b/src/raw/link-store.wiki
similarity index 100%
rename from src/kitaab-public/raw/link-store.wiki
rename to src/raw/link-store.wiki
diff --git a/src/kitaab-public/raw/linux.wiki b/src/raw/linux.wiki
similarity index 100%
rename from src/kitaab-public/raw/linux.wiki
rename to src/raw/linux.wiki
diff --git a/src/kitaab-public/raw/log.wiki b/src/raw/log.wiki
similarity index 100%
rename from src/kitaab-public/raw/log.wiki
rename to src/raw/log.wiki
diff --git a/src/kitaab-public/raw/maze.wiki b/src/raw/maze.wiki
similarity index 100%
rename from src/kitaab-public/raw/maze.wiki
rename to src/raw/maze.wiki
diff --git a/src/kitaab-public/raw/media.wiki b/src/raw/media.wiki
similarity index 100%
rename from src/kitaab-public/raw/media.wiki
rename to src/raw/media.wiki
diff --git a/src/kitaab-public/raw/memex.wiki b/src/raw/memex.wiki
similarity index 100%
rename from src/kitaab-public/raw/memex.wiki
rename to src/raw/memex.wiki
diff --git a/src/kitaab-public/raw/meta.wiki b/src/raw/meta.wiki
similarity index 100%
rename from src/kitaab-public/raw/meta.wiki
rename to src/raw/meta.wiki
diff --git a/src/kitaab-public/raw/morning-list.wiki b/src/raw/morning-list.wiki
similarity index 100%
rename from src/kitaab-public/raw/morning-list.wiki
rename to src/raw/morning-list.wiki
diff --git a/src/kitaab-public/raw/mossnet.wiki b/src/raw/mossnet.wiki
similarity index 100%
rename from src/kitaab-public/raw/mossnet.wiki
rename to src/raw/mossnet.wiki
diff --git a/src/kitaab-public/raw/moving.wiki b/src/raw/moving.wiki
similarity index 100%
rename from src/kitaab-public/raw/moving.wiki
rename to src/raw/moving.wiki
diff --git a/src/kitaab-public/raw/nadir.wiki b/src/raw/nadir.wiki
similarity index 100%
rename from src/kitaab-public/raw/nadir.wiki
rename to src/raw/nadir.wiki
diff --git a/src/kitaab-public/raw/newpage.wiki b/src/raw/newpage.wiki
similarity index 100%
rename from src/kitaab-public/raw/newpage.wiki
rename to src/raw/newpage.wiki
diff --git a/src/kitaab-public/raw/news-agg.wiki b/src/raw/news-agg.wiki
similarity index 100%
rename from src/kitaab-public/raw/news-agg.wiki
rename to src/raw/news-agg.wiki
diff --git a/src/kitaab-public/raw/nix-lang.wiki b/src/raw/nix-lang.wiki
similarity index 100%
rename from src/kitaab-public/raw/nix-lang.wiki
rename to src/raw/nix-lang.wiki
diff --git a/src/kitaab-public/raw/nixOS.wiki b/src/raw/nixOS.wiki
similarity index 100%
rename from src/kitaab-public/raw/nixOS.wiki
rename to src/raw/nixOS.wiki
diff --git a/src/kitaab-public/raw/nixpkgs.wiki b/src/raw/nixpkgs.wiki
similarity index 100%
rename from src/kitaab-public/raw/nixpkgs.wiki
rename to src/raw/nixpkgs.wiki
diff --git a/src/kitaab-public/raw/notes..wiki b/src/raw/notes..wiki
similarity index 100%
rename from src/kitaab-public/raw/notes..wiki
rename to src/raw/notes..wiki
diff --git a/src/kitaab-public/raw/now.wiki b/src/raw/now.wiki
similarity index 100%
rename from src/kitaab-public/raw/now.wiki
rename to src/raw/now.wiki
diff --git a/src/kitaab-public/raw/ops.wiki b/src/raw/ops.wiki
similarity index 100%
rename from src/kitaab-public/raw/ops.wiki
rename to src/raw/ops.wiki
diff --git a/src/kitaab-public/raw/overthewire.wiki b/src/raw/overthewire.wiki
similarity index 100%
rename from src/kitaab-public/raw/overthewire.wiki
rename to src/raw/overthewire.wiki
diff --git a/src/kitaab-public/raw/pasta.wiki b/src/raw/pasta.wiki
similarity index 100%
rename from src/kitaab-public/raw/pasta.wiki
rename to src/raw/pasta.wiki
diff --git a/src/kitaab-public/raw/pebble.wiki b/src/raw/pebble.wiki
similarity index 100%
rename from src/kitaab-public/raw/pebble.wiki
rename to src/raw/pebble.wiki
diff --git a/src/kitaab-public/raw/pentagon.wiki b/src/raw/pentagon.wiki
similarity index 100%
rename from src/kitaab-public/raw/pentagon.wiki
rename to src/raw/pentagon.wiki
diff --git a/src/kitaab-public/raw/pipeline.wiki b/src/raw/pipeline.wiki
similarity index 100%
rename from src/kitaab-public/raw/pipeline.wiki
rename to src/raw/pipeline.wiki
diff --git a/src/kitaab-public/raw/processisng.wiki b/src/raw/processisng.wiki
similarity index 100%
rename from src/kitaab-public/raw/processisng.wiki
rename to src/raw/processisng.wiki
diff --git a/src/kitaab-public/raw/psql.wiki b/src/raw/psql.wiki
similarity index 100%
rename from src/kitaab-public/raw/psql.wiki
rename to src/raw/psql.wiki
diff --git a/src/kitaab-public/raw/purchases.sync-conflict-20201012-130834-LX5ZRTJ.wiki b/src/raw/purchases.sync-conflict-20201012-130834-LX5ZRTJ.wiki
similarity index 100%
rename from src/kitaab-public/raw/purchases.sync-conflict-20201012-130834-LX5ZRTJ.wiki
rename to src/raw/purchases.sync-conflict-20201012-130834-LX5ZRTJ.wiki
diff --git a/src/kitaab-public/raw/purchases.wiki b/src/raw/purchases.wiki
similarity index 100%
rename from src/kitaab-public/raw/purchases.wiki
rename to src/raw/purchases.wiki
diff --git a/src/kitaab-public/raw/python-ransomware.wiki b/src/raw/python-ransomware.wiki
similarity index 100%
rename from src/kitaab-public/raw/python-ransomware.wiki
rename to src/raw/python-ransomware.wiki
diff --git a/src/kitaab-public/raw/python.wiki b/src/raw/python.wiki
similarity index 100%
rename from src/kitaab-public/raw/python.wiki
rename to src/raw/python.wiki
diff --git a/src/kitaab-public/raw/quotes.wiki b/src/raw/quotes.wiki
similarity index 100%
rename from src/kitaab-public/raw/quotes.wiki
rename to src/raw/quotes.wiki
diff --git a/src/kitaab-public/raw/rectangle.wiki b/src/raw/rectangle.wiki
similarity index 100%
rename from src/kitaab-public/raw/rectangle.wiki
rename to src/raw/rectangle.wiki
diff --git a/src/kitaab-public/raw/reflection.wiki b/src/raw/reflection.wiki
similarity index 100%
rename from src/kitaab-public/raw/reflection.wiki
rename to src/raw/reflection.wiki
diff --git a/src/kitaab-public/raw/riya.wiki b/src/raw/riya.wiki
similarity index 100%
rename from src/kitaab-public/raw/riya.wiki
rename to src/raw/riya.wiki
diff --git a/src/kitaab-public/raw/rss2elastic.wiki b/src/raw/rss2elastic.wiki
similarity index 100%
rename from src/kitaab-public/raw/rss2elastic.wiki
rename to src/raw/rss2elastic.wiki
diff --git a/src/kitaab-public/raw/sale.wiki b/src/raw/sale.wiki
similarity index 100%
rename from src/kitaab-public/raw/sale.wiki
rename to src/raw/sale.wiki
diff --git a/src/kitaab-public/raw/sealight.xyz.wiki b/src/raw/sealight.xyz.wiki
similarity index 100%
rename from src/kitaab-public/raw/sealight.xyz.wiki
rename to src/raw/sealight.xyz.wiki
diff --git a/src/kitaab-public/raw/see.wiki b/src/raw/see.wiki
similarity index 100%
rename from src/kitaab-public/raw/see.wiki
rename to src/raw/see.wiki
diff --git a/src/kitaab-public/raw/shaders.wiki b/src/raw/shaders.wiki
similarity index 100%
rename from src/kitaab-public/raw/shaders.wiki
rename to src/raw/shaders.wiki
diff --git a/src/kitaab-public/raw/sketch-build.wiki b/src/raw/sketch-build.wiki
similarity index 100%
rename from src/kitaab-public/raw/sketch-build.wiki
rename to src/raw/sketch-build.wiki
diff --git a/src/kitaab-public/raw/smashstock2019.wiki b/src/raw/smashstock2019.wiki
similarity index 100%
rename from src/kitaab-public/raw/smashstock2019.wiki
rename to src/raw/smashstock2019.wiki
diff --git a/src/kitaab-public/raw/sphere.wiki b/src/raw/sphere.wiki
similarity index 100%
rename from src/kitaab-public/raw/sphere.wiki
rename to src/raw/sphere.wiki
diff --git a/src/kitaab-public/raw/strategy.wiki b/src/raw/strategy.wiki
similarity index 100%
rename from src/kitaab-public/raw/strategy.wiki
rename to src/raw/strategy.wiki
diff --git a/src/kitaab-public/raw/sydney-april-2019.wiki b/src/raw/sydney-april-2019.wiki
similarity index 100%
rename from src/kitaab-public/raw/sydney-april-2019.wiki
rename to src/raw/sydney-april-2019.wiki
diff --git a/src/kitaab-public/raw/sydney2021.wiki b/src/raw/sydney2021.wiki
similarity index 100%
rename from src/kitaab-public/raw/sydney2021.wiki
rename to src/raw/sydney2021.wiki
diff --git a/src/kitaab-public/raw/synths.wiki b/src/raw/synths.wiki
similarity index 100%
rename from src/kitaab-public/raw/synths.wiki
rename to src/raw/synths.wiki
diff --git a/src/kitaab-public/raw/td-reporting.wiki b/src/raw/td-reporting.wiki
similarity index 100%
rename from src/kitaab-public/raw/td-reporting.wiki
rename to src/raw/td-reporting.wiki
diff --git a/src/kitaab-public/raw/tidalcycles.wiki b/src/raw/tidalcycles.wiki
similarity index 100%
rename from src/kitaab-public/raw/tidalcycles.wiki
rename to src/raw/tidalcycles.wiki
diff --git a/src/kitaab-public/raw/tinder.wiki b/src/raw/tinder.wiki
similarity index 100%
rename from src/kitaab-public/raw/tinder.wiki
rename to src/raw/tinder.wiki
diff --git a/src/kitaab-public/raw/travel.wiki b/src/raw/travel.wiki
similarity index 100%
rename from src/kitaab-public/raw/travel.wiki
rename to src/raw/travel.wiki
diff --git a/src/kitaab-public/raw/vim-tidal.wiki b/src/raw/vim-tidal.wiki
similarity index 100%
rename from src/kitaab-public/raw/vim-tidal.wiki
rename to src/raw/vim-tidal.wiki
diff --git a/src/kitaab-public/raw/vim-zettel.wiki b/src/raw/vim-zettel.wiki
similarity index 100%
rename from src/kitaab-public/raw/vim-zettel.wiki
rename to src/raw/vim-zettel.wiki
diff --git a/src/kitaab-public/raw/vim2nix.wiki b/src/raw/vim2nix.wiki
similarity index 100%
rename from src/kitaab-public/raw/vim2nix.wiki
rename to src/raw/vim2nix.wiki
diff --git a/src/kitaab-public/raw/wallabag.wiki b/src/raw/wallabag.wiki
similarity index 100%
rename from src/kitaab-public/raw/wallabag.wiki
rename to src/raw/wallabag.wiki
diff --git a/src/kitaab-public/raw/way.wiki b/src/raw/way.wiki
similarity index 100%
rename from src/kitaab-public/raw/way.wiki
rename to src/raw/way.wiki
diff --git a/src/kitaab-public/raw/web-devel.wiki b/src/raw/web-devel.wiki
similarity index 100%
rename from src/kitaab-public/raw/web-devel.wiki
rename to src/raw/web-devel.wiki
diff --git a/src/kitaab-public/raw/webAppHacking.wiki b/src/raw/webAppHacking.wiki
similarity index 100%
rename from src/kitaab-public/raw/webAppHacking.wiki
rename to src/raw/webAppHacking.wiki
diff --git a/src/kitaab-public/raw/webdev.wiki b/src/raw/webdev.wiki
similarity index 100%
rename from src/kitaab-public/raw/webdev.wiki
rename to src/raw/webdev.wiki
diff --git a/src/kitaab-public/raw/webnotes.wiki b/src/raw/webnotes.wiki
similarity index 100%
rename from src/kitaab-public/raw/webnotes.wiki
rename to src/raw/webnotes.wiki
diff --git a/src/kitaab-public/raw/webquotes.wiki b/src/raw/webquotes.wiki
similarity index 100%
rename from src/kitaab-public/raw/webquotes.wiki
rename to src/raw/webquotes.wiki
diff --git a/src/kitaab-public/raw/week1.wiki b/src/raw/week1.wiki
similarity index 100%
rename from src/kitaab-public/raw/week1.wiki
rename to src/raw/week1.wiki
diff --git a/src/kitaab-public/raw/weights.wiki b/src/raw/weights.wiki
similarity index 100%
rename from src/kitaab-public/raw/weights.wiki
rename to src/raw/weights.wiki
diff --git a/src/kitaab-public/raw/work.wiki b/src/raw/work.wiki
similarity index 100%
rename from src/kitaab-public/raw/work.wiki
rename to src/raw/work.wiki
diff --git a/src/kitaab-public/raw/writing.wiki b/src/raw/writing.wiki
similarity index 100%
rename from src/kitaab-public/raw/writing.wiki
rename to src/raw/writing.wiki
diff --git a/src/kitaab-public/readme.md b/src/readme.md
similarity index 100%
rename from src/kitaab-public/readme.md
rename to src/readme.md
diff --git a/src/setup.py b/src/setup.py
index f2b75eb..418f8d8 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -3,8 +3,9 @@ from setuptools import setup
setup(
name='basant',
version='0.1',
+ author='Anish Lakhwara',
# TODO: broken because of import stuff, need to refactor app somehow
- # py_modules=['main', 'shared', 'grab', 'build'],
+ py_modules=['shared', 'grab', 'build'],
entry_points={
# module named build from which we call build in order to build
'console_scripts': ['build = build:build']
diff --git a/src/kitaab-public/shared/TagHelper.py b/src/shared/TagHelper.py
similarity index 87%
rename from src/kitaab-public/shared/TagHelper.py
rename to src/shared/TagHelper.py
index 31ebb22..5280d17 100644
--- a/src/kitaab-public/shared/TagHelper.py
+++ b/src/shared/TagHelper.py
@@ -2,10 +2,31 @@ from ctags import CTags, TagEntry
import sys
from icecream import ic
from os import listdir, path
-from shared.censor.py import privateList
+from shared.censor import privateList
# TODO don't hardcode the path
+censor = privateList
+
+
+def getAllFiles():
+ files = [f for f in listdir(
+ '/home/anish/vimwiki') if '.wiki' in f and path.isfile('/home/anish/vimwiki/' + f)]
+ files = set(files)
+ return files
+
+
+def untaggedFiles(AllFileList=getAllFiles()):
+ toFilter = filter + censor
+ tagList = getAllTags()
+ doNotTakeFiles = set()
+ for mask in toFilter:
+ try:
+ doNotTakeFiles.update(tagList[mask])
+ except KeyError:
+ print("Key not found: {}".format(mask))
+ return set.difference(AllFileList, doNotTakeFiles)
+
def loadTagFile(path='/home/anish/vimwiki/.vimwiki_tags'):
# Available file information keys:
@@ -67,13 +88,6 @@ def getAllFilesWithTags():
return makeSetFromTags(loadTagFile())
-def getAllFiles():
- files = [f for f in listdir(
- '/home/anish/vimwiki') if '.wiki' in f and path.isfile('/home/anish/vimwiki/' + f)]
- files = set(files)
- return files
-
-
def getUntaggedFiles():
allFiles = getAllFiles()
allTags = getAllFilesWithTags()
diff --git a/src/kitaab-public/grab/__init__.py b/src/shared/__init__.py
similarity index 100%
rename from src/kitaab-public/grab/__init__.py
rename to src/shared/__init__.py
diff --git a/src/shared/config.py b/src/shared/config.py
new file mode 100644
index 0000000..58594a0
--- /dev/null
+++ b/src/shared/config.py
@@ -0,0 +1,25 @@
+content_folder = ['raw']
+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
+build_folder = "output/"
+assets_folder = "asset/"
+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"
+name_of_site = "Kitaab"
+site_meta_description = ""
+twitter_name = "@aynish@merveilles.town"
+home_name = "Home"
+see_all = "See more"
+go_back = "Go back to"
+date_format = "EU" # Choose between EU day-month-year or ISO year-mont-day
+# True or False, if True, all files will be written in the root of the website
+flat_build = True
diff --git a/src/shared/helpers.py b/src/shared/helpers.py
new file mode 100644
index 0000000..6060b23
--- /dev/null
+++ b/src/shared/helpers.py
@@ -0,0 +1,13 @@
+import random
+
+
+def generateBlocks(size=1):
+ # Generates a length size unicode string that is formed from blocks
+ charList = ['▐', '░', '▒', '▓', '▔', '▕', '▖▗',
+ '▘▙', '▚', '▛', '▜', '▝', '▞', '▟']
+ ret = ""
+ while size > 0:
+ size = size - 1
+ rand = random.randint(0, 13)
+ ret = ret + charList[rand]
+ return ret
diff --git a/src/kitaab-public/grab/tag-fixer.py b/src/shared/tag-fixer.py
similarity index 92%
rename from src/kitaab-public/grab/tag-fixer.py
rename to src/shared/tag-fixer.py
index 21d985d..5e5a415 100644
--- a/src/kitaab-public/grab/tag-fixer.py
+++ b/src/shared/tag-fixer.py
@@ -1,19 +1,18 @@
-#! /usr/bin/env python3
+#! /usr/bin/env python3
import ctags
from ctags import CTags, TagEntry
import sys
from icecream import ic
-import os
import shutil
-import fileinput
-
+
+
def loadTagFile(path='.vimwiki_tags'):
# Available file information keys:
# opened - was the tag file successfully opened?
# error_number - errno value when 'opened' is false
# format - format of tag file (1 = original, 2 = extended)
- # sort - how is the tag file sorted?
+ # sort - how is the tag file sorted?
# author - name of author of generating program (may be empy string)
# name - name of program (may be empy string)
# url - URL of distribution (may be empy string)
@@ -25,6 +24,7 @@ def loadTagFile(path='.vimwiki_tags'):
print("No tagfile at {}".farmat(path))
sys.exit(1)
+
def loopThrough(tagFile):
# Available TagEntry keys:
# name - name of tag
@@ -33,11 +33,11 @@ def loopThrough(tagFile):
# lineNumber - line number in source file of tag definition (may be zero if not known)
# kind - kind of tag (none if not known)
# fileScope - is tag of file-limited scope?
-
- # Note: other keys will be assumed as an extension key and will
- # return None if no such key is found
+
+ # Note: other keys will be assumed as an extension key and will
+ # return None if no such key is found
''' Entries that are less than 1 character in length are errors
- Returns a set containing of all the files with errors in their tags'''
+ Returns a set containing of all the files with errors in their tags'''
entry = TagEntry()
tag = tagFile.next(entry)
tagErrors = set()
@@ -52,6 +52,7 @@ def loopThrough(tagFile):
ic(errorTagNames)
return tagErrors
+
def fixErrors(errors):
''' Replaces :: with :, which seems to be the error for many of the tags '''
fileBase = '/home/anish/vimwiki/'
@@ -70,6 +71,7 @@ def fixErrors(errors):
print()
print(newFile)
+
def printErrors(errors):
fileBase = '/home/anish/vimwiki/'
for v in errors:
@@ -79,9 +81,11 @@ def printErrors(errors):
f.readline()
ic(f.readline())
+
def getFileName(f):
return str(f, encoding="utf-8")
+
def getBackupFiles(errors):
fileBase = '/home/anish/vimwiki/'
backupBase = '/home/anish/vimwiki/jrnl/'
@@ -91,10 +95,11 @@ def getBackupFiles(errors):
print("Moving {} from backup".format(f))
shutil.copy(backupBase + f, fileBase + f)
-if __name__=='__main__':
+
+if __name__ == '__main__':
tagFile = loadTagFile()
errors = loopThrough(tagFile)
printErrors(errors)
- #ic(errors)
- #getBackupFiles(errors)
- #fixErrors(errors)
+ # ic(errors)
+ # getBackupFiles(errors)
+ # fixErrors(errors)