Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-23 17:13:30 +01:00
Code Issues Projects Releases Wiki Activity

musicbrainz: remove error handling

Browse source
This commit is contained in:
Šarūnas Nejus 2025-09-29 00:30:36 +01:00
parent 87a074ee99
commit d8f201e79c
No known key found for this signature in database
1 changed files with 19 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
beetsplug/musicbrainz.py
View file

@ -16,7 +16,6 @@
from __future__ import annotations
import traceback
from collections import Counter
from contextlib import suppress
from dataclasses import dataclass
@ -25,7 +24,6 @@ from itertools import product
from typing import TYPE_CHECKING, Any, Iterable, Sequence
from urllib.parse import urljoin
import musicbrainzngs
from confuse.exceptions import NotFoundError
from requests_ratelimiter import LimiterMixin
@ -64,24 +62,6 @@ class LimiterTimeoutSession(LimiterMixin, TimeoutSession):
pass
musicbrainzngs.set_useragent("beets", beets.__version__, "https://beets.io/")
class MusicBrainzAPIError(util.HumanReadableError):
"""An error while talking to MusicBrainz. The `query` field is the
parameter to the action and may have any type.
"""
def __init__(self, reason, verb, query, tb=None):
self.query = query
if isinstance(reason, musicbrainzngs.WebServiceError):
reason = "MusicBrainz not reachable"
super().__init__(reason, verb, tb)
def get_message(self):
return f"{self._reasonstr()} in {self.verb} with query {self.query!r}"
RELEASE_INCLUDES = [
"artists",
"media",
@ -810,15 +790,9 @@ class MusicBrainzPlugin(MetadataSourcePlugin):
self._log.debug(
"Searching for MusicBrainz {}s with: {!r}", query_type, query
)
try:
res = self.api._get(
query_type, query=query, limit=self.config["search_limit"].get()
)
except musicbrainzngs.MusicBrainzError as exc:
raise MusicBrainzAPIError(
exc, f"{query_type} search", filters, traceback.format_exc()
)
return res[f"{query_type}s"]
return self.api._get(
query_type, query=query, limit=self.config["search_limit"].get()
)[f"{query_type}s"]
def candidates(
self,
@ -856,29 +830,20 @@ class MusicBrainzPlugin(MetadataSourcePlugin):
self._log.debug("Invalid MBID ({}).", album_id)
return None
try:
res = self.api.get_release(albumid)
res = self.api.get_release(albumid)
# resolve linked release relations
actual_res = None
# resolve linked release relations
actual_res = None
if res.get("status") == "Pseudo-Release" and (
relations := res.get("relations")
):
for rel in relations:
if (
rel["type"] == "transl-tracklisting"
and rel["direction"] == "backward"
):
actual_res = self.api.get_release(rel["target"])
except musicbrainzngs.ResponseError:
self._log.debug("Album ID match failed.")
return None
except musicbrainzngs.MusicBrainzError as exc:
raise MusicBrainzAPIError(
exc, "get release by ID", albumid, traceback.format_exc()
)
if res.get("status") == "Pseudo-Release" and (
relations := res.get("relations")
):
for rel in relations:
if (
rel["type"] == "transl-tracklisting"
and rel["direction"] == "backward"
):
actual_res = self.api.get_release(rel["target"])
# release is potentially a pseudo release
release = self.album_info(res)
@ -900,13 +865,7 @@ class MusicBrainzPlugin(MetadataSourcePlugin):
self._log.debug("Invalid MBID ({}).", track_id)
return None
try:
res = self.api.get_recording(trackid)
except (HTTPNotFoundError, musicbrainzngs.ResponseError):
self._log.debug("Track ID match failed.")
return None
except musicbrainzngs.MusicBrainzError as exc:
raise MusicBrainzAPIError(
exc, "get recording by ID", trackid, traceback.format_exc()
)
return self.track_info(res)
with suppress(HTTPNotFoundError):
return self.track_info(self.api.get_recording(trackid))
return None