diff --git a/pywb/version.py b/pywb/version.py index 110613ce..6dd067a6 100644 --- a/pywb/version.py +++ b/pywb/version.py @@ -1,4 +1,4 @@ -__version__ = '2.4.1' +__version__ = '2.4.2-beta' if __name__ == '__main__': print(__version__) diff --git a/pywb/warcserver/index/indexsource.py b/pywb/warcserver/index/indexsource.py index cd12a5f4..67d96637 100644 --- a/pywb/warcserver/index/indexsource.py +++ b/pywb/warcserver/index/indexsource.py @@ -125,6 +125,9 @@ class RemoteIndexSource(BaseIndexSource): if 'closest' in params and self.closest_limit: api_url += '&limit=' + str(self.closest_limit) + if 'matchType' in params: + api_url += '&matchType=' + params.get('matchType') + return api_url def load_index(self, params): diff --git a/pywb/warcserver/index/test/test_indexsource.py b/pywb/warcserver/index/test/test_indexsource.py index 6998708f..1eeb14ba 100644 --- a/pywb/warcserver/index/test/test_indexsource.py +++ b/pywb/warcserver/index/test/test_indexsource.py @@ -110,6 +110,17 @@ com,instagram)/amaliaulman 20141014171954 https://webenact.rhizome.org/all/20141 assert(key_ts_res(res, 'load_url') == expected) assert(errs == {}) + # Url Match -- Remote Loaders + def test_remote_loader_with_prefix(self): + url = 'http://instagram.com/amaliaulman?__=1234234234' + remote_source = self.all_sources['remote_cdx'] + res, errs = self.query_single_source(remote_source, dict(url=url, closest='20141014162332', limit=1, allowFuzzy='0')) + + expected = """\ +com,instagram)/amaliaulman 20141014162333 https://webenact.rhizome.org/all/20141014162333id_/http://instagram.com/amaliaulman""" + + assert(key_ts_res(res, 'load_url') == expected) + assert(errs == {}) # Url Match -- Remote Loaders Closest def test_remote_closest_loader(self, remote_source): @@ -123,7 +134,7 @@ com,instagram)/amaliaulman 20141014162333 https://webenact.rhizome.org/all/20141 assert(errs == {}) # Url Match -- Wb Memento - def test_remote_closest_wb_memnto_loader(self): + def test_remote_closest_wb_memento_loader(self): replay = 'https://webenact.rhizome.org/all/{timestamp}id_/{url}' source = WBMementoIndexSource(replay, '', replay)