-
Notifications
You must be signed in to change notification settings - Fork 66
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
Support the track/list_by_mbid API route #57
Open
jbosboom
wants to merge
1
commit into
beetbox:master
Choose a base branch
from
jbosboom:track-by-id
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 all commits
Commits
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 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 |
---|---|---|
|
@@ -118,6 +118,11 @@ def _get_submission_status_url(): | |
return API_BASE_URL + 'submission_status' | ||
|
||
|
||
def _get_track_by_mbid_url(): | ||
"""Get the URL of the track-by-MBID API endpoint.""" | ||
return API_BASE_URL + 'track/list_by_mbid' | ||
|
||
|
||
# Compressed HTTP request bodies. | ||
|
||
def _compress(data): | ||
|
@@ -412,3 +417,54 @@ def get_submission_status(apikey, submission_id, timeout=None): | |
'id': submission_id, | ||
} | ||
return _api_request(_get_submission_status_url(), params, timeout) | ||
|
||
|
||
def track_by_mbid(release_ids, disabled=False, timeout=None): | ||
"""Get AcoustID track id(s) corresponding to the given MusicBrainz | ||
release id(s). | ||
If ``release_ids`` is a str, a list of strs (possibly empty) is returned. | ||
If ``release_ids`` is a list of strs, a dict mapping each str in that list | ||
to a (possibly empty) list of strs is returned. | ||
If ``disabled`` is True, those lists of str are instead pairs of lists of | ||
strs, the first containing the enabled AcoustID track ids and the second the | ||
disabled track ids.""" | ||
|
||
# Avoid isinstance(release_ids, list) in case the caller wants to pass some | ||
# other sequence. We let requests convert the sequence to a repeated param. | ||
batch = not isinstance(release_ids, str) | ||
params = { | ||
'format': 'json', | ||
'mbid': release_ids, | ||
'disabled': '1' if disabled else '0', | ||
'batch': '1' if batch else '0', | ||
# this route doesn't require an API key | ||
} | ||
|
||
response = _api_request(_get_track_by_mbid_url(), params, timeout) | ||
# Copied from submit, above. | ||
if response.get('status') != 'ok': | ||
try: | ||
code = response['error']['code'] | ||
message = response['error']['message'] | ||
except KeyError: | ||
raise WebServiceError("response: {0}".format(response)) | ||
raise WebServiceError("error {0}: {1}".format(code, message)) | ||
|
||
# When disabled is true, we defensively check for disabled: false even | ||
# though AcoustID currently omits that attribute for enabled MBIDs. | ||
if batch: | ||
mbids = response['mbids'] | ||
if disabled: | ||
return {m['mbid']: | ||
([x['id'] for x in m['tracks'] if 'disabled' not in x or not x['disabled']], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This bit: 'disabled' not in x or not x['disabled'] is equivalent to this slightly shorter expression: not x.get('disabled') |
||
[x['id'] for x in m['tracks'] if 'disabled' in x and x['disabled']]) | ||
for m in mbids} | ||
else: | ||
return {m['mbid']: [x['id'] for x in m['tracks']] for m in mbids} | ||
else: | ||
tracks = response['tracks'] | ||
if disabled: | ||
return ([x['id'] for x in tracks if 'disabled' not in x or not x['disabled']], | ||
[x['id'] for x in tracks if 'disabled' in x and x['disabled']]) | ||
else: | ||
return [x['id'] for x in tracks] |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, as you mentioned, maybe this can be factored out into a function to avoid duplication. The two options are for it to go into
_api_request
or into a new, separate function. The former would be more appropriate if we only ever use_api_request
this way; the latter might be better if some calls to_api_request
need to process stuff differently.