From b9f35e2a517ca565c07eb920d68dbc8ff0c3dc01 Mon Sep 17 00:00:00 2001 From: Ville Rantanen Date: Tue, 21 Aug 2018 15:31:49 +0300 Subject: [PATCH] better link for flip, maybe now, a little hack --- code/app.py | 10 ++++++++-- code/templates/flip | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/code/app.py b/code/app.py index 4142ed4..ea1bd5a 100644 --- a/code/app.py +++ b/code/app.py @@ -373,8 +373,14 @@ def file_direct(name, token, filename): if not allow_direct: return "-1", 403 token = get_direct_token(share, filename) - url = url_for('download_direct', name = name, token = token, filename = filename ) - return url, 200 + # url_for returns extra level of /../path if proxying with nginx + return "/".join(( + app.config['PUBLIC_URL'], + 'direct', + name, + token, + path2url(filename) + )), 200 @app.route('/file/ls//', methods=['GET']) diff --git a/code/templates/flip b/code/templates/flip index 10c91ce..ecf49dd 100755 --- a/code/templates/flip +++ b/code/templates/flip @@ -110,8 +110,8 @@ _delete() { # name } _url() { # name - file_path=$( curl -s "$FLEES_ROOTURL/file/direct/$FLEES_SHARE/$FLEES_TOKEN/$1" ) - echo $FLEES_ROOTURL$file_path + curl -s "$FLEES_ROOTURL/file/direct/$FLEES_SHARE/$FLEES_TOKEN/$1" + echo '' } _msg() { echo "$@" >&2