From 673ff35d1579f467fa5010d78503b1f9d7354f67 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Wed, 5 Mar 2014 17:13:14 -0800 Subject: [PATCH] minor fixes: wombat add document.WB_wombat_location loaders: file 'urls' starting with . and / are always file paths pep8 fixes for cdx, utils packages --- pywb/cdx/cdxobject.py | 3 ++- pywb/cdx/cdxops.py | 1 + pywb/static/wombat.js | 1 + pywb/utils/loaders.py | 3 ++- pywb/utils/wbexception.py | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pywb/cdx/cdxobject.py b/pywb/cdx/cdxobject.py index 837059df..c993a817 100644 --- a/pywb/cdx/cdxobject.py +++ b/pywb/cdx/cdxobject.py @@ -64,7 +64,8 @@ class CDXObject(OrderedDict): cdxformat = i if not cdxformat: - raise CDXException('unknown {0}-field cdx format'.format(len(fields))) + msg = 'unknown {0}-field cdx format'.format(len(fields)) + raise CDXException(msg) for header, field in itertools.izip(cdxformat, fields): self[header] = field diff --git a/pywb/cdx/cdxops.py b/pywb/cdx/cdxops.py index 3ef07b6a..4074ee29 100644 --- a/pywb/cdx/cdxops.py +++ b/pywb/cdx/cdxops.py @@ -253,6 +253,7 @@ def cdx_sort_closest(closest, cdx_iter, limit=10): # Fields to append from cdx original to revisit ORIG_TUPLE = ['length', 'offset', 'filename'] + def cdx_resolve_revisits(cdx_iter): """ resolve revisits. diff --git a/pywb/static/wombat.js b/pywb/static/wombat.js index d2b7d12c..52444b50 100644 --- a/pywb/static/wombat.js +++ b/pywb/static/wombat.js @@ -196,6 +196,7 @@ function WB_wombat_Init(replayPrefix, captureDate, origHost) WB_wombat_origHost = "http://" + origHost; window.WB_wombat_location = WB_CopyLocationObj(window.self.location); + document.WB_wombat_location = window.WB_wombat_location; if (window.self.location != window.top.location) { diff --git a/pywb/utils/loaders.py b/pywb/utils/loaders.py index ee71894b..ad1aeb12 100644 --- a/pywb/utils/loaders.py +++ b/pywb/utils/loaders.py @@ -47,7 +47,8 @@ class BlockLoader(object): Load a file-like reader from the local file system """ - file_only = False + # if starting with . or /, can only be a file path.. + file_only = url.startswith(('/', '.')) if url.startswith('file://'): url = url[len('file://'):] diff --git a/pywb/utils/wbexception.py b/pywb/utils/wbexception.py index bec5000d..a31002b5 100644 --- a/pywb/utils/wbexception.py +++ b/pywb/utils/wbexception.py @@ -1,3 +1,5 @@ + + #================================================================= class WbException(Exception): def status(self):