-
Notifications
You must be signed in to change notification settings - Fork 76
get_microphone(), get_speaker(): Improved comparison between the call parameter "id" and existing device names #147
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
adeuring
wants to merge
3
commits into
bastibe:master
Choose a base branch
from
adeuring:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ | |
| import numpy | ||
| import collections | ||
| import time | ||
| import re | ||
| import math | ||
| import threading | ||
| import warnings | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ | |
|
|
||
| import os | ||
| import cffi | ||
| import re | ||
| import time | ||
| import struct | ||
| import collections | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ | |
| import atexit | ||
| import collections | ||
| import time | ||
| import re | ||
| import threading | ||
| import warnings | ||
| import numpy | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,39 @@ | ||
| import re | ||
|
|
||
| def match_device(id, devices): | ||
| """Find id in a list of devices. | ||
| id can be a platfom-specific id, a substring of the device name, or a | ||
| id can be a platfom specific id, a substring of the device name, or a | ||
| fuzzy-matched pattern for the microphone name. | ||
| """ | ||
| devices_by_id = {device.id: device for device in devices} | ||
| devices_by_name = {device.name: device for device in devices} | ||
| real_devices_by_name = { | ||
| device.name: device for device in devices | ||
| if not getattr(device, 'isloopback', True)} | ||
| loopback_devices_by_name = { | ||
| device.name: device for device in devices | ||
| if getattr(device, 'isloopback', True)} | ||
| if id in devices_by_id: | ||
| return devices_by_id[id] | ||
| for device_map in real_devices_by_name, loopback_devices_by_name: | ||
| if id in device_map: | ||
| return device_map[id] | ||
| # try substring match: | ||
| for name, device in devices_by_name.items(): | ||
| if id in name: | ||
| return device | ||
| for device_map in real_devices_by_name, loopback_devices_by_name: | ||
| for name, device in device_map.items(): | ||
| if id in name: | ||
| return device | ||
| # try fuzzy match: | ||
| pattern = '.*'.join(id) | ||
| for name, device in devices_by_name.items(): | ||
| if re.match(pattern, name): | ||
| return device | ||
| id_parts = list(id) | ||
| # Escape symbols in the provided id that have a special meaning | ||
| # in regular expression to prevent syntax errors e.g. for | ||
| # unbalanced parentheses. | ||
| for special_re_char in r'.^$*+?{}\[]|()': | ||
bastibe marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| while special_re_char in id_parts: | ||
| id_parts[id_parts.index(special_re_char)] = '\\' + special_re_char | ||
| pattern = '.*'.join(id_parts) | ||
| for device_map in real_devices_by_name, loopback_devices_by_name: | ||
| for name, device in device_map.items(): | ||
| if re.search(pattern, name): | ||
| return device | ||
| raise IndexError('no device with id {}'.format(id)) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.