curls follow redirects. file listings have days to removal
This commit is contained in:
21
code/app.py
21
code/app.py
@@ -13,7 +13,7 @@ from revprox import ReverseProxied
|
||||
from utils import *
|
||||
|
||||
|
||||
__FLEES_VERSION__ = "20190203.0"
|
||||
__FLEES_VERSION__ = "20190830.0"
|
||||
app = Flask(__name__)
|
||||
app.config.from_object(__name__)
|
||||
config_values = read_config(app)
|
||||
@@ -321,7 +321,7 @@ def file_details(name, token):
|
||||
return share
|
||||
files = []
|
||||
for file in iter_folder_files(share['path'], version_folder = app.config['VERSION_FOLDER']):
|
||||
status = file_stat(share['path'],file)
|
||||
status = file_stat(share,file)
|
||||
files.append(status)
|
||||
return jsonify(files), 200
|
||||
|
||||
@@ -382,8 +382,9 @@ def file_ls(name, token):
|
||||
maxlen = max(maxlen, len(file))
|
||||
details = []
|
||||
details.append(
|
||||
"%%16s %%8s %%-%ds %%s"%( maxlen, )%(
|
||||
"%%16s %%4s %%8s %%-%ds %%s"%( maxlen, )%(
|
||||
'Modified',
|
||||
'ToRm',
|
||||
'Size',
|
||||
'Name',
|
||||
'Type',
|
||||
@@ -391,10 +392,11 @@ def file_ls(name, token):
|
||||
)
|
||||
details.append("="*80)
|
||||
for file in files:
|
||||
status = file_stat(share['path'],file)
|
||||
status = file_stat(share,file)
|
||||
details.append(
|
||||
"%%16s %%8s %%-%ds %%s"%( maxlen, )%(
|
||||
"%%16s %%4s %%8s %%-%ds %%s"%( maxlen, )%(
|
||||
status['mtime'],
|
||||
status['to_remove'],
|
||||
status['hsize'],
|
||||
status['name'],
|
||||
status['mime'],
|
||||
@@ -438,7 +440,7 @@ def list_view(name, token = None):
|
||||
for file in iter_folder_files(share['path'], version_folder = app.config['VERSION_FOLDER']):
|
||||
if file_autoremove(file, share, notify):
|
||||
continue
|
||||
status = file_stat(share['path'],file)
|
||||
status = file_stat(share,file)
|
||||
status.update({
|
||||
'token': get_direct_token(share, file),
|
||||
})
|
||||
@@ -465,7 +467,8 @@ def list_view(name, token = None):
|
||||
direct = allow_direct,
|
||||
expire = get_or_none('expire', share),
|
||||
description = get_or_none('description', share, ""),
|
||||
script_api = script_api
|
||||
script_api = script_api,
|
||||
autoremove = get_or_none('autoremove', share, 0)
|
||||
)
|
||||
|
||||
|
||||
@@ -605,7 +608,7 @@ def script_download(name = None, token = None):
|
||||
return share
|
||||
commands = []
|
||||
for file in iter_folder_files(share['path'], version_folder = app.config['VERSION_FOLDER']):
|
||||
status = file_stat(share['path'], file)
|
||||
status = file_stat(share, file)
|
||||
commands.append('get_file "%s"'%(
|
||||
status['url'],
|
||||
))
|
||||
@@ -625,7 +628,7 @@ def script_direct(name = None, token = None):
|
||||
return share
|
||||
commands = []
|
||||
for file in iter_folder_files(share['path'], version_folder = app.config['VERSION_FOLDER']):
|
||||
status = file_stat(share['path'], file)
|
||||
status = file_stat(share, file)
|
||||
commands.append('get_file "%s" "%s"'%(
|
||||
status['url'],
|
||||
get_direct_token(share, file)
|
||||
|
||||
Reference in New Issue
Block a user