Git-Mirrors/mat2-web
1
0
Fork 0
mirror of https://0xacab.org/jvoisin/mat2-web.git synced 2025-02-24 09:09:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed urljoin

Browse Source
This commit is contained in:
Jan Friedli 2020-06-26 16:51:53 +02:00
parent e20ae95502
commit 1779c978a6
No known key found for this signature in database
GPG Key ID: F945FA2FCA30549D
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
matweb/rest_api.py
View File

@ -6,10 +6,9 @@ import zipfile
from uuid import uuid4 from uuid import uuid4
from flask import after_this_request, send_from_directory from flask import after_this_request, send_from_directory
from flask_restful import Resource, reqparse, abort, request from flask_restful import Resource, reqparse, abort, request, url_for
from cerberus import Validator from cerberus import Validator
from werkzeug.datastructures import FileStorage from werkzeug.datastructures import FileStorage
from urllib.parse import urljoin
from matweb import file_removal_scheduler, utils from matweb import file_removal_scheduler, utils
@ -55,7 +54,13 @@ class APIUpload(Resource):
secret, secret,
meta, meta,
meta_after, meta_after,
urljoin(request.host_url, '%s/%s/%s/%s/%s' % ('api', 'download', key, secret, output_filename)) url_for(
'apidownload',
key=key,
secret=secret,
filename=output_filename,
_external=True
)
) )
@ -140,9 +145,12 @@ class APIBulkDownloadCreator(Resource):
'key': key, 'key': key,
'secret': secret, 'secret': secret,
'meta_after': meta_after, 'meta_after': meta_after,
'download_link': urljoin( 'download_link': url_for(
request.host_url, 'apidownload',
'%s/%s/%s/%s/%s' % ('api', 'download', key, secret, output_filename) key=key,
secret=secret,
filename=output_filename,
_external=True
) )
}, 201 }, 201