fix(jellyfin): re-authentication

/Session is now inaccessible without an api_key. this is just a stupid fix, but don't worry a fresh puddler will come

.github/workflows/release-builds.yml

@@ -45,7 +45,7 @@ jobs:
       with:
         draft: false
         prerelease: false
-        name: ${{ github.ref }}
+        name: ${{ github.ref_name }}
         tag_name: ${{ github.ref }}
         body_path: RECENT_CHANGES.md
         files: puddler, puddler.exe

src/config.rs

@@ -83,12 +83,16 @@ pub fn choose_config(server_kind: char, autologin: bool) -> Option<String> {
 
 
 pub fn read_config(config_path_string: &String, autologin: bool) -> Result<(ConfigFile, ConfigFileRaw), (Option<ConfigFileRaw>, &str)> {
-  let file = fs::read_to_string(config_path_string).unwrap();
+  let file = if let Ok(file) = fs::read_to_string(config_path_string) {
+    file
+  } else {
+    return Err((None, "missing"));
+  };
   let local_config_file: Result<ConfigFileRaw, serde_json::Error> = serde_json::from_str::<ConfigFileRaw>(&file);
   match local_config_file {
     Ok(a) => {
       let user: &ConfigFileUser;
-      let media_server_name: &str = if a.emby {
+      let media_server_name: &str = if a.emby.unwrap() {
         "Emby"
       } else {
         "Jellyfin"
@@ -104,7 +108,7 @@ pub fn read_config(config_path_string: &String, autologin: bool) -> Result<(Conf
       };
       if autologin {
         Ok((ConfigFile {
-          emby: a.emby,
+          emby: a.emby.unwrap(),
           server_name: server_name.to_string(),
           ipaddress: a.ipaddress.clone(),
           device_id: a.device_id.clone(),
@@ -119,7 +123,7 @@ pub fn read_config(config_path_string: &String, autologin: bool) -> Result<(Conf
         if "yY".contains(input) {
           user = a.user.first().unwrap();
           Ok((ConfigFile {
-            emby: a.emby,
+            emby: a.emby.unwrap(),
             server_name: server_name.to_string(),
             ipaddress: a.ipaddress.clone(),
             device_id: a.device_id.clone(),
@@ -161,7 +165,7 @@ pub fn read_config(config_path_string: &String, autologin: bool) -> Result<(Conf
               println!();
               user = a.user.get(index).unwrap();
               Ok((ConfigFile {
-                emby: a.emby,
+                emby: a.emby.unwrap(),
                 server_name: server_name.to_string(),
                 ipaddress: a.ipaddress.clone(),
                 device_id: a.device_id.clone(),
@@ -199,14 +203,14 @@ pub fn write_config(config_path_string: String, config_file: &ConfigFile, other_
     let mut user_vec: Vec<ConfigFileUser> = [config_file_user].to_vec();
     user_vec.append(&mut other_users);
     ConfigFileRaw {
-      emby: config_file.emby,
+      emby: Some(config_file.emby),
       ipaddress: config_file.ipaddress.clone(),
       device_id: config_file.device_id.clone(),
       user: user_vec
     }
   } else {
     ConfigFileRaw {
-      emby: config_file.emby,
+      emby: Some(config_file.emby),
       ipaddress: config_file.ipaddress.clone(),
       device_id: config_file.device_id.clone(),
       user: [config_file_user].to_vec()

src/main.rs

@@ -196,8 +196,7 @@ r"     ____            __    ____
         'e' | 'E' => {
           return ExitCode::SUCCESS;
         },
-        _ => (
-        )
+        _ => ()
       };
     } else {
       print!("  [1] Stream from either Emby or Jellyfin\n  [2] Change puddlers default settings\n  [3] Display current settings\n  [E] Exit puddler");
@@ -215,8 +214,7 @@ r"     ____            __    ____
         'e' | 'E' => {
           return ExitCode::SUCCESS;
         },
-        _ => (
-        )
+        _ => ()
       };
     }
   }

src/mediaserver_information.rs

@@ -82,7 +82,7 @@ pub struct ConfigFile {
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct ConfigFileRaw {
-  pub emby: bool,
+  pub emby: Option<bool>,
   pub ipaddress: String,
   pub device_id: String,
   pub user: Vec<ConfigFileUser>
@@ -161,6 +161,10 @@ pub fn adv_getch(allowed: &str, any_key: bool, timeout_secs: Option<u64>, messag
                 disable_raw_mode().unwrap();
                 println!("{}\n", ch);
                 return Some(ch);
+              } else if ch == '\n' && code == KeyCode::Enter {
+                disable_raw_mode().unwrap();
+                println!("\n");
+                return Some(ch);
               }
             }
             writeln!(stdout).unwrap();
@@ -219,9 +223,13 @@ pub fn validate_settings(settings: &Settings) -> Option<HeadDict> {
           '2'
         }
       },
-      Err(_no) => {
-        print!("What kind of server do you want to stream from?\n   [1] Emby\n   [2] Jellyfin");
-        getch("12")
+      Err((_no, "missing")) => {
+        eprintln!("{}: The default config specified in \"Puddler.toml\" doesn't exist.", "Error".to_string().red());
+        return None;
+      },
+      _ => {
+        eprintln!("{}: Unkown error.", "Error".to_string().red());
+        return None;
       }
     }
   };
@@ -484,7 +492,7 @@ fn configure_new_server(media_server_name: &str) -> (String, String) {
           print!("Please specify the IP-Address manually\n(don't forget to add ports if not running on 80/443!)\n: ");
           stdout().flush().expect("Failed to flush stdout");
           let mut ipaddress2 = String::new();
-          stdin().read_line(  &mut ipaddress2).unwrap();
+          stdin().read_line(&mut ipaddress2).unwrap();
           ipaddress = ipaddress2.trim().parse().unwrap();
           print!("\nPlease enter a nickname for your media-server.\n(It's recommended to use a unique one)\n: ");
           stdout().flush().expect("Failed to flush stdout");
@@ -638,7 +646,7 @@ fn reauthenticate(media_server_name: &str, media_server: &str, ipaddress: &Strin
         }
       } else {
         println!("{}", "error!".to_string().red());
-        Err("This is not a valid emby/jellyfin webpage!".to_string())
+        Err("exp".to_string())
       }
     }
     Err(e) => {

src/player.rs

@@ -323,6 +323,10 @@ pub fn play(settings: &Settings, head_dict: &HeadDict, item: &mut Item) -> bool
   let total_runtime: f64 = if settings.transcoding {
     (item.RunTimeTicks.unwrap() as f64 - item.UserData.PlaybackPositionTicks as f64) / 10000000.0
   } else {
+    if item.RunTimeTicks.is_none() {
+      eprintln!("Item doesn't have a runtime?");
+      return false;
+    }
     item.RunTimeTicks.unwrap() as f64 / 10000000.0
   };