Merge main into logging

jellyfin-rpc-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name         = "jellyfin-rpc-cli"
-version      = "1.0.3"
+version      = "1.0.4"
 edition      = "2021"
 description  = "Displays the content you're currently watching on Discord!"
 license      = "GPL-3.0-or-later"
@@ -27,7 +27,7 @@ retry                 = "2.0"
 
 [dependencies.jellyfin-rpc]
 features = ["imgur", "cli"]
-version  = "1.0.3"
+version  = "1.0.4"
 #path = "../jellyfin-rpc"
 
 [dependencies.clap]

jellyfin-rpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name        = "jellyfin-rpc"
-version     = "1.0.3"
+version     = "1.0.4"
 edition     = "2021"
 description = "Backend for the Jellyfin-RPC-cli and Jellyfin-RPC-Iced projects"
 license     = "GPL-3.0-or-later"

jellyfin-rpc/src/services/jellyfin.rs

@@ -223,32 +223,35 @@ impl Content {
         After the for loop is complete we remove the trailing ", " because it looks bad in the presence.
         Then we send it off as a Vec<String> with the external urls and the end timer to the main loop.
         */
-        let name = if config.jellyfin.show_simple? {
-          ""
-        } else {
-          now_playing_item["Name"].as_str()?
-        };
+
+        let mut name = now_playing_item["Name"].as_str()?;
+
         if now_playing_item["Type"].as_str()? == "Episode" {
             let season = now_playing_item["ParentIndexNumber"].as_i64().unwrap_or(0) as i32;
             let first_episode_number = now_playing_item["IndexNumber"].as_i64().unwrap_or(0) as i32;
             let mut state;
-            if config.jellyfin.append_prefix? {
-                if config.jellyfin.add_divider? {
+
+            if config.jellyfin.show_simple.unwrap_or(false) {
+                name = ""
+            };
+
+            if config.jellyfin.append_prefix.unwrap_or(false) {
+                if config.jellyfin.add_divider.unwrap_or(false) {
                   state = format!("S{:02} - E{:02}", season, first_episode_number);
                 } else {
                   state = format!("S{:02}E{:02}", season, first_episode_number);
                 }
 
             } else {
-              if config.jellyfin.add_divider? {
+              if config.jellyfin.add_divider.unwrap_or(false) {
                 state = format!("S{} - E{}", season, first_episode_number);
               } else {
                 state = format!("S{}E{}", season, first_episode_number);
               }
             };
 
             if season.to_string() == *"null" {
-                if config.jellyfin.append_prefix? {
+                if config.jellyfin.append_prefix.unwrap_or(false) {
                     state = format!("E{:02}", first_episode_number);
                 } else {
                     state = format!("E{}", first_episode_number);