diff --git a/ahserver/filestorage.py b/ahserver/filestorage.py index 997614c..af6c85f 100644 --- a/ahserver/filestorage.py +++ b/ahserver/filestorage.py @@ -208,9 +208,14 @@ async def downloadfile2url(request, url, headers=None, params=None, data={}, met fpath = await downloadfile(url, headers=headers, params=params, data=data, method=method) fs = FileStorage() webpath = fs.webpath(fpath) - env = request._run_ns - url = env.entire_url('/idfile?path=') + env.quote(webpath) - return url + if request: + env = request._run_ns + url = env.entire_url('/idfile?path=') + env.quote(webpath) + return url + baseurl = get_baseurl() + if baseurl: + return f'{baseurl}/idfile?path={quote(webpath)}' + return f'/idfile?path={quote(webpath)}' def get_baseurl(): baseurl = os.environ.get('BASEURL') diff --git a/ahserver/processorResource.py b/ahserver/processorResource.py index 3f3515a..584daf6 100644 --- a/ahserver/processorResource.py +++ b/ahserver/processorResource.py @@ -198,6 +198,7 @@ class ProcessorResource(StaticResource,Url2File): portp = '' self._preurl = f'{self._scheme}://{self._host}{portp}{self._prepath}' request['base_url'] = self._preurl + os.environ.setdefault('BASEURL', self._preurl) # print(f'{request.path=}, {self._preurl=}')