-
+
+ {{panel|safe}} {% if patch['cables'] %} {{patch['cables']|safe}} {% endif %}
+
+
01
- Description skjdflkajsdkfLabore aliqua ut sit consequat veniam ut do ad nulla.Ad labore mollit ut cillum cillum est. In ex nostrud esse sit fugiat elit qui. Enim do laboris irure in sint deserunt irure culpa ad officia eu est non. Officia reprehenderit labore excepteur non. Exercitation aliqua commodo exercitation quis deserunt exercitation esse eiusmod excepteur sint consectetur fugiat nisi dolore. Eiusmod adipisicing aliqua veniam eu ullamco anim duis labore commodo cupidatat voluptate nisi mollit. Tempor fugiat in enim culpa ut veniam veniam.
+
+ Description skjdflkajsdkfLabore aliqua ut sit consequat veniam ut do ad
+ nulla.Ad labore mollit ut cillum cillum est. In ex nostrud esse sit fugiat
+ elit qui. Enim do laboris irure in sint deserunt irure culpa ad officia eu
+ est non. Officia reprehenderit labore excepteur non. Exercitation aliqua
+ commodo exercitation quis deserunt exercitation esse eiusmod excepteur sint
+ consectetur fugiat nisi dolore. Eiusmod adipisicing aliqua veniam eu ullamco
+ anim duis labore commodo cupidatat voluptate nisi mollit. Tempor fugiat in
+ enim culpa ut veniam veniam.
+
-
+
02
Description
@@ -92,7 +119,7 @@
-
+
03
Description
@@ -125,7 +152,7 @@
-
+
04
Description
@@ -158,7 +185,7 @@
-
+
05
Description
diff --git a/templates/patches.html b/templates/patches.html
index deb9a57..ddbc2f4 100644
--- a/templates/patches.html
+++ b/templates/patches.html
@@ -1,65 +1,90 @@
-
- {{instrument}}
- {{instrument}}
+
-
+
+
diff --git a/workbook.py b/workbook.py
index 73cd375..033c2fa 100644
--- a/workbook.py
+++ b/workbook.py
@@ -4,10 +4,13 @@ import yaml
from yaml.loader import SafeLoader
import os
+import json
+from pathlib import Path
+
app = Flask(__name__)
-def create_instrument(name, description, params, panel):
+def create_instrument(name, description, params, sockets, panel):
slug = secure_filename(name)
os.mkdir(f'instruments/{slug}')
os.mkdir(f'instruments/{slug}/patches')
@@ -16,11 +19,12 @@ def create_instrument(name, description, params, panel):
"name": name,
"slug": slug,
"description": description,
- "params": params
+ "params": params,
+ "sockets": sockets
}
with open(f'instruments/{slug}/model.yml', 'w') as f:
- yaml.dump(instrument, f)
+ yaml.dump(instrument, f, sort_keys=False)
panel.save(f'instruments/{slug}/panel.svg')
@@ -46,6 +50,7 @@ def patches(instrument):
patches = []
+
for filename in os.listdir(f'instruments/{instrument}/patches'):
with open(f'instruments/{instrument}/patches/{filename}') as f:
patch = yaml.load(f, Loader=SafeLoader)
@@ -60,10 +65,13 @@ def add_instrument():
name = request.form.get('name')
description = request.form.get('description')
- params = request.form.get('params').split(',')
+
+ params = json.loads(request.form.get('params'))
+ sockets = json.loads(request.form.get('sockets'))
+
panel = request.files['panel']
- create_instrument(name, description, params, panel)
+ create_instrument(name, description, params, sockets, panel)
return redirect(url_for('workbook'))
return render_template('add_instrument.html')
@@ -71,24 +79,45 @@ def add_instrument():
@app.route("/workbook//add", methods=['GET', 'POST'])
def add_patch(instrument):
-
-
if request.method == 'POST':
patch = request.form.to_dict()
- with open(f'instruments/{instrument}/patches/{secure_filename(patch["name"])}.yml', 'w') as f:
+ patch = {k: v for k, v in patch.items() if v}
+
+ slug = secure_filename(patch["name"])
+ patch['slug'] = slug
+
+
+ with open(f'instruments/{instrument}/patches/{slug}.yml', 'w') as f:
yaml.dump(patch, f)
return redirect(url_for('patches', instrument=instrument))
+ with open(f'instruments/{instrument}/panel.svg') as f:
+ panel = f.read()
with open(f'instruments/{instrument}/model.yml') as f:
instrument = yaml.load(f, Loader=SafeLoader)
- return render_template('add_patch.html', instrument=instrument)
+
+ return render_template('add_patch.html', instrument=instrument, panel=panel)
@app.route("/workbook//")
def patch(instrument, name):
- return render_template('patch.html', instrument=instrument, name=name)
+
+
+ with open(f'instruments/{instrument}/panel.svg') as f:
+ panel = f.read()
+
+ with open(f'instruments/{instrument}/patches/{name}.yml') as f:
+ patch = yaml.load(f, Loader=SafeLoader)
+
+ with open(f'instruments/{instrument}/model.yml') as f:
+ instrument = yaml.load(f, Loader=SafeLoader)
+
+
+
+
+ return render_template('patch.html', instrument=instrument, patch=patch, panel=panel)
}})
+