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

misc fixes: RemoteCDXServer throws NotFoundException on 404

Browse Source 
fix typo in handlers
make WBHandler overridable in pywb_init
make perms_policy optional in IndexReader
This commit is contained in:
Ilya Kreymer 2014-03-17 17:35:10 -07:00
parent 2e7b17ed56
commit 52d99aef57
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pywb/cdx/cdxsource.py
View File

@ -1,7 +1,7 @@
from pywb.utils.binsearch import iter_range from pywb.utils.binsearch import iter_range
from pywb.utils.loaders import SeekableTextFileReader from pywb.utils.loaders import SeekableTextFileReader
from pywb.utils.wbexception import AccessException from pywb.utils.wbexception import AccessException, NotFoundException
from query import CDXQuery from query import CDXQuery
import urllib import urllib
@ -72,6 +72,9 @@ class RemoteCDXSource(CDXSource):
else 'Excluded') else 'Excluded')
raise AccessException(msg) raise AccessException(msg)
elif e.code == 404:
msg = 'No Captures found for: ' + query.url
raise NotFoundException(msg)
else: else:
raise raise

2
pywb/core/handlers.py
View File

@ -26,7 +26,7 @@ class WBHandler(WbUrlHandler):
self.query_view = html_view self.query_view = html_view
if not self.query_view: if not self.query_view:
self.query_view = text_query_view self.query_view = self.text_query_view
self.search_view = search_view self.search_view = search_view

2
pywb/core/indexreader.py
View File

@ -12,7 +12,7 @@ class IndexReader(object):
Creates an appropriate query based on wbrequest type info Creates an appropriate query based on wbrequest type info
""" """
def __init__(self, cdx_server, perms_policy): def __init__(self, cdx_server, perms_policy=None):
self.cdx_server = cdx_server self.cdx_server = cdx_server
self.perms_policy = perms_policy self.perms_policy = perms_policy

4
pywb/core/pywb_init.py
View File

@ -106,7 +106,9 @@ def create_wb_handler(cdx_server, config, ds_rules_file=None):
search_view = load_template_file(config.get('search_html'), search_view = load_template_file(config.get('search_html'),
'Search Page') 'Search Page')
wb_handler = WBHandler( wb_handler_class = config.get('wb_handler_class', WBHandler)
wb_handler = wb_handler_class(
cdx_server, cdx_server,
replayer, replayer,
html_view=html_view, html_view=html_view,