Fix channels and description with blank lines

[perso/Immae/Projets/Python/MusicSampler.git] / helpers / __init__.py

diff --git a/helpers/__init__.py b/helpers/__init__.py
index b1723ee8e51c169ef5ccd922169a0e4ecefb6340..d0d3f46f5588d92677ecd7bc3e4a072fc103a9b3 100644 (file)
--- a/helpers/__init__.py
+++ b/helpers/__init__.py
@@ -14,6 +14,8 @@ def parse_config(mapping):
 
     file_lock = Lock("file")
 
+    channel_id = 0
+
     for mapped_key in config['keys']:
         key = mapping.find_by_unicode(mapped_key)
         if key is None:
@@ -39,7 +41,8 @@ def parse_config(mapping):
                 if argument == 'file':
                     filename = action[action_name]['file']
                     if filename not in seen_files:
-                        seen_files[filename] = MusicFile(filename, file_lock)
+                        seen_files[filename] = MusicFile(filename, file_lock, channel_id)
+                        channel_id = channel_id + 1
 
                     action_args['music'] = seen_files[filename]
 
@@ -47,3 +50,16 @@ def parse_config(mapping):
                     action_args[argument] = action[action_name][argument]
 
             key.add_action(action_name, **action_args)
+
+    for key_property in config['key_properties']:
+        key = mapping.find_by_unicode(key_property)
+        if key is None:
+            continue
+
+        if 'description' in config['key_properties'][key_property]:
+            key.set_description(config['key_properties'][key_property]['description'])
+        if 'color' in config['key_properties'][key_property]:
+            key.set_color(config['key_properties'][key_property]['color'])
+
+    # Return the number of channels reserved
+    return channel_id + 1