diff --git a/src-tauri/src/commands_v2.rs b/src-tauri/src/commands_v2.rs index a7a68dfb9..56b16a217 100644 --- a/src-tauri/src/commands_v2.rs +++ b/src-tauri/src/commands_v2.rs @@ -9142,7 +9142,7 @@ pub async fn v2_discover_artists_by_location( area_name ); - let scene_label = format!("{} scene", display_name); + let scene_label = country.clone().unwrap_or_else(|| display_name.clone()); let genre_sum = genre_summary(&source_seeds); let next_offset = offset + candidates_to_validate.len(); let has_more = next_offset < total_candidates; diff --git a/src-tauri/src/musicbrainz/location_discovery.rs b/src-tauri/src/musicbrainz/location_discovery.rs index c967f563a..a444dd6a6 100644 --- a/src-tauri/src/musicbrainz/location_discovery.rs +++ b/src-tauri/src/musicbrainz/location_discovery.rs @@ -41,6 +41,8 @@ fn resolve_location( area: Option<&Area>, country: Option<&str>, ) -> Option { + let cc = country.map(|c| c.to_lowercase()); + // Try begin_area first (formation/birth location — typically city-level) if let Some(ba) = begin_area { let is_city = ba @@ -80,6 +82,7 @@ fn resolve_location( city: Some(ba.name.clone()), area_id: Some(ba.id.clone()), country: country_name, + country_code: cc, display_name: display, precision: LocationPrecision::City, }); @@ -96,6 +99,7 @@ fn resolve_location( city: Some(ba.name.clone()), area_id: Some(ba.id.clone()), country: country_name, + country_code: cc, display_name: display, precision: LocationPrecision::State, }); @@ -112,6 +116,7 @@ fn resolve_location( city: Some(ba.name.clone()), area_id: Some(ba.id.clone()), country: country_name, + country_code: cc, display_name: display, precision: LocationPrecision::City, }); @@ -130,6 +135,7 @@ fn resolve_location( city: None, area_id: Some(a.id.clone()), country: Some(a.name.clone()), + country_code: cc, display_name: a.name.clone(), precision: LocationPrecision::Country, }); @@ -147,18 +153,20 @@ fn resolve_location( city: Some(a.name.clone()), area_id: Some(a.id.clone()), country: country_name, + country_code: cc, display_name: display, precision: LocationPrecision::City, }); } // Country code only (no area data) - if let Some(cc) = country { - let name = country_code_to_name(cc); + if let Some(raw_cc) = country { + let name = country_code_to_name(raw_cc); return Some(ArtistLocation { city: None, area_id: None, country: Some(name.clone()), + country_code: cc, display_name: name, precision: LocationPrecision::Country, }); diff --git a/src-tauri/src/musicbrainz/models.rs b/src-tauri/src/musicbrainz/models.rs index 0a3c1ef22..f638cbf6c 100644 --- a/src-tauri/src/musicbrainz/models.rs +++ b/src-tauri/src/musicbrainz/models.rs @@ -573,6 +573,8 @@ pub struct ArtistLocation { pub city: Option, pub area_id: Option, pub country: Option, + /// ISO 3166-1 alpha-2 country code (e.g., "GB", "US") for flag display + pub country_code: Option, pub display_name: String, pub precision: LocationPrecision, }