almost good

Author: isnok

asciidrumming/assemble.py

@@ -15,12 +15,30 @@ def clean_phrases(phrases):
     for phrase in phrases.values():
         phrase['pattern'] = phrase['pattern'].replace(' ', '')
 
+from .config import find_config_files
+import yaml
+
+def load_phrases(name):
+    files = find_config_files(name)
+    phrases = {}
+    pieces = {}
+    for name in reversed(files):
+        with open(name) as fh:
+            cfg = yaml.load(fh)
+            phrases.update(cfg['phrases'])
+            pieces.update(cfg['pieces'])
+    return phrases, pieces
+
 def assemble_phrases(config):
-    pieces = config.pop('pieces')
-    phrases = config['phrases']
+    phrases, pieces = load_phrases('phrases.yaml')
+    if 'pieces' in config:
+        pieces.update(config.pop('pieces'))
+    phrases.update(config.get('phrases', {}))
     pieces = assemble_pieces(phrases, pieces)
     phrases.update(pieces)
     clean_phrases(phrases)
+    config['phrases'] = phrases
+
 
 
 def assemble_verses(composition):

asciidrumming/default/composition.yaml

@@ -0,0 +1,50 @@
+initial:
+    bpm: 60
+    #shuffle: false
+
+phrases:
+
+    pause:
+        beat: 1
+        pattern: .
+
+    don:
+        beat: 4
+        pattern: D...
+
+    donkon:
+        beat: 4
+        pattern: D.K.
+
+    dokodoko:
+        beat: 4
+        pattern: dkdk
+
+    dondoko:
+        beat: 4
+        pattern: D.dk
+
+    dokonko:
+        beat: 4
+        pattern: Dk.k
+
+    _2_trioles:
+        beat: 3
+        pattern: dkd kdk
+
+    damdamdam:
+        beat: 4
+        pattern: D.K. D..k dkdk D.r.
+
+pieces:
+
+    _4_dondoko: dondoko * 4
+    _4_dokonko: dokonko * 4
+    fuchi: dondoko * 3 + dokonko
+    _4_trioles: _2_trioles * 2
+
+verses:
+    - taiko: fuchi
+    - taiko: fuchi
+    - taiko: don
+

asciidrumming/default/phrases.yaml

@@ -0,0 +1,40 @@
+phrases:
+
+    pause:
+        beat: 1
+        pattern: .
+
+    don:
+        beat: 4
+        pattern: D...
+
+    donkon:
+        beat: 4
+        pattern: D.K.
+
+    dokodoko:
+        beat: 4
+        pattern: dkdk
+
+    dondoko:
+        beat: 4
+        pattern: D.dk
+
+    dokonko:
+        beat: 4
+        pattern: Dk.k
+
+    _2_trioles:
+        beat: 3
+        pattern: dkd kdk
+
+    damdamdam:
+        beat: 4
+        pattern: D.K. D..k dkdk D.r.
+
+pieces:
+
+    _4_dondoko: dondoko * 4
+    _4_dokonko: dokonko * 4
+    fuchi: dondoko * 3 + dokonko
+    _4_trioles: _2_trioles * 2

asciidrumming/drumming.py

@@ -21,7 +21,7 @@
 @click.option('--output', default=None, help='output file to write')
 @click.option('--voices', default='drumset.yaml', help='yaml voice configuration file (updates defaults)')
 @click.option('--silent', type=bool, default=False, help='do not play the song immediatley')
-@click.argument('composition')
+@click.argument('composition', default='composition.yaml')
 def main(bpm, composition, voices, silent, output=None):
     import yaml
     config = yaml.load(open(composition))

examples/simple_beats.song

@@ -0,0 +1,5 @@
+initial:
+    bpm: 80
+
+verses:
+    - taiko: _4_dondoko