From 0c85e5f8d76199b855924ddd789472a7221f64ba Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Sat, 9 Jan 2021 17:38:01 +0100 Subject: [PATCH] Move to marko rendering; change subnode URLs; and much more. --- app/agora.py | 40 ++++++++++++++-------- app/db.py | 13 +++++++- app/render.py | 51 +++++++++++++++++++++++++++++ app/static/css/screen-dark.css | 18 ++++++++++ app/templates/node_rendered.html | 10 ++++-- app/templates/node_search.html | 18 +++++----- app/templates/subnode_rendered.html | 37 +++++++++++++++++---- app/templates/user.html | 2 +- app/util.py | 18 +++++++--- 9 files changed, 168 insertions(+), 39 deletions(-) create mode 100644 app/render.py diff --git a/app/agora.py b/app/agora.py index 1b8a17e..3d9aeea 100644 --- a/app/agora.py +++ b/app/agora.py @@ -28,18 +28,7 @@ G = db.G @bp.route('/index') @bp.route('/') def index(): - node='index' - n = G.node(node) - n.subnodes = util.rank(n.subnodes, user='agora') - return render_template( - 'node_rendered.html', - node=n, - backlinks=n.back_links(), - pull_nodes=n.pull_nodes() if n else [], - pulling_nodes=n.pulling_nodes() if n else [], - pushing_nodes=n.pushing_nodes() if n else [], - forwardlinks=n.forward_links() if n else [], - ) + return redirect(url_for('.node', node='index')) @bp.route('/help') def help(): @@ -117,7 +106,8 @@ def jump(): def node(node): n = G.node(node) - n.subnodes = util.uprank(n.subnodes, user='flancian') + # earlier in the list means more highly ranked. + n.subnodes = util.uprank(n.subnodes, users=['agora', 'flancian']) search_subnodes = db.search_subnodes(node) @@ -133,8 +123,30 @@ def node(node): query=n.wikilink.replace('-', '%20') ) +@bp.route('/node/@') +@bp.route('/@/') +def subnode(node, user): + + n = G.node(node) + + n.subnodes = util.filter(n.subnodes, user) + search_subnodes = db.search_subnodes_by_user(node, user) + + return render_template( + 'subnode_rendered.html', + node=n, + #backlinks=n.back_links(), + #pull_nodes=n.pull_nodes() if n else [], + #forwardlinks=n.forward_links() if n else [], + #search=search_subnodes, + #pulling_nodes=n.pulling_nodes(), + #pushing_nodes=n.pushing_nodes(), + #query=n.wikilink.replace('-', '%20') + ) + + @bp.route('/subnode/') -def subnode(subnode): +def old_subnode(subnode): return render_template('subnode_rendered.html', subnode=db.subnode_by_uri(subnode), backlinks=db.subnodes_by_outlink(subnode)) @bp.route('/u/') diff --git a/app/db.py b/app/db.py index 778b75b..82c9e38 100644 --- a/app/db.py +++ b/app/db.py @@ -14,10 +14,10 @@ import cachetools.func import glob -import marko import re import os from . import config +from . import render from . import util from collections import defaultdict from fuzzywuzzy import fuzz @@ -212,6 +212,13 @@ class Subnode: # hack hack return 100-fuzz.ratio(self.wikilink, other.wikilink) + def render(self): + # hack hack + if self.uri.endswith('md') or self.uri.endswith('MD'): + return render.markdown(self.content) + if self.uri.endswith('org') or self.uri.endswith('ORG'): + return render.markdown(self.content) + def go(self): """ returns a set of go links contained in this subnode @@ -336,6 +343,10 @@ def search_subnodes(query): subnodes = [subnode for subnode in G.subnodes() if re.search(query, subnode.content, re.IGNORECASE)] return subnodes +def search_subnodes_by_user(query, user): + subnodes = [subnode for subnode in G.subnodes() if re.search(query, subnode.content, re.IGNORECASE) and subnode.user == user] + return subnodes + def subnodes_by_user(user): subnodes = [subnode for subnode in G.subnodes() if subnode.user == user] return subnodes diff --git a/app/render.py b/app/render.py new file mode 100644 index 0000000..040a807 --- /dev/null +++ b/app/render.py @@ -0,0 +1,51 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# This file contains renderers from the supported input formats. +# As of [[2020-01-09]]: +# - markdown +# - orgmode + +import re +from . import config +from . import util +from marko import Markdown, inline + + +# Markdown +class WikilinkElement(inline.InlineElement): + pattern = r'\[\[ *(.+?) *\]\]' + parse_children = True + + def __init__(self, match): + self.target = match.group(1) + +class WikilinkRendererMixin(object): + + # This name is magic; it must match render_. + def render_wikilink_element(self, element): + return '[[{}]]'.format( + # util.canonical_wikilink(self.escape_url(element.target)), self.render_children(element) + util.canonical_wikilink(element.target), self.render_children(element) + ) + +class Wikilinks(): + elements = [WikilinkElement] + renderer_mixins = [WikilinkRendererMixin] + +markdown = Markdown(extensions=[Wikilinks]) + + +# Org-mode goes here. diff --git a/app/static/css/screen-dark.css b/app/static/css/screen-dark.css index 279a2f1..ec3f98a 100644 --- a/app/static/css/screen-dark.css +++ b/app/static/css/screen-dark.css @@ -80,6 +80,19 @@ nav { font-family: sans-serif} .subnode-header { font-style: italic; margin-bottom: 1em; + display: flex; + width: 100%; + gap: 5px; +} + +.subnode-id { + text-align: left; + align: left; +} + +.subnode-links { + text-align: left; + align: left; } .links { @@ -137,6 +150,11 @@ nav { font-family: sans-serif} border-radius: 10px; } +.wikilink-marker { + /* deemphasize */ + font-weight: lighter; +} + /* hypothes.is This totally doesn't work, at all, and I have no idea why :) */ diff --git a/app/templates/node_rendered.html b/app/templates/node_rendered.html index 2e39a12..4c04766 100644 --- a/app/templates/node_rendered.html +++ b/app/templates/node_rendered.html @@ -31,10 +31,14 @@ Try listing all nodes or perhaps search Node [[{{node.uri}}]] + {% for subnode in node.subnodes %}
- Subnode {{subnode.uri}} by @{{subnode.user}} -{{ subnode.content|markdown|linkify|safe }} +
+ Subnode [[{{node.uri}}@{{subnode.user}}]] + (by @{{subnode.user}}) +
+{{ subnode.render()|linkify|safe }}
{% endfor %} @@ -47,7 +51,7 @@ Try listing all nodes or perhaps search Subnode {{subnode.uri}} by @{{subnode.user}} -{{ subnode.content|markdown|linkify|safe }} +{{ subnode.render()|linkify|safe }} {% endfor %} diff --git a/app/templates/node_search.html b/app/templates/node_search.html index ecb4433..a750afc 100644 --- a/app/templates/node_search.html +++ b/app/templates/node_search.html @@ -13,6 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. --> +
+ +
+Search (the internet)
+Google
+DuckDuckGo
+Wikipedia
+Twitter
+

@@ -27,13 +36,4 @@ No search results. {% endif %}
-
- -
-Search (the internet)
-Google
-DuckDuckGo
-Wikipedia
-Twitter
-
diff --git a/app/templates/subnode_rendered.html b/app/templates/subnode_rendered.html index 53fadd9..567b600 100644 --- a/app/templates/subnode_rendered.html +++ b/app/templates/subnode_rendered.html @@ -16,25 +16,50 @@ {% extends "base.html" %} {% block content %} -{% if not subnode %} + +{% if not subnode and not node %}
-No subnode found matching '{{subnode}}'. +No subnodes found matching '{{subnode}}'.

-Try listing subnodes or perhaps search. +Try listing nodes or perhaps search.
{% endif %} -{% if subnode %} + +{% if node %} +{% for subnode in node.subnodes %}
- Subnode {{subnode.uri}} by @{{subnode.user}} in node [[{{subnode.wikilink}}]] -{{ subnode.content|markdown|linkify|safe }} +
+ Subnode [[{{node.uri}}@{{subnode.user}}]] + (user) (up to node) (source) +
+{{ subnode.render()|linkify|safe }} +
+{% endfor %} +
+
+ To see links, go up to node [[{{node.uri}}]]. +
+
+{% endif %} + + + +{% if subnode %} +
+ Subnode [[{{subnode.uri}}]] by @{{subnode.user}} in node [[{{subnode.wikilink}}]] +{{ subnode.render()|linkify|safe }} +
To see links, go up to node [[{{subnode.wikilink}}]].
+ + {% endif %} + {% endblock %} diff --git a/app/templates/user.html b/app/templates/user.html index 1f556d4..c3ea262 100644 --- a/app/templates/user.html +++ b/app/templates/user.html @@ -34,7 +34,7 @@ Go back to /nodes? {% endif %} {% for subnode in subnodes %} -{{subnode.wikilink}}
+{{subnode.wikilink}}
{% endfor %} diff --git a/app/util.py b/app/util.py index e1f6ee0..9b9efb3 100644 --- a/app/util.py +++ b/app/util.py @@ -21,15 +21,20 @@ def rank(l, user): # hack hack return sorted(l, key=lambda x: x.user) -def uprank(l, user): +def uprank(l, users): # hack hack def score(n): - if n.user == user: - return -1 + if n.user in users: + # the earlier in the list a user comes, the more highly ranked it is. + return users.index(n.user) - len(users) - 1 return 0 return sorted(l, key=score) +def filter(l, projection): + # hack hack + return [n for n in l if n.user == projection] + def canonical_wikilink(wikilink): if is_journal(wikilink): @@ -42,10 +47,13 @@ def canonical_wikilink(wikilink): # hack hack wikilink = ( wikilink.lower() + # chars that convert to -, slug-like. .replace(' ', '-') - .replace('\'', '') - .replace(',', '') .replace('/', '-') + .replace('\'', '') + # chars that are elided. + .replace('%', '') + .replace(',', '') ) return wikilink