Skip to content

Commit e06e6e8

Browse files
committed
move format_genres to ui utils
1 parent cb717ee commit e06e6e8

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

spotify_player/src/ui/playback.rs

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use super::{
55
};
66
#[cfg(feature = "image")]
77
use crate::state::ImageRenderInfo;
8-
use crate::ui::utils::to_bidi_string;
8+
use crate::ui::utils::{format_genres, to_bidi_string};
99
#[cfg(feature = "image")]
1010
use anyhow::{Context, Result};
1111
use rspotify::model::Id;
@@ -469,30 +469,3 @@ fn split_rect_for_playback_window(rect: Rect) -> (Rect, Rect) {
469469
}
470470
}
471471
}
472-
473-
/// formats genres depending on the number of genres and `genre_num`
474-
///
475-
/// Examples for `genre_num = 2`
476-
/// - 1 genre: "genre1"
477-
/// - 2 genres: "genre1, genre2"
478-
/// - \>= 3 genres: "genre1, genre2, ..."
479-
fn format_genres(genres: &[String], genre_num: u8) -> String {
480-
let mut genre_str = String::with_capacity(64);
481-
482-
if genre_num > 0 {
483-
for i in 0..genres.len() {
484-
genre_str.push_str(&genres[i]);
485-
486-
if i + 1 != genres.len() {
487-
genre_str.push_str(", ");
488-
489-
if i + 1 >= genre_num as usize {
490-
genre_str.push_str("...");
491-
break;
492-
}
493-
}
494-
}
495-
}
496-
497-
genre_str
498-
}

spotify_player/src/ui/utils.rs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,30 @@ pub fn to_bidi_string(s: &str) -> String {
135135

136136
bidi_string
137137
}
138+
139+
/// formats genres depending on the number of genres and `genre_num`
140+
///
141+
/// Examples for `genre_num = 2`
142+
/// - 1 genre: "genre1"
143+
/// - 2 genres: "genre1, genre2"
144+
/// - \>= 3 genres: "genre1, genre2, ..."
145+
pub fn format_genres(genres: &[String], genre_num: u8) -> String {
146+
let mut genre_str = String::with_capacity(64);
147+
148+
if genre_num > 0 {
149+
for i in 0..genres.len() {
150+
genre_str.push_str(&genres[i]);
151+
152+
if i + 1 != genres.len() {
153+
genre_str.push_str(", ");
154+
155+
if i + 1 >= genre_num as usize {
156+
genre_str.push_str("...");
157+
break;
158+
}
159+
}
160+
}
161+
}
162+
163+
genre_str
164+
}

0 commit comments

Comments
 (0)