From 777f55f2018c3b465e74830301ee1c910d811710 Mon Sep 17 00:00:00 2001 From: Anastasia Aizman Date: Thu, 4 Jan 2018 19:34:44 -0500 Subject: [PATCH] add - pass in colls_dir instead of hardcoding (#268) --- pywb/apps/frontendapp.py | 6 +++++- pywb/manager/autoindex.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pywb/apps/frontendapp.py b/pywb/apps/frontendapp.py index 7fb02e99..2defe115 100644 --- a/pywb/apps/frontendapp.py +++ b/pywb/apps/frontendapp.py @@ -144,7 +144,11 @@ class FrontEndApp(object): return from pywb.manager.autoindex import AutoIndexer - indexer = AutoIndexer(interval=int(auto_interval)) + + colls_dir = self.warcserver.root_dir if self.warcserver.root_dir else None + + indexer = AutoIndexer(colls_dir=colls_dir, interval=int(auto_interval)) + if not os.path.isdir(indexer.root_path): msg = 'No managed directory "{0}" for auto-indexing' logging.error(msg.format(indexer.root_path)) diff --git a/pywb/manager/autoindex.py b/pywb/manager/autoindex.py index 26ea37b8..c50d30d1 100644 --- a/pywb/manager/autoindex.py +++ b/pywb/manager/autoindex.py @@ -12,8 +12,8 @@ class AutoIndexer(object): EXT_RX = re.compile('.*\.w?arc(\.gz)?$') AUTO_INDEX_FILE = 'autoindex.cdxj' - def __init__(self, interval=30, keep_running=True): - self.manager = CollectionsManager('', must_exist=False) + def __init__(self, colls_dir=None, interval=30, keep_running=True): + self.manager = CollectionsManager('', colls_dir=colls_dir, must_exist=False) self.root_path = self.manager.colls_dir