mirror of
https://github.com/webrecorder/pywb.git
synced 2025-03-15 08:04:49 +01:00
Merge branch 'develop' into config-work
This commit is contained in:
commit
a932235f85
@ -74,10 +74,13 @@ class MementoRespMixin(object):
|
||||
is_memento = (wbrequest.wb_url.type == wbrequest.wb_url.REPLAY)
|
||||
|
||||
link = []
|
||||
req_url = wbrequest.wb_url.url
|
||||
|
||||
if is_memento or is_timegate:
|
||||
url = req_url
|
||||
if cdx:
|
||||
ts = cdx['timestamp']
|
||||
url = cdx['original']
|
||||
# for top frame
|
||||
elif wbrequest.wb_url.timestamp:
|
||||
ts = wbrequest.wb_url.timestamp
|
||||
@ -91,13 +94,14 @@ class MementoRespMixin(object):
|
||||
self.status_headers.headers.append(('Memento-Datetime',
|
||||
http_date))
|
||||
|
||||
canon_link = wbrequest.urlrewriter.get_new_url(mod='', timestamp=ts)
|
||||
canon_link = wbrequest.urlrewriter.get_new_url(mod='',
|
||||
timestamp=ts,
|
||||
url=url)
|
||||
|
||||
link.append(self.make_memento_link(canon_link,
|
||||
'memento',
|
||||
http_date))
|
||||
|
||||
req_url = wbrequest.wb_url.url
|
||||
|
||||
if is_memento and is_timegate:
|
||||
link.append(self.make_link(req_url, 'original timegate'))
|
||||
else:
|
||||
|
@ -189,7 +189,7 @@ class J2HtmlCapturesView(J2TemplateView):
|
||||
|
||||
#=================================================================
|
||||
class MementoTimemapView(object):
|
||||
def render_response(self, wbrequest, cdx_lines):
|
||||
def render_response(self, wbrequest, cdx_lines, **kwargs):
|
||||
memento_lines = make_timemap(wbrequest, cdx_lines)
|
||||
return WbResponse.text_stream(memento_lines,
|
||||
content_type=LINK_FORMAT)
|
||||
|
Loading…
x
Reference in New Issue
Block a user