From cca9071c539c7ee2dd00a52c2cabfa9a1789b500 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Tue, 31 Dec 2013 21:01:18 +0000 Subject: [PATCH] minor tweaks, increase num closest searched, upper case url check css remove fixed pos --- pywb/indexreader.py | 2 +- pywb/replay.py | 8 ++++++-- pywb/wbarchivalurl.py | 6 +++++- static/wb.css | 1 - 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pywb/indexreader.py b/pywb/indexreader.py index a757788a..26c1e190 100644 --- a/pywb/indexreader.py +++ b/pywb/indexreader.py @@ -66,7 +66,7 @@ class RemoteCDXServer: return response @staticmethod - def getQueryParams(wburl, limit = '150000', collapseTime = '10', replayClosest = '10'): + def getQueryParams(wburl, limit = '150000', collapseTime = '10', replayClosest = '200'): return { ArchivalUrl.QUERY: diff --git a/pywb/replay.py b/pywb/replay.py index fe49cce8..e1a9af5a 100644 --- a/pywb/replay.py +++ b/pywb/replay.py @@ -112,8 +112,11 @@ class ReplayHandler(object): # Case 4: if headers record is actually empty (eg empty revisit), then use headers from revisit if not headersRecord.httpHeaders: - headersRecord.close() + headersRecord.stream.close() headersRecord = payloadRecord + else: + headersRecord.stream.close() + isRevisit = True @@ -221,7 +224,8 @@ class RewritingReplayHandler(ReplayHandler): # print e finally: - value = [out.getvalue().encode(encoding)] + content = out.getvalue().encode(encoding) + value = [content] newHeaders.append(('Content-Length', str(len(value[0])))) out.close() diff --git a/pywb/wbarchivalurl.py b/pywb/wbarchivalurl.py index ecc07f13..450e5ac2 100644 --- a/pywb/wbarchivalurl.py +++ b/pywb/wbarchivalurl.py @@ -27,6 +27,8 @@ class ArchivalUrl: >>> repr(ArchivalUrl('/https://example.com/xyz')) "('latest_replay', '', '', 'https://example.com/xyz', '/https://example.com/xyz')" + >>> repr(ArchivalUrl('/https://example.com/xyz?a=%2f&b=%2E')) + "('latest_replay', '', '', 'https://example.com/xyz?a=%2f&b=%2E', '/https://example.com/xyz?a=%2f&b=%2E')" # Query Urls # ====================== @@ -92,7 +94,9 @@ class ArchivalUrl: elif not '://' in self.url: self.url = ArchivalUrl.DEFAULT_SCHEME + self.url - matcher = rfc3987.match(self.url, 'IRI') + # BUG?: adding upper() because rfc3987 lib rejects lower case %-encoding + # %2F is fine, but %2f -- standard supports either + matcher = rfc3987.match(self.url.upper(), 'IRI') if not matcher: raise wbexceptions.BadUrlException('Bad Request Url: ' + self.url) diff --git a/static/wb.css b/static/wb.css index 7ae92277..0e72df78 100644 --- a/static/wb.css +++ b/static/wb.css @@ -2,7 +2,6 @@ #_wayback_banner { display: block; - position: fixed; top: 0px; width: 100%; border: 1px solid;