All pages apparently working :)

app/agora.py

@@ -31,8 +31,7 @@ def help():
 
 @bp.route('/nodes')
 def nodes():
-    # current_app.logger.warning('Config: %s' % config.AGORA_PATH)
+    return render_template('nodes.html', nodes=db.all_nodes(include_journals=False))
-    return render_template('nodes.html', nodes=db.all_nodes())
 
 @bp.route('/notes') # alias
 @bp.route('/subnodes')
@@ -45,7 +44,7 @@ def users():
 
 @bp.route('/journals')
 def journals():
-    return render_template('subnodes.html', nodes=db.all_journals())
+    return render_template('nodes.html', nodes=db.all_journals())
 
 @bp.route('/today')
 def today():
@@ -56,7 +55,7 @@ def today():
 @bp.route('/user/<user>')
 @bp.route('/@<user>')
 def user(user):
-    return render_template('subnodes.html', nodes=db.subnodes_by_user(user))
+    return render_template('subnodes.html', subnodes=db.subnodes_by_user(user))
 
 @bp.route('/garden/<garden>')
 def garden(garden):

app/db.py

@@ -16,6 +16,7 @@ import glob
 import re
 import os
 from . import config
+from collections import defaultdict
 from operator import attrgetter
 
 RE_WIKILINKS = re.compile('\[\[(.*?)\]\]')
@@ -56,6 +57,9 @@ class Node:
         self.url = '/node/' + self.uri
         self.subnodes = []
 
+    def size(self):
+        return len(self.subnodes)
+
 class Subnode:
     """A subnode is a note or media resource volunteered by a user of the Agora.
     It maps to a particular file in the Agora repository, stored (relative to 
@@ -102,24 +106,41 @@ def content_to_outlinks(content):
         return []
 
 def all_subnodes():
-    l = sorted([f for f in glob.glob(os.path.join(config.AGORA_PATH, '**/*.md'), recursive=True)])
+    subnodes = [Subnode(f) for f in glob.glob(os.path.join(config.AGORA_PATH, '**/*.md'), recursive=True)]
-    return [Subnode(f) for f in l]
+    return sorted(subnodes, key=lambda x: x.uri.lower())
 
-def all_nodes():
+def all_nodes(include_journals=True):
-    # hack hack.
+    # first we fetch all subnodes, put them in a dict {wikilink -> [subnode]}.
-    l = all_subnodes()
+    # hack hack -- there's something in itertools better than this.
-    return sorted([Node(sn.wikilink) for sn in l], key=attrgetter('wikilink'))
+    wikilink_to_subnodes = defaultdict(list)
+    for subnode in all_subnodes():
+        wikilink_to_subnodes[subnode.wikilink].append(subnode)
+
+    # then we iterate over its values and construct nodes for each list of subnodes.
+    nodes = []
+    for wikilink in wikilink_to_subnodes:
+        node = Node(wikilink)
+        node.subnodes = wikilink_to_subnodes[wikilink]
+        nodes.append(node)
+
+    # remove journals if so desired.
+    if not include_journals:
+        nodes = [node for node in nodes if not re.search('[0-9]+?-[0-9]+?-[0-9]+?', node.wikilink)]
+
+    # TODO: experiment with other ranking.
+    # return sorted(nodes, key=lambda x: -x.size())
+    return sorted(nodes, key=lambda x: x.wikilink)
 
 def all_users():
     # hack hack.
     users = os.listdir(os.path.join(config.AGORA_PATH, 'garden'))
-    return sorted([User(u) for u in users], key=attrgetter('uri'))
+    return sorted([User(u) for u in users], key=lambda x: x.uri.lower())
 
 def all_journals():
     # hack hack.
-    l = all_subnodes()
+    nodes = all_nodes()
-    # return sorted([sn for sn in l], key=attrgetter('wikilink'), reverse=True)
+    nodes = [node for node in nodes if re.search('[0-9]+?-[0-9]+?-[0-9]+?', node.wikilink)]
-    return sorted([f for f in glob.glob(os.path.join(config.AGORA_PATH, '**/????-??-??.md'), recursive=True)])
+    return sorted(nodes, key=attrgetter('wikilink'), reverse=True)
 
 def nodes_by_wikilink(wikilink):
     nodes = [node for node in all_nodes() if node.wikilink == wikilink]

app/templates/nodes.html

@@ -18,9 +18,6 @@
 <h1> Nodes </h1>
 {% block content %}
 {% for node in nodes %}
-{% for subnode in node.subnodes %}} 
+<a href="{{node.url}}">{{node.wikilink}}</a> ({{node.size()}})<br />
-{% subnode.user %}
-{% endfor %}
-<a href="{{node.url}}">{{node.wikilink}}</a><br />
 {% endfor %}
 {% endblock %}