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

memento tweak: ensure rel=memento link for timegate uses exact in Location (cdx original) as opposed to url from request

Browse Source
This commit is contained in:
Ilya Kreymer 2015-02-23 23:21:39 -08:00
parent 5d80d2d891
commit 39824711f0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pywb/framework/memento.py
View File

@ -74,10 +74,13 @@ class MementoRespMixin(object):
is_memento = (wbrequest.wb_url.type == wbrequest.wb_url.REPLAY) is_memento = (wbrequest.wb_url.type == wbrequest.wb_url.REPLAY)
link = [] link = []
req_url = wbrequest.wb_url.url
if is_memento or is_timegate: if is_memento or is_timegate:
url = req_url
if cdx: if cdx:
ts = cdx['timestamp'] ts = cdx['timestamp']
url = cdx['original']
# for top frame # for top frame
elif wbrequest.wb_url.timestamp: elif wbrequest.wb_url.timestamp:
ts = wbrequest.wb_url.timestamp ts = wbrequest.wb_url.timestamp
@ -91,13 +94,14 @@ class MementoRespMixin(object):
self.status_headers.headers.append(('Memento-Datetime', self.status_headers.headers.append(('Memento-Datetime',
http_date)) 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, link.append(self.make_memento_link(canon_link,
'memento', 'memento',
http_date)) http_date))
req_url = wbrequest.wb_url.url
if is_memento and is_timegate: if is_memento and is_timegate:
link.append(self.make_link(req_url, 'original timegate')) link.append(self.make_link(req_url, 'original timegate'))
else: else: