tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add generate_config_finder function

This commit is contained in:
ZyX 2014-07-10 20:32:39 +04:00
parent 289094362e
commit 768e64bcdb
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
powerline/__init__.py
View File

@ -108,6 +108,23 @@ def get_config_paths():
return config_paths
def generate_config_finder(get_config_paths=get_config_paths):
'''Generate find_config_file function
This function will find .json file given its path.
:param function get_config_paths:
Function that being called with no arguments will return a list of paths
that should be searched for configuration files.
:return:
Function that being given configuration file name will return full path
to it or raise IOError if it failed to find the file.
'''
config_paths = get_config_paths()
return lambda cfg_path: _find_config_file(config_paths, cfg_path)
class Powerline(object):
'''Main powerline class, entrance point for all powerline uses. Sets
powerline up and loads the configuration.
@ -157,8 +174,7 @@ class Powerline(object):
elif self.renderer_module[-1] == '.':
self.renderer_module = self.renderer_module[:-1]
config_paths = self.get_config_paths()
self.find_config_file = lambda cfg_path: _find_config_file(config_paths, cfg_path)
self.find_config_file = generate_config_finder(self.get_config_paths)
self.cr_kwargs_lock = Lock()
self.create_renderer_kwargs = {}

9
powerline/lint/__init__.py
View File

@ -1,7 +1,7 @@
# vim:fileencoding=utf-8:noet
from powerline.lint.markedjson import load
from powerline import _find_config_file as find_config_file, Powerline
from powerline import generate_config_finder, get_config_paths
from powerline.lib.config import load_json_config
from powerline.lint.markedjson.error import echoerr, MarkedError
from powerline.segments.vim import vim_modes
@ -1035,7 +1035,8 @@ theme_spec = (Spec(
def check(path=None, debug=False):
search_paths = [path] if path else Powerline.get_config_paths()
search_paths = [path] if path else get_config_paths()
find_config_file = generate_config_finder(lambda: search_paths)
logger = logging.getLogger('powerline-lint')
logger.setLevel(logging.DEBUG if debug else logging.ERROR)
@ -1092,7 +1093,7 @@ def check(path=None, debug=False):
hadproblem = False
try:
main_config = load_json_config(find_config_file(search_paths, 'config'), load=load_config, open_file=open_file)
main_config = load_json_config(find_config_file('config'), load=load_config, open_file=open_file)
except IOError:
main_config = {}
sys.stderr.write('\nConfiguration file not found: config.json\n')
@ -1108,7 +1109,7 @@ def check(path=None, debug=False):
import_paths = [os.path.expanduser(path) for path in main_config.get('common', {}).get('paths', [])]
try:
colors_config = load_json_config(find_config_file(search_paths, 'colors'), load=load_config, open_file=open_file)
colors_config = load_json_config(find_config_file('colors'), load=load_config, open_file=open_file)
except IOError:
colors_config = {}
sys.stderr.write('\nConfiguration file not found: colors.json\n')