new song format

Author: isnok

asciidrumming/assemble.py

@@ -1,3 +1,28 @@
+def assemble_pieces(phrases, pieces):
+    env = {k: v['pattern'] for k, v in phrases.items()}
+    assembled = {}
+    for name, term in pieces.items():
+        for word in term.split():
+            if word in env:
+                beat = phrases[word]['beat']
+                break
+        else:
+            raise RuntimeError('invalid piece: {}'.format(term))
+        assembled[name] = dict(beat=beat, pattern=eval(term, env))
+    return assembled
+
+def clean_phrases(phrases):
+    for phrase in phrases.values():
+        phrase['pattern'] = phrase['pattern'].replace(' ', '')
+
+def assemble_phrases(config):
+    pieces = config.pop('pieces')
+    phrases = config['phrases']
+    pieces = assemble_pieces(phrases, pieces)
+    phrases.update(pieces)
+    clean_phrases(phrases)
+
+
 def assemble_verses(composition):
     effective = {
         'bpm': 80,

asciidrumming/drumming.py

@@ -7,6 +7,7 @@
 #from sample import make_simple_instrument
 #from sample import make_advanced_instrument
 
+from .assemble import assemble_phrases
 from .assemble import assemble_verses
 from .assemble import render_verses
 
@@ -22,12 +23,15 @@
 @click.option('--silent', type=bool, default=False, help='do not play the song immediatley')
 @click.argument('composition')
 def main(bpm, composition, voices, silent, output=None):
-    config = parse_composition(composition)
+    import yaml
+    config = yaml.load(open(composition))
+    #config = parse_composition(composition)
     if bpm > 0:
         config['initial']['bpm'] = bpm
-    pprint.pprint(config)
+    config.update(load_voices(voices))
 
-    pprint.pprint(load_voices(voices))
+    assemble_phrases(config)
+    pprint.pprint(config)
 
     song = assemble_verses(config)
     pprint.pprint(song)

examples/simple_beats.song

@@ -0,0 +1,62 @@
+[initial] # default, but a good test case
+
+bpm: 60
+
+#shuffle: false
+
+[phrases]
+
+4_dondoko: beat=4
+D.dkD.dk
+D.dkD.dk
+
+dondoko: beat=4
+D.dk
+
+dokonko: beat=4
+Dk.k
+
+4_dokonko: beat=4
+Dk.kDk.k
+Dk.kDk.k
+
+shuffle: beat=4 shuffle=0.1
+d.k.
+d.k.
+d.k.
+d.k.
+
+4_trioles: beat=3
+dkd kdk
+dkd kdk
+
+damdamdam: beat=4
+D.K.
+D..k
+dkdk
+D.r.
+
+[verses]
+
+taiko: 4_dondoko
+--
+taiko: 4_dondoko
+--
+shime: 4_dondoko
+taiko: 4_dondoko
+--
+shime: 4_dokonko
+--
+shime: 4_trioles
+--
+shime: 4_dondoko
+--
+taiko: 4_dokonko
+shime: 4_dondoko
+--
+bpm: +20
+taiko: 4_dondoko
+shime: 4_dokonko
+--
+shime: 4_dondoko
+taiko: 4_dondoko

examples/simple_beats.yaml

@@ -0,0 +1,68 @@
+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: _4_dondoko
+
+    - taiko: _4_dondoko
+
+    - shime: _4_dondoko
+      taiko: _4_dondoko
+
+    - shime: fuchi
+
+    - shime: _4_trioles
+
+    - shime: _4_dondoko
+
+    - taiko: _4_dokonko
+      shime: _4_dondoko
+
+    - bpm: +20
+      taiko: _4_dondoko
+      shime: _4_dokonko
+
+    - shime: _4_dondoko
+      taiko: _4_dondoko