Skip to content

Commit ee77b5b

Browse files
deauthedeauthe
committed
fix: ran cargo fmt
1 parent d05771e commit ee77b5b

2 files changed

Lines changed: 61 additions & 26 deletions

File tree

‎spotify_player/src/event/popup.rs‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,14 @@ pub fn handle_key_sequence_for_popup(
2727
ui,
2828
);
2929
}
30-
PopupState::UserPlaylistList(PlaylistPopupAction::AddTrack { .. }, _)
30+
PopupState::UserPlaylistList(PlaylistPopupAction::AddTrack { .. }, _)
3131
| PopupState::UserPlaylistList(PlaylistPopupAction::AddEpisode { .. }, _) => {
32-
return handle_key_sequence_for_playlist_search_popup(key_sequence, client_pub, state, ui);
32+
return handle_key_sequence_for_playlist_search_popup(
33+
key_sequence,
34+
client_pub,
35+
state,
36+
ui,
37+
);
3338
}
3439
_ => {}
3540
}
@@ -605,21 +610,24 @@ fn handle_key_sequence_for_playlist_search_popup(
605610
let popup = ui.popup.as_ref().context("empty popup")?;
606611
match popup {
607612
PopupState::UserPlaylistList(action, _) => match action {
608-
PlaylistPopupAction::AddTrack { folder_id, track_id, search_query } => {
613+
PlaylistPopupAction::AddTrack {
614+
folder_id,
615+
track_id,
616+
search_query,
617+
} => {
609618
let track_id = track_id.clone();
610619
let search_query = search_query.clone();
611620
let data = state.data.read();
612621
let all_items = data.user_data.modifiable_playlist_items(Some(*folder_id));
613-
622+
614623
// Filter items based on search query (same logic as UI filtering)
615624
let filtered_items: Vec<_> = if search_query.is_empty() {
616625
all_items.into_iter().collect()
617626
} else {
618627
let query_lower = search_query.to_lowercase();
619-
all_items.into_iter()
620-
.filter(|item| {
621-
item.to_string().to_lowercase().contains(&query_lower)
622-
})
628+
all_items
629+
.into_iter()
630+
.filter(|item| item.to_string().to_lowercase().contains(&query_lower))
623631
.collect()
624632
};
625633

@@ -653,21 +661,24 @@ fn handle_key_sequence_for_playlist_search_popup(
653661
},
654662
)
655663
}
656-
PlaylistPopupAction::AddEpisode { folder_id, episode_id, search_query } => {
664+
PlaylistPopupAction::AddEpisode {
665+
folder_id,
666+
episode_id,
667+
search_query,
668+
} => {
657669
let episode_id = episode_id.clone();
658670
let search_query = search_query.clone();
659671
let data = state.data.read();
660672
let all_items = data.user_data.modifiable_playlist_items(Some(*folder_id));
661-
673+
662674
// Filter items based on search query (same logic as UI filtering)
663675
let filtered_items: Vec<_> = if search_query.is_empty() {
664676
all_items.into_iter().collect()
665677
} else {
666678
let query_lower = search_query.to_lowercase();
667-
all_items.into_iter()
668-
.filter(|item| {
669-
item.to_string().to_lowercase().contains(&query_lower)
670-
})
679+
all_items
680+
.into_iter()
681+
.filter(|item| item.to_string().to_lowercase().contains(&query_lower))
671682
.collect()
672683
};
673684

‎spotify_player/src/ui/popup.rs‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,19 @@ pub fn render_popup(
113113
PlaylistPopupAction::Browse { folder_id } => {
114114
(data.user_data.folder_playlists_items(*folder_id), None)
115115
}
116-
PlaylistPopupAction::AddTrack { folder_id, search_query, .. }
117-
| PlaylistPopupAction::AddEpisode { folder_id, search_query, .. } => {
118-
(data.user_data.modifiable_playlist_items(Some(*folder_id)), Some(search_query))
116+
PlaylistPopupAction::AddTrack {
117+
folder_id,
118+
search_query,
119+
..
119120
}
121+
| PlaylistPopupAction::AddEpisode {
122+
folder_id,
123+
search_query,
124+
..
125+
} => (
126+
data.user_data.modifiable_playlist_items(Some(*folder_id)),
127+
Some(search_query),
128+
),
120129
};
121130

122131
// Filter items based on search query if present
@@ -125,22 +134,29 @@ pub fn render_popup(
125134
items.into_iter().collect()
126135
} else {
127136
let query_lower = query.to_lowercase();
128-
items.into_iter()
129-
.filter(|item| {
130-
item.to_string().to_lowercase().contains(&query_lower)
131-
})
137+
items
138+
.into_iter()
139+
.filter(|item| item.to_string().to_lowercase().contains(&query_lower))
132140
.collect()
133141
}
134142
} else {
135143
items.into_iter().collect()
136144
};
137145

138-
let display_items = filtered_items.iter().map(|p| (p.to_string(), false)).collect();
146+
let display_items = filtered_items
147+
.iter()
148+
.map(|p| (p.to_string(), false))
149+
.collect();
139150

140151
// If we have a search query, show search input box
141152
if let Some(query) = search_query {
142-
let chunks = Layout::vertical([Constraint::Length(3), Constraint::Fill(0), Constraint::Length(10)]).split(rect);
143-
153+
let chunks = Layout::vertical([
154+
Constraint::Length(3),
155+
Constraint::Fill(0),
156+
Constraint::Length(10),
157+
])
158+
.split(rect);
159+
144160
// Render search input
145161
let search_rect = construct_and_render_block(
146162
"Search Playlists (type to search, backspace on empty to close)",
@@ -152,11 +168,19 @@ pub fn render_popup(
152168
frame.render_widget(Paragraph::new(format!("🔍 {}", query)), search_rect);
153169

154170
// Render filtered playlist list
155-
let rect = render_list_popup(frame, chunks[2], "User Playlists", display_items, 10, ui);
171+
let rect = render_list_popup(
172+
frame,
173+
chunks[2],
174+
"User Playlists",
175+
display_items,
176+
10,
177+
ui,
178+
);
156179
(rect, false)
157180
} else {
158181
// Regular rendering without search input
159-
let rect = render_list_popup(frame, rect, "User Playlists", display_items, 10, ui);
182+
let rect =
183+
render_list_popup(frame, rect, "User Playlists", display_items, 10, ui);
160184
(rect, false)
161185
}
162186
}

0 commit comments

Comments
 (0)