wojtek/musichoard
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Decide carefully where external::musicbrainz belongs #196

Merged
wojtek merged 11 commits from 193---decide-carefully-where-external--musicbrainz-belongs into main 2024-08-28 18:21:13 +02:00
Conversation 0 Commits 11 Files Changed 25 +9 -9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57064f3b3c - Show all commits

18
src/tui/lib/external/musicbrainz/mod.rs vendored
View File

@ -1,7 +1,7 @@
//! Module for interacting with the [MusicBrainz API](https://musicbrainz.org/doc/MusicBrainz_API). //! Module for interacting with the [MusicBrainz API](https://musicbrainz.org/doc/MusicBrainz_API).
use musichoard::{ use musichoard::{
collection::{album::Album, musicbrainz::IMusicBrainzRef}, collection::album::{Album, AlbumDate},
external::musicbrainz::{ external::musicbrainz::{
IMusicBrainzHttp, MusicBrainzClient, SearchReleaseGroupRequest, IMusicBrainzHttp, MusicBrainzClient, SearchReleaseGroupRequest,
SearchReleaseGroupResponseUnit, SearchReleaseGroupResponseUnit,
@ -27,15 +27,15 @@ impl<Http: IMusicBrainzHttp> IMusicBrainz for MusicBrainz<Http> {
arid: &Mbid, arid: &Mbid,
album: &Album, album: &Album,
) -> Result<Vec<Match<Album>>, Error> { ) -> Result<Vec<Match<Album>>, Error> {
// Some release groups may have a promotional early release messing up the search. Searching
// with just the year should be enough anyway.
let date = AlbumDate::new(album.date.year, None, None);
let mut request = SearchReleaseGroupRequest::default(); let mut request = SearchReleaseGroupRequest::default();
request.arid(arid); request
if let Some(ref mbref) = album.musicbrainz { .arid(arid)
request.rgid(mbref.mbid()); .first_release_date(&date)
} else { .release_group(&album.id.title);
request
.first_release_date(&album.date)
.release_group(&album.id.title);
}
let mb_response = self.client.search_release_group(request)?; let mb_response = self.client.search_release_group(request)?;