diff --git a/code/app.py b/code/app.py index 3529d43..4142ed4 100644 --- a/code/app.py +++ b/code/app.py @@ -374,7 +374,7 @@ def file_direct(name, token, filename): return "-1", 403 token = get_direct_token(share, filename) url = url_for('download_direct', name = name, token = token, filename = filename ) - return app.config['PUBLIC_URL'] + url, 200 + return url, 200 @app.route('/file/ls//', methods=['GET']) diff --git a/code/templates/flip b/code/templates/flip index 02d1d82..10c91ce 100755 --- a/code/templates/flip +++ b/code/templates/flip @@ -110,8 +110,8 @@ _delete() { # name } _url() { # name - curl -s "$FLEES_ROOTURL/file/direct/$FLEES_SHARE/$FLEES_TOKEN/$1" - echo '' + file_path=$( curl -s "$FLEES_ROOTURL/file/direct/$FLEES_SHARE/$FLEES_TOKEN/$1" ) + echo $FLEES_ROOTURL$file_path } _msg() { echo "$@" >&2 @@ -147,6 +147,11 @@ ARG1="$1" ARG2="$2" ARG3="$3" CMD=list +# if stdout redirected, default to read +[ -t 1 ] || CMD=read +# if stdin comes from stream, default to write +[ -t 0 ] || CMD=write + [[ "$1" = "r" || "$1" = "read" ]] && { CMD=read; ARG1=$CMD; } [[ "$1" = "w" || "$1" = "write" ]] && { CMD=write; ARG1=$CMD; } [[ "$1" = "d" || "$1" = "delete" || "$1" = "del" ]] && { CMD=delete; ARG1=$CMD; } @@ -154,10 +159,6 @@ CMD=list [[ "$1" = "url" ]] && { CMD=url; ARG1=$CMD; } [[ "$1" = "update" ]] && { _update_client; } [[ "$1" = "h" || "$1" = "help" ]] && _help -# if stdout redirected, default to read -[ -t 1 ] || CMD=read -# if stdin comes from stream, default to write -[ -t 0 ] || CMD=write [[ "$CMD" = list ]] && { _list