# HG changeset patch # User drewp@bigasterisk.com # Date 1629581308 25200 # Node ID c7b59377ab356e6f33016752c4de1df10a98a4d7 # Parent b82432594778c20f21fd7a71d025077a12da8f3e reformat diff -r b82432594778 -r c7b59377ab35 lookup.py --- a/lookup.py Sat Aug 21 14:24:57 2021 -0700 +++ b/lookup.py Sat Aug 21 14:28:28 2021 -0700 @@ -6,7 +6,6 @@ and the add-bookmark stuff """ -from collections import defaultdict import datetime import json import logging @@ -15,19 +14,18 @@ import urllib.error import urllib.parse import urllib.request +from collections import defaultdict +import bottle +import pymongo from bottle import static_file from dateutil.tz import tzlocal -import bottle -import pymongo -import requests from jadestache import Renderer from link import Links, NotFound from pagetitle import PageTitle -db = pymongo.MongoClient(os.environ['MONGODB_SERVICE_HOST'], - tz_aware=True)['href'] +db = pymongo.MongoClient(os.environ['MONGODB_SERVICE_HOST'], tz_aware=True)['href'] pageTitle = PageTitle(db) links = Links(db) renderer = Renderer(search_dirs=['template'], debug=bottle.DEBUG) @@ -36,8 +34,7 @@ def getUser(): agent = bottle.request.headers.get('x-foaf-agent', None) - username = db['user'].find_one({'_id': agent - })['username'] if agent else None + username = db['user'].find_one({'_id': agent})['username'] if agent else None return username, agent @@ -122,17 +119,12 @@ prevDoc = None return { - 'description': - prevDoc['description'] if prevDoc else pageTitle.pageTitle(uri), - 'tag': - prevDoc['tag'] if prevDoc else '', - 'extended': - prevDoc['extended'] if prevDoc else '', - 'shareWith': - prevDoc.get('shareWith', []) if prevDoc else [], + 'description': prevDoc['description'] if prevDoc else pageTitle.pageTitle(uri), + 'tag': prevDoc['tag'] if prevDoc else '', + 'extended': prevDoc['extended'] if prevDoc else '', + 'shareWith': prevDoc.get('shareWith', []) if prevDoc else [], 'suggestedTags': ['tag1', 'tag2'], - 'existed': - prevDoc is not None, + 'existed': prevDoc is not None, } @@ -152,12 +144,7 @@ for t in allTags(params.user, withTags=haveTags): if partialTerm and partialTerm not in t['label']: continue - out.append({ - 'id': - t['label'], - 'text': - "%s (%s%s)" % (t['label'], t['count'], " left" if haveTags else "") - }) + out.append({'id': t['label'], 'text': "%s (%s%s)" % (t['label'], t['count'], " left" if haveTags else "")}) return {'tags': out} @@ -184,8 +171,7 @@ if getUser()[0] != user: raise ValueError("not logged in as %s" % user) print(repr(bottle.request.params.__dict__)) - doc = links.fromPostdata(bottle.request.params, user, - datetime.datetime.now(tzlocal())) + doc = links.fromPostdata(bottle.request.params, user, datetime.datetime.now(tzlocal())) links.insertOrUpdate(doc) print("notify about sharing to", repr(doc['shareWith'])) @@ -211,8 +197,7 @@ tags = parseTags(tags) log.info('userLinks user=%r tags=%r', user, tags) data = recentLinks(user, tags, allowEdit=getUser()[0] == user) - data['desc'] = ("%s's recent links" % user) + (" tagged %s" % - (tags, ) if tags else "") + data['desc'] = ("%s's recent links" % user) + (" tagged %s" % (tags,) if tags else "") data['toRoot'] = siteRoot() data['allTags'] = allTags(user) data['user'] = user