Merge pull request #57 from Tormak9970/dev

fixed user id not being found

Author: Tormak9970

README.md

@@ -16,7 +16,6 @@ To get the most recent release, head to [releases](https://github.com/Tormak9970
 
 ## How to use the app
 When using Steam Art Manager, your workflow will typically be:
- - Make sure Steam is already running (windows only)
  - Open Steam Art Manager
  - Set your SteamGridDB api key (if you wish to browse images from SteamGridDB)
  - Wait for it to load your games

src-tauri/src/steam.rs

@@ -12,11 +12,6 @@ use tauri::AppHandle;
 
 #[cfg(target_os = "linux")]
 use home::home_dir;
-#[cfg(target_os = "linux")]
-use crate::vdf_structs;
-#[cfg(target_os = "linux")]
-use std::collections::HashMap;
-
 
 #[cfg(target_os = "windows")]
 pub fn get_steam_root_dir() -> PathBuf {
@@ -69,38 +64,42 @@ pub fn get_appinfo_path(app_handle: AppHandle) -> String {
   logger::log_to_file(app_handle.to_owned(), "Getting steam appinfo.vdf...", 0);
 
   let steam_root = get_steam_root_dir();
-  println!("Steam Base Directory: {}", steam_root.display());
   return steam_root.join("appcache/appinfo.vdf").to_str().expect("Should have been able to convert to a string.").to_owned().replace("\\", "/");
 }
 
 #[tauri::command]
-#[cfg(target_os = "windows")]
-pub fn get_active_user(app_handle: AppHandle) -> u32 {
-  logger::log_to_file(app_handle.to_owned(), "Checking registry for current user.", 0);
-  let hkcu: RegKey = RegKey::predef(HKEY_CURRENT_USER);
-
-  let steam_active_process: RegKey = hkcu.open_subkey("SOFTWARE\\Valve\\Steam\\ActiveProcess").expect("Couldn't getActiveProcess from the registry");
-  let active_user_dword: u32 = steam_active_process.get_value("ActiveUser").expect("Couldn't get ActiveUser from the registry");
-
-  logger::log_to_file(app_handle, format!("Got current_user_id: {}", active_user_dword).as_str(), 0);
-
-  return active_user_dword;
-}
-
-#[tauri::command]
-#[cfg(target_os = "linux")]
 pub fn get_active_user(app_handle: AppHandle) -> u32 {
   logger::log_to_file(app_handle.to_owned(), "Checking config/loginusers.vdf for current user info.", 0);
 
   let steam_root = get_steam_root_dir();
   let loginusers_vdf = steam_root.join("config/loginusers.vdf");
-  let contents = fs::read_to_string(loginusers_vdf).unwrap();
+  let contents: String = fs::read_to_string(loginusers_vdf).unwrap();
+
+  let close_braces_matches: Vec<_> = contents.match_indices("}").collect();
+  let most_recent_matches: Vec<_> = contents.match_indices("\"MostRecent\"").collect();
 
-  let users = vdf_serde::from_str::<HashMap<String, vdf_structs::User>>(&contents).unwrap();
+  const MOST_RECENT_LEN: usize = 12;
+  const VAL_TABS_LEN: usize = 2;
+  const START_OFFSET: usize = 11;
 
-  for (key, value) in users.into_iter() {
-    if value.MostRecent == "1" {
-      let big_id = key.parse::<u64>().unwrap() - 76561197960265728;
+  for (vec_index, (index, _)) in most_recent_matches.iter().enumerate() {
+    let most_recent_str: String = contents.chars().skip(index + MOST_RECENT_LEN + VAL_TABS_LEN + 1).take(1).collect();
+    let most_recent = most_recent_str.parse::<u32>().unwrap() == 1;
+
+    if most_recent {
+      let chars: String;
+
+      if vec_index == 0 {
+        chars = contents.chars().skip(START_OFFSET + 1).take(contents.len() - START_OFFSET - 2).collect();
+      } else {
+        let (brace_index, _) = close_braces_matches[vec_index];
+        chars = contents.chars().skip(brace_index + 4).take(contents.len() - brace_index - 2).collect();
+      }
+      
+      let next_quote = chars.find("\"").unwrap();
+      let user_id_64_str: String = chars.chars().take(next_quote).collect();
+
+      let big_id = user_id_64_str.parse::<u64>().unwrap() - 76561197960265728;
       let id = u32::try_from(big_id).expect("Should have been able to convert subtracted big_id to u32.");
 
       logger::log_to_file(app_handle.to_owned(), format!("Got current_user_id: {}", id).as_str(), 0);
@@ -111,93 +110,4 @@ pub fn get_active_user(app_handle: AppHandle) -> u32 {
   logger::log_to_file(app_handle, "Did not find a most recent user", 2);
 
   return 0;
-}
-
-// ! This isn't needed anymore but leaving it because in the event something changes its still quite useful.
-// #[tauri::command]
-// #[cfg(target_os = "windows")]
-// pub fn get_steam_apps(app_handle: AppHandle) -> String {
-//   let mut steam_apps: String = "".to_owned();
-
-//   logger::log_to_file(app_handle.to_owned(), "Checking registry for steam games.", 0);
-
-//   let hkcu = RegKey::predef(HKEY_CURRENT_USER);
-//   let steam_apps_reg = hkcu.open_subkey("SOFTWARE\\Valve\\Steam\\Apps").expect("Couldn't Apps from the registry");
-
-//   for field in steam_apps_reg.enum_keys().map(|x| x.unwrap()) {
-//     let mut app: String = "".to_owned();
-//     app.push_str("\"appId\":");
-//     app.push_str(&field);
-//     app.push_str(",");
-
-//     let app_reg: RegKey = steam_apps_reg.open_subkey(field).expect("Couldn't get app from registry");
-//     let mut app_name = "";
-
-//     let app_name_reg: Result<String> = app_reg.get_value("Name");
-
-//     if app_name_reg.is_ok() {
-//       app_name = app_name_reg.as_ref().unwrap();
-//     }
-    
-//     app.push_str("\"name\":\"");
-//     app.push_str(app_name);
-//     app.push_str("\",");
-//     let mut updated_app = "".to_owned();
-//     updated_app.push_str("{");
-//     updated_app.push_str(&app[..(app.len() - 1)]);
-//     updated_app.push_str("},");
-
-//     steam_apps.push_str(&updated_app);
-//   }
-
-//   let mut updated_apps = "".to_owned();
-//   updated_apps.push_str(&"[");
-//   updated_apps.push_str(&steam_apps[..(steam_apps.len() - 1)]);
-//   updated_apps.push_str(&"]");
-    
-//   return updated_apps;
-// }
-
-// #[tauri::command]
-// #[cfg(target_os = "linux")]
-// pub fn get_steam_apps(app_handle: AppHandle) -> String {
-//   let mut steam_apps: String = "".to_owned();
-
-//   logger::log_to_file(app_handle.to_owned(), "Checking registry.vdf for steam games.", 0);
-
-//   let steam_root = get_steam_root_dir();
-//   let registry_vdf = steam_root.parent().expect("Parent should have existed").join("registry.vdf");
-//   let contents = fs::read_to_string(registry_vdf).unwrap();
-
-//   let steam_apps_res = vdf_serde::from_str::<vdf_structs::Registry>(&contents).unwrap().HKCU.Software.Valve.Steam.apps;
-
-//   for (key, value) in steam_apps_res.into_iter() {
-//     let mut app: String = "".to_owned();
-//     app.push_str("\"appId\":");
-//     app.push_str(&key);
-//     app.push_str(",");
-
-//     let mut app_name = "";
-
-//     if value.contains_key("name") {
-//       app_name = value.get("name").unwrap().as_ref();
-//     }
-    
-//     app.push_str("\"name\":\"");
-//     app.push_str(app_name);
-//     app.push_str("\",");
-//     let mut updated_app = "".to_owned();
-//     updated_app.push_str("{");
-//     updated_app.push_str(&app[..(app.len() - 1)]);
-//     updated_app.push_str("},");
-
-//     steam_apps.push_str(&updated_app);
-//   }
-
-//   let mut updated_apps = "".to_owned();
-//   updated_apps.push_str(&"[");
-//   updated_apps.push_str(&steam_apps[..(steam_apps.len() - 1)]);
-//   updated_apps.push_str(&"]");
-    
-//   return updated_apps;
-// }
+}

src-tauri/src/vdf_structs.rs

@@ -15,7 +15,6 @@ pub struct User {
 }
 
 
-
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 #[allow(non_snake_case)]
 pub struct HKLMSteam {