Change separator char to String (#89) (#90)

allows multicharacter separators in music display
Radiicall · Nov 29, 2023 · fcb1373 · fcb1373
1 parent aa0fd4e
commit fcb1373
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/jellyfin-rpc-cli/Cargo.toml b/jellyfin-rpc-cli/Cargo.toml
@@ -27,8 +27,8 @@ retry                 = "2.0"
 
 [dependencies.jellyfin-rpc]
 features = ["imgur", "cli"]
-version  = "0.1.5"
-#path = "../jellyfin-rpc"
+#version  = "0.1.5"
+path = "../jellyfin-rpc"
 
 [dependencies.clap]
 features = ["derive"]

diff --git a/jellyfin-rpc/src/core/config.rs b/jellyfin-rpc/src/core/config.rs
@@ -57,7 +57,7 @@ pub struct Music {
     /// Example: `vec![String::from("genres"), String::from("year")]`
     pub display: Option<Display>,
     /// Separator is what should be between the artist(s) and the `display` options.
-    pub separator: Option<char>,
+    pub separator: Option<String>,
 }
 
 /// Display is where you tell the program what should be displayed.

diff --git a/jellyfin-rpc/src/services/jellyfin.rs b/jellyfin-rpc/src/services/jellyfin.rs
@@ -276,10 +276,10 @@ impl Content {
                 .music
                 .clone()
                 .and_then(|music| music.separator)
-                .unwrap_or('-');
+                .unwrap_or("-".to_string());
 
             let state =
-                Content::get_music_info(now_playing_item, artists, display, name, separator).await;
+                Content::get_music_info(now_playing_item, artists, display, name, &separator).await;
 
             content.media_type(MediaType::Music);
             content.details(name.into());
@@ -371,7 +371,7 @@ impl Content {
         artists: String,
         display: Vec<std::string::String>,
         name: &str,
-        separator: char,
+        separator: &str,
     ) -> String {
         let mut state = format!("By {}", artists);
 

diff --git a/jellyfin-rpc/src/tests.rs b/jellyfin-rpc/src/tests.rs
@@ -10,7 +10,7 @@ fn load_example_config() {
             username: Username::String("your_username_here".to_string()),
             music: Some(Music {
                 display: Some(Display::String("genres".to_string())),
-                separator: Some('-'),
+                separator: Some("-".to_string()),
             }),
             blacklist: Some(Blacklist {
                 media_types: Some(vec![