Improve error message and handling

[perso/Immae/Projets/Python/MusicSampler.git] / music_sampler / mapping.py

diff --git a/music_sampler/mapping.py b/music_sampler/mapping.py
index bb20e679b1e4a9eb8312e0404a913411b178e93c..0d58d3024fc51fb731ce7f39a4bc0432cd410ad3 100644 (file)
--- a/music_sampler/mapping.py
+++ b/music_sampler/mapping.py
@@ -12,7 +12,7 @@ from transitions.extensions import HierarchicalMachine as Machine
 
 from .music_file import MusicFile
 from .mixer import Mixer
-from . import Config, gain, error_print, warn_print
+from .helpers import Config, gain, error_print, warn_print
 from .action import Action
 
 class Mapping(RelativeLayout):
@@ -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()
 
@@ -306,12 +305,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']