From f93f1e52e5bd0239fc63aa1a98171f9ed0d87417 Mon Sep 17 00:00:00 2001 From: Louis Date: Wed, 4 Jun 2014 18:53:11 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20d'un=20bug=20:=20Gestion=20du=20ca?= =?UTF-8?q?s=20o=C3=B9=20'content'=20est=20vide.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- songbook_core/build.py | 4 ++-- songbook_core/data/examples/example-all.sb | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 songbook_core/data/examples/example-all.sb diff --git a/songbook_core/build.py b/songbook_core/build.py index c4ca638f..4101341b 100755 --- a/songbook_core/build.py +++ b/songbook_core/build.py @@ -100,11 +100,11 @@ class Songbook(object): "song", os.path.relpath( filename, - os.path.join(self.config['datadir'], 'songs'), + os.path.join(self.config['datadir'][0], 'songs'), )) for filename in recursive_find( - os.path.join(self.config['datadir'], 'songs'), + os.path.join(self.config['datadir'][0], 'songs'), '*.sg', ) ] diff --git a/songbook_core/data/examples/example-all.sb b/songbook_core/data/examples/example-all.sb new file mode 100644 index 00000000..327ed801 --- /dev/null +++ b/songbook_core/data/examples/example-all.sb @@ -0,0 +1,14 @@ +{ +"bookoptions" : [ + "importantdiagramonly", + "repeatchords", + "lilypond", + "pictures" + ], +"booktype" : "chorded", +"lang" : "french", +"authwords" : { + "sep" : ["and", "et"] + }, + "datadir" : "." +}