Add test and correct cwd

9 years ago · 6135ea8c3e
5 changed files with 5 additions and 2 deletions
--- a/patacrep/content/cwd.py
+++ b/patacrep/content/cwd.py
@ -25,8 +25,7 @@ def parse(keyword, config, argument, contentlist):
    old_songdir = config['_songdir']
    config['_songdir'] = (
        [DataSubpath("", argument)] +
-        [path.clone().join(argument) for path in config['_songdir']] +
-        config['_songdir']
+        [path.clone().join(argument) for path in config['_songdir']]
        )
    processed_content = process_content(contentlist, config)
    config['_songdir'] = old_songdir
--- a/test/test_content/cwd.control
+++ b/test/test_content/cwd.control
@ -0,0 +1 @@
+["subdir/chordpro.csg"]
--- a/test/test_content/cwd.source
+++ b/test/test_content/cwd.source
@ -0,0 +1 @@
+[["cwd(subdir)"]]
--- a/test/test_content/cwd_list.control
+++ b/test/test_content/cwd_list.control
@ -0,0 +1 @@
+["subdir/chordpro.csg"]
--- a/test/test_content/cwd_list.source
+++ b/test/test_content/cwd_list.source
@ -0,0 +1 @@
+[["cwd(subdir)", "exsong.sg", "intersong.is", "jsonlist.json", "texfile.tex", "texsong.tsg", "chordpro.csg", "subdir/chordpro.csg"]]
			`@ -0,0 +1 @@`
			`[["cwd(subdir)", "exsong.sg", "intersong.is", "jsonlist.json", "texfile.tex", "texsong.tsg", "chordpro.csg", "subdir/chordpro.csg"]]`