Compare commits
3 Commits
6cddcbbc1b
...
2a45ad1a1b
Author | SHA1 | Date |
---|---|---|
Tim Van Baak | 2a45ad1a1b | |
Tim Van Baak | b0d14a89ca | |
Tim Van Baak | f663291067 |
|
@ -3,7 +3,15 @@ Logic for managing documents.
|
|||
"""
|
||||
import os
|
||||
|
||||
from redstring.parser import load, DocumentTag, DocumentTab, Document, TabOptions, TagOptions
|
||||
from redstring.parser import (
|
||||
Document,
|
||||
DocumentTab,
|
||||
DocumentTag,
|
||||
DocumentSubtag,
|
||||
load,
|
||||
TabOptions,
|
||||
TagOptions,
|
||||
)
|
||||
|
||||
|
||||
def generate_index_document(directory: str) -> Document:
|
||||
|
@ -12,31 +20,48 @@ def generate_index_document(directory: str) -> Document:
|
|||
"""
|
||||
categories: dict = {}
|
||||
|
||||
# categories = {
|
||||
# tab_name: {
|
||||
# tag_name: {
|
||||
# 'documents': [ (id, title), ... ]
|
||||
# 'subtags': {
|
||||
# subtag_name: [ (id, title), ... ]
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
|
||||
for filename in os.listdir(directory):
|
||||
with open(os.path.join(directory, filename)) as f:
|
||||
document: Document = load(f)
|
||||
|
||||
# Check if this document specifies a tab, and create it if necessary.
|
||||
if category_tag := document.get_tag('category'):
|
||||
category = category_tag.value
|
||||
category_name = category_tag.value
|
||||
else:
|
||||
category = 'index'
|
||||
if category not in categories:
|
||||
categories[category] = {}
|
||||
category_tab = categories[category]
|
||||
category_name = 'index'
|
||||
if category_name not in categories:
|
||||
categories[category_name] = {}
|
||||
destination_category = categories[category_name]
|
||||
|
||||
# Check if this document specifies a topic, and create it if necessary.
|
||||
if topic_tag := document.get_tag('topic'):
|
||||
topic = topic_tag.value
|
||||
topic_name, subtopic_name = topic_tag.value, None
|
||||
else:
|
||||
topic = 'uncategorized'
|
||||
if '.' in topic:
|
||||
topic, subtopic = topic.split('.', maxsplit=1)
|
||||
topic_name, subtopic_name = 'uncategorized', None
|
||||
if '.' in topic_name:
|
||||
topic_name, subtopic_name = topic_name.split('.', maxsplit=1)
|
||||
if topic_name not in destination_category:
|
||||
destination_category[topic_name] = {
|
||||
'documents': [],
|
||||
'subtopics': {},
|
||||
}
|
||||
if subtopic_name:
|
||||
if subtopic_name not in destination_category[topic_name]['subtopics']:
|
||||
destination_category[topic_name]['subtopics'][subtopic_name] = []
|
||||
destination_topic = destination_category[topic_name]['subtopics'][subtopic_name]
|
||||
else:
|
||||
subtopic = None
|
||||
if topic not in category_tab:
|
||||
category_tab[topic] = []
|
||||
topic_tag = category_tab[topic]
|
||||
destination_topic = destination_category[topic_name]['documents']
|
||||
|
||||
# Save the title and id.
|
||||
doc_id = document.get_tag('id').value
|
||||
|
@ -45,7 +70,7 @@ def generate_index_document(directory: str) -> Document:
|
|||
else:
|
||||
doc_title = None
|
||||
|
||||
topic_tag.append((doc_id, doc_title))
|
||||
destination_topic.append((doc_id, doc_title))
|
||||
|
||||
# Build an index document
|
||||
def document_link(info):
|
||||
|
@ -57,16 +82,24 @@ def generate_index_document(directory: str) -> Document:
|
|||
)
|
||||
|
||||
built_tabs: list = []
|
||||
for category in sorted(categories.keys()):
|
||||
for category_name, category in sorted(categories.items()):
|
||||
|
||||
built_tags: list = []
|
||||
|
||||
for topic in sorted(categories[category].keys()):
|
||||
docs = sorted(categories[category][topic], key=lambda x: x[0])
|
||||
for topic_name, topic in sorted(category.items()):
|
||||
docs = sorted(topic['documents'], key=lambda x: x[0])
|
||||
doc_links = map(document_link, docs)
|
||||
value = '- ' + '<br>- '.join(doc_links)
|
||||
built_tags.append(DocumentTag(topic, value))
|
||||
value = '- ' + '<br>- '.join(doc_links) if docs else ''
|
||||
|
||||
built_tabs.append(DocumentTab(category, built_tags))
|
||||
built_subtags: list = []
|
||||
for subtopic_name, subtopic in sorted(topic['subtopics'].items()):
|
||||
docs = sorted(subtopic, key = lambda x: x[0])
|
||||
doc_links = map(document_link, docs)
|
||||
subtag_value = '- ' + '<br>- '.join(doc_links) if docs else ''
|
||||
built_subtags.append(DocumentSubtag(subtopic_name, subtag_value))
|
||||
|
||||
built_tags.append(DocumentTag(topic_name, value, subtags=built_subtags))
|
||||
|
||||
built_tabs.append(DocumentTab(category_name, built_tags))
|
||||
|
||||
return Document(built_tabs)
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@ import json
|
|||
import logging
|
||||
import os
|
||||
import random
|
||||
import re
|
||||
import string
|
||||
|
||||
from flask import (
|
||||
|
@ -44,6 +45,14 @@ def inject_edit():
|
|||
return {'edit': current_app.config['edit']}
|
||||
|
||||
|
||||
@app.template_filter('interlink')
|
||||
def interlink_filter(value):
|
||||
return re.sub(
|
||||
r'\[\[([^|]+)\|([^|]+)\]\]',
|
||||
lambda match: f'<a href="{match[2]}">{match[1]}</a>',
|
||||
value)
|
||||
|
||||
|
||||
@app.route('/', methods=['GET'])
|
||||
def root():
|
||||
return redirect(url_for('index'))
|
||||
|
|
|
@ -63,10 +63,11 @@ window.onload = function () {
|
|||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{# TODO: tag.interlink #}
|
||||
{% macro make_tag_value(tag) -%}
|
||||
{%- if tag.options.hyperlink -%}
|
||||
<a href="{{ tag.value }}">{{ tag.value }}</a>
|
||||
{%- elif tag.options.interlink -%}
|
||||
{{ tag.value|interlink }}
|
||||
{%- else -%}
|
||||
{{ tag.value }}
|
||||
{%- endif -%}
|
||||
|
@ -76,6 +77,10 @@ window.onload = function () {
|
|||
{% block page_content %}
|
||||
<div id="tabs">
|
||||
|
||||
{%- if index and edit -%}
|
||||
<div id="new-document" class="tab"><a href="/new/">new</a></div>
|
||||
{%- endif -%}
|
||||
|
||||
{%- for tab in document -%}
|
||||
{%- if not tab.options.private or edit-%}
|
||||
{{ make_content_tab(tab, loop.first) }}
|
||||
|
|
Loading…
Reference in New Issue