X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=music_sampler%2Fmapping.py;h=50b68a9d903df95b0236cf76b4c39245628e9403;hb=dac64df84b0ed14199f41ac163d12ec20e497213;hp=ca471ef7115a3762870c3e5177e996a9c56273af;hpb=6ebe62478a49df22c55ef6a2b1200473500a7f80;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/music_sampler/mapping.py b/music_sampler/mapping.py
index ca471ef..50b68a9 100644
--- a/music_sampler/mapping.py
+++ b/music_sampler/mapping.py
@@ -93,8 +93,7 @@ class Mapping(RelativeLayout):
             self.key_config, self.open_files = self.parse_config()
         except Exception as e:
             error_print("Error while loading configuration: {}".format(e),
-                    with_trace=True)
-            sys.exit()
+                    with_trace=True, exit=True)
         else:
             self.success()
 
@@ -125,17 +124,24 @@ class Mapping(RelativeLayout):
             threading.Thread(name="MSKeyAction", target=key.run,
                     args=['-'.join(modifiers)]).start()
         elif 'ctrl' in modifiers and (keycode[0] == 113 or keycode[0] == '99'):
-            self.stop_all_running()
-            for thread in threading.enumerate():
-                if thread.getName()[0:2] != "MS":
-                    continue
-                thread.join()
-
+            self.leave_application()
             sys.exit()
         elif 'ctrl' in modifiers and keycode[0] == 114:
             threading.Thread(name="MSReload", target=self.reload).start()
         return True
 
+    def leave_application(self):
+        self.keyboard.unbind(on_key_down=self.on_keyboard_down)
+        self.stop_all_running()
+        for music in self.open_files.values():
+            music.stop()
+        for thread in threading.enumerate():
+            if thread.getName()[0:2] == "MS":
+                thread.join()
+            elif thread.__class__ == threading.Timer:
+                thread.cancel()
+                thread.join()
+
     # Helpers
     def allowed_modifiers(self, modifiers):
         allowed = []
@@ -218,7 +224,8 @@ class Mapping(RelativeLayout):
     def parse_config(self):
         def update_alias(prop_hash, aliases, key):
             if isinstance(aliases[key], dict):
-                prop_hash.update(aliases[key], **prop_hash)
+                for alias in aliases[key]:
+                    prop_hash.setdefault(alias, aliases[key][alias])
             else:
                 warn_print("Alias {} is not a hash, ignored".format(key))
 
@@ -306,12 +313,13 @@ class Mapping(RelativeLayout):
         try:
             config = yaml.safe_load(stream)
         except Exception as e:
-            error_print("Error while loading config file: {}".format(e))
-            sys.exit()
+            error_print("Error while loading config file: {}".format(e),
+                    exit=True)
         stream.close()
 
         if not isinstance(config, dict):
-            raise Exception("Top level config is supposed to be a hash")
+            error_print("Top level config is supposed to be a hash",
+                    exit=True)
 
         if 'aliases' in config and isinstance(config['aliases'], dict):
             aliases = config['aliases']
@@ -329,6 +337,14 @@ class Mapping(RelativeLayout):
 
         seen_files = {}
 
+        common_key_properties = {}
+        if 'common' in config['key_properties'] and\
+                isinstance(config['key_properties'], dict):
+            common_key_properties = config['key_properties']['common']
+            include_aliases(common_key_properties, aliases)
+        elif 'common' in config['key_properties']:
+            warn_print("'common' key in key_properties is not a hash, ignored")
+
         key_properties = defaultdict(lambda: {
                 "actions":    [],
                 "properties": {},
@@ -336,6 +352,9 @@ class Mapping(RelativeLayout):
             })
 
         for key in check_key_properties(config):
+            if key == 'common':
+                continue
+
             key_prop = config['key_properties'][key]
 
             if not isinstance(key_prop, dict):
@@ -344,6 +363,9 @@ class Mapping(RelativeLayout):
                 continue
 
             include_aliases(key_prop, aliases)
+            for _key in common_key_properties:
+                key_prop.setdefault(_key, common_key_properties[_key])
+
             check_key_property(key_prop, key)
 
             key_properties[key]["properties"] = key_prop