jpt-archive/oyster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

_path_fixer for :// collapsing to :/

Browse Source
This commit is contained in:
James Turk 2011-09-21 15:33:30 -04:00
parent 0f0a7b838f
commit d5aac2323f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oyster/web.py
View File

@ -17,6 +17,12 @@ class JSONEncoder(json.JSONEncoder):
else: else:
return super(JSONEncoder, self).default(obj) return super(JSONEncoder, self).default(obj)
def _path_fixer(url):
""" this exists because werkzeug seems to collapse // into / sometimes
certainly a hack, but given that werkzeug seems to only do the mangling
*sometimes* being a bit aggressive was the only viable option
"""
return re.sub(r'(http|https|ftp):/([^/])', r'\1://\2', url)
def api_wrapper(template=None): def api_wrapper(template=None):
def wrapper(func): def wrapper(func):
@ -78,12 +84,14 @@ def tracked():
@app.route('/tracked/<path:url>') @app.route('/tracked/<path:url>')
def tracked_view(url): def tracked_view(url):
url = _path_fixer(url)
doc = client.db.tracked.find_one({'url': url}) doc = client.db.tracked.find_one({'url': url})
return json.dumps(doc, cls=JSONEncoder) return json.dumps(doc, cls=JSONEncoder)
@app.route('/doc/<path:url>/<version>') @app.route('/doc/<path:url>/<version>')
def show_doc(url, version): def show_doc(url, version):
url = _path_fixer(url)
if version == 'latest': if version == 'latest':
version = -1 version = -1
doc = client.get_version(url, version) doc = client.get_version(url, version)