1.1 --- a/moinformat/input/directory.py Mon Aug 13 22:54:01 2018 +0200
1.2 +++ b/moinformat/input/directory.py Tue Aug 14 22:33:30 2018 +0200
1.3 @@ -29,21 +29,21 @@
1.4
1.5 name = "directory"
1.6
1.7 - def __init__(self, parameters=None):
1.8 + def __init__(self, metadata):
1.9
1.10 - "Initialise the context with the given 'parameters'."
1.11 + "Initialise the context with the given 'metadata'."
1.12
1.13 - if not parameters or not parameters.has_key("filename"):
1.14 - raise ValueError, parameters
1.15 + if not metadata.has_key("input_filename"):
1.16 + raise ValueError, metadata
1.17
1.18 - Input.__init__(self, parameters)
1.19 - self.dir = Directory(parameters["filename"])
1.20 + Input.__init__(self, metadata)
1.21 + self.dir = Directory(metadata.get("input_filename"))
1.22
1.23 # Support an encoding of the level separator for the filesystem.
1.24 # Where it is the same as the directory separator, documents are stored
1.25 # using nested directories, not as a flat list.
1.26
1.27 - self.level_sep = parameters and parameters.get("separator") or sep
1.28 + self.level_sep = metadata.get("input_separator", sep)
1.29
1.30 def all(self):
1.31