X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fconfig.py;h=3609d34666b3d99c3a9f18a332fbe4590737498a;hb=af6ee17b251b1ae074e1eca5d80c7a599ee88536;hp=c57406ba1601e11901b337e43b8ba6a01d60c340;hpb=f914b910cf3f1bd2940a664a67ede3683ba9e1fb;p=m_librarian.git

diff --git a/m_librarian/config.py b/m_librarian/config.py
index c57406b..3609d34 100755
--- a/m_librarian/config.py
+++ b/m_librarian/config.py
@@ -1,32 +1,52 @@
 #! /usr/bin/env python
 
-__all__ = ['ml_conf']
+__all__ = ['get_config']
 
 import os
 from ConfigParser import SafeConfigParser
 
-config_dirs = []
-if 'XDG_CONFIG_HOME' in os.environ:
-    config_dirs.append(os.environ['XDG_CONFIG_HOME'])
-if 'XDG_CONFIG_DIRS' in os.environ:
-    config_dirs.extend(os.environ['XDG_CONFIG_DIRS'].split(':'))
-home_config = os.path.expanduser('~/.config')
-if home_config not in config_dirs:
-    config_dirs.append(home_config)
-
-for d in config_dirs:
-    ml_conf_file = os.path.join(d, 'm_librarian.conf')
-    if os.path.exists(ml_conf_file):
-        ml_conf = SafeConfigParser()
-        ml_conf.read(ml_conf_file)
-        break
-else:
-    ml_conf = ml_conf_file = None
+
+def _find_config_dirs_posix():
+    config_dirs = []
+    if 'XDG_CONFIG_HOME' in os.environ:
+        config_dirs.append(os.environ['XDG_CONFIG_HOME'])
+    if 'XDG_CONFIG_DIRS' in os.environ:
+        config_dirs.extend(os.environ['XDG_CONFIG_DIRS'].split(':'))
+    home_config = os.path.expanduser('~/.config')
+    if home_config not in config_dirs:
+        config_dirs.append(home_config)
+    return config_dirs
+
+
+def find_config_dirs():
+    if os.name == 'posix':
+        return _find_config_dirs_posix()
+    raise OSError("Unknow OS")
+
+
+def find_config_file(config_dirs=None):
+    if config_dirs is None:
+        config_dirs = find_config_dirs()
+    for d in config_dirs:
+        ml_conf_file = os.path.join(d, 'm_librarian.conf')
+        if os.path.exists(ml_conf_file):
+            return ml_conf_file
+    else:
+        raise IOError("Cannot find m_librarian.conf in %s" % config_dirs)
+
+
+def get_config(config_filename=None):
+    if config_filename is None:
+        config_filename = find_config_file()
+    ml_conf = SafeConfigParser()
+    ml_conf.read(config_filename)
+    return ml_conf
 
 
 def test():
+    config_dirs = find_config_dirs()
     print "Config dirs:", config_dirs
-    print "Config file:", ml_conf_file
+    print "Config file:", find_config_file(config_dirs)
 
 if __name__ == '__main__':
     test()