Commit 45ad14f

committed

make sure input glob is converted to a list immediately

1 parent 9782ac2 commit 45ad14fCopy full SHA for 45ad14f

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import toml`
`6`	`6`
`7`	`7`	`from snippet.logs import logger`
	`8`	`+from snippet.util import ensure_list`
`8`	`9`
`9`	`10`
`10`	`11`	`class Config:`
`@@ -87,6 +88,8 @@ def get_config(config_paths=None, **options):`
`87`	`88`	`setattr(config, k, v)`
`88`	`89`
`89`	`90`	`# validate and set IO directories that are relative to project root`
`90`		`- config.input_glob = os.path.abspath(os.path.join(config.project_root, config.input_glob))`
	`91`	`+ config.input_glob = [`
	`92`	`+ os.path.abspath(os.path.join(config.project_root, pattern)) for pattern in ensure_list(config.input_glob)`
	`93`	`+ ]`
`91`	`94`	`config.output_dir = os.path.abspath(os.path.join(config.project_root, config.output_dir))`
`92`	`95`	`return config`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ def write_example(config: Config, example_name, example_block):`
`20`	`20`
`21`	`21`	`output_file_name = pystache.render(`
`22`	`22`	`config.output_file_name_template,`
`23`		`- name=example_name.strip().replace(' ', '')`
	`23`	`+ name=example_name.strip().replace(' ', '_').lower()`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`if not os.path.exists(config.output_dir):`
`@@ -41,8 +41,7 @@ def load_file_lines(path):`
`41`	`41`
`42`	`42`	`def find_files(config: Config):`
`43`	`43`	`"""Finds input file paths, according to the config"""`
`44`		`- globs = config.input_glob if isinstance(config.input_glob, list) else [config.input_glob]`
`45`	`44`	`files = []`
`46`		`- for glob_pattern in globs:`
	`45`	`+ for glob_pattern in config.input_glob:`
`47`	`46`	`files.extend(glob.glob(glob_pattern, recursive=True))`
`48`	`47`	`return files`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+def ensure_list(item):`
	`2`	`+ return item if isinstance(item, list) else [item]`

Comments

(0)