backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 06:59:52 +01:00
Code Issues Projects Releases Activity

webagg: store original 'source' value in cdx for properly mapping in WARC file resolver

Browse Source 
error handling: ensure 'last_exc' is a string
This commit is contained in:
Ilya Kreymer 2016-06-14 00:13:01 -04:00
parent 4c7da0f6ef
commit c1d7111841
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webagg/app.py
View File

@ -74,6 +74,8 @@ class ResAggApp(object):
res = self.json_encode(res, out_headers) res = self.json_encode(res, out_headers)
if errs: if errs:
if 'last_exc' in errs:
errs['last_exc'] = str(errs['last_exc'])
out_headers['ResErrors'] = json.dumps(errs) out_headers['ResErrors'] = json.dumps(errs)
start_response('200 OK', list(out_headers.items())) start_response('200 OK', list(out_headers.items()))

3
webagg/responseloader.py
View File

@ -187,7 +187,8 @@ class WARCPathLoader(BaseLoader):
if not cdx.get('filename') or cdx.get('offset') is None: if not cdx.get('filename') or cdx.get('offset') is None:
return None return None
cdx._formatter = ParamFormatter(params, cdx.get('source')) orig_source = cdx.get('source', '').split(':')[0]
cdx._formatter = ParamFormatter(params, orig_source)
failed_files = [] failed_files = []
headers, payload = (self.resolve_loader. headers, payload = (self.resolve_loader.