diginaut/digimarks
1
0
Fork 0
mirror of https://github.com/aquatix/digimarks.git synced 2025-12-07 03:45:10 +01:00
Code Issues Releases Wiki Activity

Fail-safe way for getting tags, even if userkey is invalid

Browse Source
This commit is contained in:
Michiel Scholten
2016-08-01 15:22:12 +02:00
parent 00c0e77c52
commit 7864cddd32
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
digimarks.py
View File

@@ -198,20 +198,12 @@ def get_tags_for_user(userkey):
return clean_tags(tags) return clean_tags(tags)
def request_vars(userkey): def get_cached_tags(userkey):
def decorator(fn): """ Fail-safe way to get the cached tags for `userkey` """
def wrapped_function(*args, **kwargs): try:
message = request.args.get('message') return all_tags[userkey]
try: except KeyError:
tags = all_tags[userkey] return []
tags = {}
except KeyError:
tags = {}
return fn(*args, **kwargs)
return update_wrapper(wrapped_function, fn)
return decorator
#request_vars = decorator(get_request_vars)
@app.errorhandler(404) @app.errorhandler(404)
@@ -227,7 +219,6 @@ def index():
@app.route('/<userkey>', methods=['GET', 'POST']) @app.route('/<userkey>', methods=['GET', 'POST'])
@app.route('/<userkey>/sort/<sortmethod>', methods=['GET', 'POST']) @app.route('/<userkey>/sort/<sortmethod>', methods=['GET', 'POST'])
@request_vars(userkey)
def bookmarks(userkey, sortmethod = None): def bookmarks(userkey, sortmethod = None):
""" User homepage, list their bookmarks, optionally filtered and/or sorted """ """ User homepage, list their bookmarks, optionally filtered and/or sorted """
#return object_list('bookmarks.html', Bookmark.select()) #return object_list('bookmarks.html', Bookmark.select())
@@ -237,7 +228,9 @@ def bookmarks(userkey, sortmethod = None):
# return render_template('bookmarks.html', bookmarks) # return render_template('bookmarks.html', bookmarks)
#else: #else:
# abort(404) # abort(404)
#message = request.args.get('message') message = request.args.get('message')
tags = get_cached_tags(userkey)
if request.method == 'POST': if request.method == 'POST':
filter_on = request.form['filter'] filter_on = request.form['filter']
bookmarks = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.title.contains(filter_on), bookmarks = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.title.contains(filter_on),
@@ -270,7 +263,8 @@ def editbookmark(userkey, urlhash):
# bookmark = getbyurlhash() # bookmark = getbyurlhash()
bookmark = Bookmark.get(Bookmark.url_hash == urlhash, Bookmark.userkey == userkey) bookmark = Bookmark.get(Bookmark.url_hash == urlhash, Bookmark.userkey == userkey)
message = request.args.get('message') message = request.args.get('message')
return render_template('edit.html', action='Edit bookmark', userkey=userkey, bookmark=bookmark, message=message, formaction='edit', tags=all_tags[userkey]) tags = get_cached_tags(userkey)
return render_template('edit.html', action='Edit bookmark', userkey=userkey, bookmark=bookmark, message=message, formaction='edit', tags=tags)
@app.route('/<userkey>/add') @app.route('/<userkey>/add')
@@ -278,7 +272,8 @@ def addbookmark(userkey):
""" Bookmark add form """ """ Bookmark add form """
bookmark = Bookmark(title='', url='', tags='') bookmark = Bookmark(title='', url='', tags='')
message = request.args.get('message') message = request.args.get('message')
return render_template('edit.html', action='Add bookmark', userkey=userkey, bookmark=bookmark, tags=all_tags[userkey], message=message) tags = get_cached_tags(userkey)
return render_template('edit.html', action='Add bookmark', userkey=userkey, bookmark=bookmark, tags=tags, message=message)
def updatebookmark(userkey, request, urlhash = None): def updatebookmark(userkey, request, urlhash = None):
@@ -328,16 +323,17 @@ def updatebookmark(userkey, request, urlhash = None):
#@app.route('/<userkey>/adding') #@app.route('/<userkey>/adding')
def addingbookmark(userkey): def addingbookmark(userkey):
""" Add the bookmark from form submit by /add """ """ Add the bookmark from form submit by /add """
tags = get_cached_tags(userkey)
if request.method == 'POST': if request.method == 'POST':
bookmark = updatebookmark(userkey, request) bookmark = updatebookmark(userkey, request)
if not bookmark: if not bookmark:
return redirect(url_for('addbookmark', userkey=userkey, message='No url provided', tags=all_tags[userkey])) return redirect(url_for('addbookmark', userkey=userkey, message='No url provided', tags=tags))
if type(bookmark).__name__ == 'Response': if type(bookmark).__name__ == 'Response':
return bookmark return bookmark
all_tags[userkey] = get_tags_for_user(userkey) all_tags[userkey] = get_tags_for_user(userkey)
return redirect(url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash)) return redirect(url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash))
return redirect(url_for('addbookmark', userkey=userkey, tags=all_tags[userkey])) return redirect(url_for('addbookmark', userkey=userkey, tags=tags))
@app.route('/<userkey>/<urlhash>/editing', methods=['GET', 'POST']) @app.route('/<userkey>/<urlhash>/editing', methods=['GET', 'POST'])
@@ -348,7 +344,7 @@ def editingbookmark(userkey, urlhash):
bookmark = updatebookmark(userkey, request, urlhash=urlhash) bookmark = updatebookmark(userkey, request, urlhash=urlhash)
all_tags[userkey] = get_tags_for_user(userkey) all_tags[userkey] = get_tags_for_user(userkey)
return redirect(url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash)) return redirect(url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash))
return redirect(url_for('add')) return redirect(url_for('editbookmark', userkey=userkey, urlhash=urlhash))
@app.route('/<userkey>/<urlhash>/delete', methods=['GET', 'POST']) @app.route('/<userkey>/<urlhash>/delete', methods=['GET', 'POST'])
@@ -366,8 +362,7 @@ def deletingbookmark(userkey, urlhash):
@app.route('/<userkey>/tags') @app.route('/<userkey>/tags')
def tags(userkey): def tags(userkey):
""" Overview of all tags used by user """ """ Overview of all tags used by user """
tags = get_tags_for_user(userkey) tags = get_cached_tags(userkey)
print(tags)
return render_template('tags.html', tags=tags, userkey=userkey) return render_template('tags.html', tags=tags, userkey=userkey)