flancian/garden
0
0
Fork 0
mirror of https://github.com/flancian/garden.git synced 2026-08-08 15:36:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add some more logging.

Browse Source
This commit is contained in:
Flancian
2021-03-07 20:55:49 +01:00
parent aef8fbbf52
commit 84185cf917
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/agora.py
+2 -2
View File
@@ -160,7 +160,7 @@ def jump():
@bp.route('/node/<node>') @bp.route('/node/<node>')
@bp.route('/node/<node>/uprank/<user_list>') @bp.route('/node/<node>/uprank/<user_list>')
def node(node,user_list=[]): def node(node,user_list=[]):
# current_app.logger.debug(f'Assembling node {node}.') current_app.logger.debug(f'[[{node}]]: Assembling node.')
if user_list: if user_list:
rank = user_list.split(",") rank = user_list.split(",")
else: else:
@@ -176,7 +176,7 @@ def node(node,user_list=[]):
search_subnodes = db.search_subnodes(node) search_subnodes = db.search_subnodes(node)
# current_app.logger.debug(f'Assembled node {node}.') current_app.logger.debug(f'[[{node}]]: Assembled node.')
return render_template( return render_template(
# yuck # yuck
'content.html', 'content.html',
app/db.py
+4 -2
View File
@@ -84,7 +84,7 @@ class Graph:
# @cache.memoize(timeout=30) # @cache.memoize(timeout=30)
@cachetools.func.ttl_cache(ttl=20) @cachetools.func.ttl_cache(ttl=20)
def nodes(self, include_journals=True): def nodes(self, include_journals=True):
current_app.logger.debug('Loading graph.') current_app.logger.debug('*** Loading graph.')
# returns a list of all nodes # returns a list of all nodes
# first we fetch all subnodes, put them in a dict {wikilink -> [subnode]}. # first we fetch all subnodes, put them in a dict {wikilink -> [subnode]}.
@@ -105,7 +105,7 @@ class Graph:
if not include_journals: if not include_journals:
nodes = [node for node in nodes if not util.is_journal(node.wikilink)] nodes = [node for node in nodes if not util.is_journal(node.wikilink)]
current_app.logger.debug('Graph loaded.') current_app.logger.debug('*** Graph loaded.')
# TODO: experiment with other ranking. # TODO: experiment with other ranking.
# return sorted(nodes, key=lambda x: -x.size()) # return sorted(nodes, key=lambda x: -x.size())
return sorted(nodes, key=lambda x: x.wikilink.lower()) return sorted(nodes, key=lambda x: x.wikilink.lower())
@@ -581,7 +581,9 @@ def subnodes_by_wikilink(wikilink, fuzzy_matching=True):
return subnodes return subnodes
def search_subnodes(query): def search_subnodes(query):
current_app.logger.debug(f'query: {query}, searching subnodes.')
subnodes = [subnode for subnode in G.subnodes() if subnode.mediatype == 'text/plain' and re.search(query, subnode.content, re.IGNORECASE)] subnodes = [subnode for subnode in G.subnodes() if subnode.mediatype == 'text/plain' and re.search(query, subnode.content, re.IGNORECASE)]
current_app.logger.debug(f'query: {query}, searched subnodes.')
return subnodes return subnodes
def search_subnodes_by_user(query, user): def search_subnodes_by_user(query, user):