From 2d88e45d252527724890b968b92619f9bf23d4d9 Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Sun, 29 Sep 2024 16:50:24 +0200 Subject: [PATCH] MB API requests as references --- examples/musicbrainz_api/lookup.rs | 4 ++-- examples/musicbrainz_api/search.rs | 4 ++-- src/external/musicbrainz/api/lookup.rs | 8 ++++---- src/external/musicbrainz/api/search/artist.rs | 2 +- src/external/musicbrainz/api/search/mod.rs | 2 +- src/external/musicbrainz/api/search/release_group.rs | 6 +++--- src/tui/lib/external/musicbrainz/api/mod.rs | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/musicbrainz_api/lookup.rs b/examples/musicbrainz_api/lookup.rs index e3590b3..139c2cf 100644 --- a/examples/musicbrainz_api/lookup.rs +++ b/examples/musicbrainz_api/lookup.rs @@ -62,7 +62,7 @@ fn main() { } let response = client - .lookup_artist(request) + .lookup_artist(&request) .expect("failed to make API call"); println!("{response:#?}"); @@ -72,7 +72,7 @@ fn main() { let request = LookupReleaseGroupRequest::new(&mbid); let response = client - .lookup_release_group(request) + .lookup_release_group(&request) .expect("failed to make API call"); println!("{response:#?}"); diff --git a/examples/musicbrainz_api/search.rs b/examples/musicbrainz_api/search.rs index 7f4d2f6..c5cb9b2 100644 --- a/examples/musicbrainz_api/search.rs +++ b/examples/musicbrainz_api/search.rs @@ -107,7 +107,7 @@ fn main() { println!("Query: {query}"); let matches = client - .search_artist(query) + .search_artist(&query) .expect("failed to make API call"); println!("{matches:#?}"); @@ -139,7 +139,7 @@ fn main() { println!("Query: {query}"); let matches = client - .search_release_group(query) + .search_release_group(&query) .expect("failed to make API call"); println!("{matches:#?}"); diff --git a/src/external/musicbrainz/api/lookup.rs b/src/external/musicbrainz/api/lookup.rs index 3bfc5c7..82197d5 100644 --- a/src/external/musicbrainz/api/lookup.rs +++ b/src/external/musicbrainz/api/lookup.rs @@ -14,7 +14,7 @@ use super::{MbArtistMeta, MbReleaseGroupMeta, SerdeMbArtistMeta, SerdeMbReleaseG impl MusicBrainzClient { pub fn lookup_artist( &mut self, - request: LookupArtistRequest, + request: &LookupArtistRequest, ) -> Result { let mut include: Vec = vec![]; @@ -35,7 +35,7 @@ impl MusicBrainzClient { pub fn lookup_release_group( &mut self, - request: LookupReleaseGroupRequest, + request: &LookupReleaseGroupRequest, ) -> Result { let url = format!( "{MB_BASE_URL}/release-group/{mbid}", @@ -177,7 +177,7 @@ mod tests { let mbid: Mbid = "00000000-0000-0000-0000-000000000000".try_into().unwrap(); let mut request = LookupArtistRequest::new(&mbid); request.include_release_groups(); - let result = client.lookup_artist(request).unwrap(); + let result = client.lookup_artist(&request).unwrap(); assert_eq!(result, response); } @@ -214,7 +214,7 @@ mod tests { let mbid: Mbid = "00000000-0000-0000-0000-000000000000".try_into().unwrap(); let request = LookupReleaseGroupRequest::new(&mbid); - let result = client.lookup_release_group(request).unwrap(); + let result = client.lookup_release_group(&request).unwrap(); assert_eq!(result, response); } diff --git a/src/external/musicbrainz/api/search/artist.rs b/src/external/musicbrainz/api/search/artist.rs index 12d1bf1..37780a7 100644 --- a/src/external/musicbrainz/api/search/artist.rs +++ b/src/external/musicbrainz/api/search/artist.rs @@ -128,7 +128,7 @@ mod tests { let query = SearchArtistRequest::new().string(name); - let matches = client.search_artist(query).unwrap(); + let matches = client.search_artist(&query).unwrap(); assert_eq!(matches, response); } } diff --git a/src/external/musicbrainz/api/search/mod.rs b/src/external/musicbrainz/api/search/mod.rs index 564063b..985528a 100644 --- a/src/external/musicbrainz/api/search/mod.rs +++ b/src/external/musicbrainz/api/search/mod.rs @@ -27,7 +27,7 @@ macro_rules! impl_search_entity { paste! { pub fn []( &mut self, - query: [] + query: &[] ) -> Result<[], Error> { let query: String = form_urlencoded::byte_serialize(format!("{query}").as_bytes()).collect(); diff --git a/src/external/musicbrainz/api/search/release_group.rs b/src/external/musicbrainz/api/search/release_group.rs index 6e65c26..7dddfa8 100644 --- a/src/external/musicbrainz/api/search/release_group.rs +++ b/src/external/musicbrainz/api/search/release_group.rs @@ -161,7 +161,7 @@ mod tests { let query = SearchReleaseGroupRequest::new().string(title); - let matches = client.search_release_group(query).unwrap(); + let matches = client.search_release_group(&query).unwrap(); assert_eq!(matches, response); } @@ -198,7 +198,7 @@ mod tests { .and() .first_release_date(&date); - let matches = client.search_release_group(query).unwrap(); + let matches = client.search_release_group(&query).unwrap(); assert_eq!(matches, response); } @@ -226,7 +226,7 @@ mod tests { let query = SearchReleaseGroupRequest::new().rgid(&rgid); - let matches = client.search_release_group(query).unwrap(); + let matches = client.search_release_group(&query).unwrap(); assert_eq!(matches, response); } } diff --git a/src/tui/lib/external/musicbrainz/api/mod.rs b/src/tui/lib/external/musicbrainz/api/mod.rs index b597cdb..c7b7ac9 100644 --- a/src/tui/lib/external/musicbrainz/api/mod.rs +++ b/src/tui/lib/external/musicbrainz/api/mod.rs @@ -41,7 +41,7 @@ impl IMusicBrainz for MusicBrainz { fn lookup_artist(&mut self, mbid: &Mbid) -> Result, Error> { let request = LookupArtistRequest::new(mbid); - let mb_response = self.client.lookup_artist(request)?; + let mb_response = self.client.lookup_artist(&request)?; Ok(from_lookup_artist_response(mb_response)) } @@ -49,7 +49,7 @@ impl IMusicBrainz for MusicBrainz { fn lookup_release_group(&mut self, mbid: &Mbid) -> Result, Error> { let request = LookupReleaseGroupRequest::new(mbid); - let mb_response = self.client.lookup_release_group(request)?; + let mb_response = self.client.lookup_release_group(&request)?; Ok(from_lookup_release_group_response(mb_response)) } @@ -57,7 +57,7 @@ impl IMusicBrainz for MusicBrainz { fn search_artist(&mut self, artist: &ArtistMeta) -> Result>, Error> { let query = SearchArtistRequest::new().string(&artist.id.name); - let mb_response = self.client.search_artist(query)?; + let mb_response = self.client.search_artist(&query)?; Ok(mb_response .artists @@ -82,7 +82,7 @@ impl IMusicBrainz for MusicBrainz { .and() .release_group(&album.id.title); - let mb_response = self.client.search_release_group(query)?; + let mb_response = self.client.search_release_group(&query)?; Ok(mb_response .release_groups