diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-11 17:46:23 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-11 17:46:23 +0000 |
commit | 85574cfbf06ffab46b511ec684b40fb8239b7807 (patch) | |
tree | 6596757f5eabfd708df0fc42de2320bb27517de0 /synapse/config/_base.py | |
parent | Implement .cancel_call_later() in MockClock (diff) | |
parent | Allow only one download for a given image at a time, so that we don't end up ... (diff) | |
download | synapse-85574cfbf06ffab46b511ec684b40fb8239b7807.tar.xz |
Merge pull request #23 from matrix-org/media_repository
Media repository
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r-- | synapse/config/_base.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 6870af10e8..1426436dcb 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,16 @@ class Config(object): ) return cls.abspath(file_path) + @staticmethod + def ensure_directory(dir_path): + if not os.path.exists(dir_path): + os.makedirs(dir_path) + if not os.path.isdir(dir_path): + raise ConfigError( + "%s is not a directory" % (dir_path,) + ) + return dir_path + @classmethod def read_file(cls, file_path, config_name): cls.check_file(file_path, config_name) @@ -57,6 +67,10 @@ class Config(object): return file_stream.read() @staticmethod + def default_path(name): + return os.path.abspath(os.path.join(os.path.curdir, name)) + + @staticmethod def read_config_file(file_path): with open(file_path) as file_stream: return yaml.load(file_stream) |