Add pirate example config.yml + description

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

diff --git a/helpers/__init__.py b/helpers/__init__.py
index 6935342cc34a74f0304f4bd83bb42a335a7a1cb2..b7acbf55ee89683d447daee097d4bc78effb0d5b 100644 (file)
--- a/helpers/__init__.py
+++ b/helpers/__init__.py
@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-import threading
 from .music_file import *
 from .mapping import *
-
-draw_lock = threading.RLock()
+from .lock import *
+import yaml
 
 def parse_config(mapping):
-    import yaml
     stream = open("config.yml", "r")
     config = yaml.load(stream)
     stream.close()
@@ -14,7 +12,7 @@ def parse_config(mapping):
     aliases = config['aliases']
     seen_files = {}
 
-    file_lock = threading.RLock()
+    file_lock = Lock("file")
 
     for mapped_key in config['keys']:
         key = mapping.find_by_unicode(mapped_key)
@@ -49,3 +47,13 @@ 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'])