diff --git a/pywb/framework/memento.py b/pywb/framework/memento.py index e6962980..c9981a80 100644 --- a/pywb/framework/memento.py +++ b/pywb/framework/memento.py @@ -142,6 +142,10 @@ def make_timemap(wbrequest, cdx_lines): 'type="application/link-format"; from="{1}",\n') yield timemap.format(prefix + wbrequest.wb_url.to_str(), from_date) + # original link + original = '<{0}>; rel="original",\n' + yield original.format(url) + # timegate link timegate = '<{0}>; rel="timegate",\n' yield timegate.format(prefix + url) @@ -158,6 +162,6 @@ def make_timemap(wbrequest, cdx_lines): prev_cdx = cdx - # last memento link + # last memento link, if any if prev_cdx: yield make_memento_link(prev_cdx, prefix, end='') diff --git a/tests/test_memento.py b/tests/test_memento.py index f24aac8c..2cc3f1f3 100644 --- a/tests/test_memento.py +++ b/tests/test_memento.py @@ -140,17 +140,19 @@ class TestWb: lines = resp.body.split('\n') - assert len(lines) == 4 + assert len(lines) == 5 assert lines[0] == '; \ rel="self"; type="application/link-format"; from="Fri, 03 Jan 2014 03:03:21 GMT",' - assert lines[1] == '; rel="timegate",' + assert lines[1] == '; rel="original",' - assert lines[2] == '; \ + assert lines[2] == '; rel="timegate",' + + assert lines[3] == '; \ rel="memento"; datetime="Fri, 03 Jan 2014 03:03:21 GMT",' - assert lines[3] == '; \ + assert lines[4] == '; \ rel="memento"; datetime="Fri, 03 Jan 2014 03:03:41 GMT"' # Below functions test pywb proxy mode behavior