mirror of
https://github.com/webrecorder/pywb.git
synced 2025-03-15 00:03:28 +01:00
misc fixes: RemoteCDXServer throws NotFoundException on 404
fix typo in handlers make WBHandler overridable in pywb_init make perms_policy optional in IndexReader
This commit is contained in:
parent
2e7b17ed56
commit
52d99aef57
@ -1,7 +1,7 @@
|
||||
from pywb.utils.binsearch import iter_range
|
||||
from pywb.utils.loaders import SeekableTextFileReader
|
||||
|
||||
from pywb.utils.wbexception import AccessException
|
||||
from pywb.utils.wbexception import AccessException, NotFoundException
|
||||
from query import CDXQuery
|
||||
|
||||
import urllib
|
||||
@ -72,6 +72,9 @@ class RemoteCDXSource(CDXSource):
|
||||
else 'Excluded')
|
||||
|
||||
raise AccessException(msg)
|
||||
elif e.code == 404:
|
||||
msg = 'No Captures found for: ' + query.url
|
||||
raise NotFoundException(msg)
|
||||
else:
|
||||
raise
|
||||
|
||||
|
@ -26,7 +26,7 @@ class WBHandler(WbUrlHandler):
|
||||
|
||||
self.query_view = html_view
|
||||
if not self.query_view:
|
||||
self.query_view = text_query_view
|
||||
self.query_view = self.text_query_view
|
||||
|
||||
self.search_view = search_view
|
||||
|
||||
|
@ -12,7 +12,7 @@ class IndexReader(object):
|
||||
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.perms_policy = perms_policy
|
||||
|
||||
|
@ -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 Page')
|
||||
|
||||
wb_handler = WBHandler(
|
||||
wb_handler_class = config.get('wb_handler_class', WBHandler)
|
||||
|
||||
wb_handler = wb_handler_class(
|
||||
cdx_server,
|
||||
replayer,
|
||||
html_view=html_view,
|
||||
|
Loading…
x
Reference in New Issue
Block a user