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

discogs: remove duplicate error handling

Browse source
This commit is contained in:
Šarūnas Nejus 2025-05-09 13:44:54 +01:00
parent 09862aeaea
commit 12149b3e6d
No known key found for this signature in database
GPG key ID: DD28F6704DBE3435
1 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
beetsplug/discogs.py
View file

@ -166,22 +166,7 @@ class DiscogsPlugin(BeetsPlugin):
def candidates( def candidates(
self, items: list[Item], artist: str, album: str, va_likely: bool self, items: list[Item], artist: str, album: str, va_likely: bool
) -> Iterable[AlbumInfo]: ) -> Iterable[AlbumInfo]:
if va_likely: return self.get_albums(f"{artist} {album}" if va_likely else album)
query = album
else:
query = f"{artist} {album}"
try:
return self.get_albums(query)
except DiscogsAPIError as e:
self._log.debug("API Error: {0} (query: {1})", e, query)
if e.status_code == 401:
self.reset_auth()
return self.candidates(items, artist, album, va_likely)
else:
return []
except CONNECTION_ERRORS:
self._log.debug("Connection error in album search", exc_info=True)
return []
def get_track_from_album_by_title( def get_track_from_album_by_title(
self, album_info, title, dist_threshold=0.3 self, album_info, title, dist_threshold=0.3
@ -222,18 +207,8 @@ class DiscogsPlugin(BeetsPlugin):
def item_candidates( def item_candidates(
self, item: Item, artist: str, title: str self, item: Item, artist: str, title: str
) -> Iterable[TrackInfo]: ) -> Iterable[TrackInfo]:
query = f"{artist} {title}" albums = self.candidates([item], artist, title, False)
try:
albums = self.get_albums(query)
except DiscogsAPIError as e:
self._log.debug("API Error: {0} (query: {1})", e, query)
if e.status_code == 401:
self.reset_auth()
return self.item_candidates(item, artist, title)
else:
return []
except CONNECTION_ERRORS:
self._log.debug("Connection error in track search", exc_info=True)
candidates = [] candidates = []
for album_cur in albums: for album_cur in albums:
self._log.debug("searching within album {0}", album_cur.album) self._log.debug("searching within album {0}", album_cur.album)