diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-06-19 01:13:41 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-06-19 01:13:41 +0200 |
| commit | ba9ea93a0f52178d24a606fddc2acc5dc85b7ff2 (patch) | |
| tree | 0a2b43561b84eefed07ecb83de1ecf4fad428532 /helpers/__init__.py | |
| parent | e5e6409426e3eb1918318973372568081e6d9dd6 (diff) | |
| download | MusicSampler-ba9ea93a0f52178d24a606fddc2acc5dc85b7ff2.tar.gz MusicSampler-ba9ea93a0f52178d24a606fddc2acc5dc85b7ff2.tar.zst MusicSampler-ba9ea93a0f52178d24a606fddc2acc5dc85b7ff2.zip | |
enhancing locks
Diffstat (limited to 'helpers/__init__.py')
| -rw-r--r-- | helpers/__init__.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/helpers/__init__.py b/helpers/__init__.py index 6935342..b1723ee 100644 --- a/helpers/__init__.py +++ b/helpers/__init__.py | |||
| @@ -1,12 +1,10 @@ | |||
| 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
| 2 | import threading | ||
| 3 | from .music_file import * | 2 | from .music_file import * |
| 4 | from .mapping import * | 3 | from .mapping import * |
| 5 | 4 | from .lock import * | |
| 6 | draw_lock = threading.RLock() | 5 | import yaml |
| 7 | 6 | ||
| 8 | def parse_config(mapping): | 7 | def parse_config(mapping): |
| 9 | import yaml | ||
| 10 | stream = open("config.yml", "r") | 8 | stream = open("config.yml", "r") |
| 11 | config = yaml.load(stream) | 9 | config = yaml.load(stream) |
| 12 | stream.close() | 10 | stream.close() |
| @@ -14,7 +12,7 @@ def parse_config(mapping): | |||
| 14 | aliases = config['aliases'] | 12 | aliases = config['aliases'] |
| 15 | seen_files = {} | 13 | seen_files = {} |
| 16 | 14 | ||
| 17 | file_lock = threading.RLock() | 15 | file_lock = Lock("file") |
| 18 | 16 | ||
| 19 | for mapped_key in config['keys']: | 17 | for mapped_key in config['keys']: |
| 20 | key = mapping.find_by_unicode(mapped_key) | 18 | key = mapping.find_by_unicode(mapped_key) |