1
0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00

auto_init: resolve rel paths only on init only if not http (though should support other protocols eventually)

This commit is contained in:
Ilya Kreymer 2015-03-20 20:14:21 +00:00
parent b43a7f94f3
commit d31ff68b93

View File

@ -1,4 +1,4 @@
from pywb.utils.loaders import load_yaml_config
from pywb.utils.loaders import load_yaml_config, is_http
from pywb.framework.archivalrouter import ArchivalRouter, Route
from pywb.framework.proxy import ProxyArchivalRouter
@ -158,12 +158,12 @@ class DirectoryCollsLoader(object):
def _norm_path(self, root_dir, path):
result = os.path.normpath(os.path.join(root_dir, path))
print(result)
return result
def _add_dir_if_exists(self, coll, root_dir, dir_key, required=False):
if dir_key in coll:
coll[dir_key] = self._norm_path(root_dir, coll[dir_key])
if not is_http(coll[dir_key]):
coll[dir_key] = self._norm_path(root_dir, coll[dir_key]) + os.path.sep
return False
thedir = self.config.get('paths')[dir_key]