Git-Mirrors/mat2-web
1
0
Fork 0
mirror of https://0xacab.org/jvoisin/mat2-web.git synced 2025-08-03 19:54:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

added new property which indicates the remaining download time in secs

Browse source
This commit is contained in:
Jan Friedli 2020-05-15 14:38:13 +02:00
parent e75d9a7de5
commit 83618ff529
No known key found for this signature in database
GPG key ID: F945FA2FCA30549D
7 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
matweb/file_removal_scheduler.py
View file

@ -4,6 +4,8 @@ import sys
import os
import random
from matweb import utils
def run_file_removal_job(upload_folder_path):
if random.randint(0, 10) == 0:
@ -18,7 +20,7 @@ def delete_file_when_too_old(filepath):
last_time = time.time() - file_mod_time
# if file is older than our configured max timeframe, delete it
if last_time > int(os.environ.get('MAT2_MAX_FILE_AGE_FOR_REMOVAL', 15 * 60)):
if last_time > utils.get_file_removal_max_age_sec():
try:
os.remove(filepath)
except OSError:

2
matweb/rest_api.py
View file

@ -48,6 +48,7 @@ class APIUpload(Resource):
key, secret, meta_after, output_filename = utils.cleanup(parser, filepath, self.upload_folder)
return utils.return_file_created_response(
utils.get_file_removal_max_age_sec(),
output_filename,
mime,
key,
@ -133,6 +134,7 @@ class APIBulkDownloadCreator(Resource):
abort(500, message='Unable to clean %s' % mime)
key, secret, meta_after, output_filename = utils.cleanup(parser, zip_path, self.upload_folder)
return {
'inactive_after_sec': utils.get_file_removal_max_age_sec(),
'output_filename': output_filename,
'mime': mime,
'key': key,

6
matweb/utils.py
View file

@ -35,6 +35,7 @@ def check_upload_folder(upload_folder):
def return_file_created_response(
inactive_after_sec: int,
output_filename: str,
mime: str,
key: str,
@ -44,6 +45,7 @@ def return_file_created_response(
download_link: str
) -> dict:
return {
'inactive_after_sec': inactive_after_sec,
'output_filename': output_filename,
'mime': mime,
'key': key,
@ -106,3 +108,7 @@ def is_valid_api_download_file(filename: str, key: str, secret: str, upload_fold
if hmac.compare_digest(hash_file(complete_path, secret), key) is False:
abort(400, message='The file hash does not match')
return complete_path, filepath
def get_file_removal_max_age_sec() -> int:
return int(os.environ.get('MAT2_MAX_FILE_AGE_FOR_REMOVAL', 15 * 60))