chore: remove comments
This commit is contained in:
parent
307e0c9747
commit
a554c53f89
@ -1,6 +1,5 @@
|
|||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::process::Command;
|
|
||||||
use sysinfo::Pid;
|
use sysinfo::Pid;
|
||||||
|
|
||||||
pub fn check_folder_completeness<P: AsRef<Path>>(folder_path: P, required_files: &[&str]) -> f32 {
|
pub fn check_folder_completeness<P: AsRef<Path>>(folder_path: P, required_files: &[&str]) -> f32 {
|
||||||
@ -72,7 +71,6 @@ pub fn set_osu_user_config_vals(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Collect indices and keys to update to avoid borrow checker issues
|
|
||||||
let mut updates = Vec::new();
|
let mut updates = Vec::new();
|
||||||
for (i, line) in lines.iter().enumerate() {
|
for (i, line) in lines.iter().enumerate() {
|
||||||
if let Some((existing_key, _)) = line.split_once(" = ") {
|
if let Some((existing_key, _)) = line.split_once(" = ") {
|
||||||
@ -87,7 +85,6 @@ pub fn set_osu_user_config_vals(
|
|||||||
keys_to_add.remove(trimmed_key.as_str());
|
keys_to_add.remove(trimmed_key.as_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add new keys that were not found
|
|
||||||
for key in keys_to_add {
|
for key in keys_to_add {
|
||||||
if let Some(value) = keys_to_set.get(key) {
|
if let Some(value) = keys_to_set.get(key) {
|
||||||
lines.push(format!("{} = {}", key, value));
|
lines.push(format!("{} = {}", key, value));
|
||||||
@ -140,7 +137,6 @@ pub fn set_osu_config_vals(
|
|||||||
keys_to_add.remove(trimmed_key.as_str());
|
keys_to_add.remove(trimmed_key.as_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add new keys that were not found
|
|
||||||
for key in keys_to_add {
|
for key in keys_to_add {
|
||||||
if let Some(value) = keys_to_set.get(key) {
|
if let Some(value) = keys_to_set.get(key) {
|
||||||
lines.push(format!("{} = {}", key, value));
|
lines.push(format!("{} = {}", key, value));
|
||||||
@ -179,12 +175,13 @@ pub fn get_osu_config<P: AsRef<Path>>(
|
|||||||
|
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
pub fn is_osuwinello_available() -> bool {
|
pub fn is_osuwinello_available() -> bool {
|
||||||
|
use std::process::Command;
|
||||||
Command::new("osu-wine")
|
Command::new("osu-wine")
|
||||||
.arg("--info") // A lightweight operation like getting the version is ideal.
|
.arg("--info")
|
||||||
.stdout(std::process::Stdio::null()) // Suppress stdout
|
.stdout(std::process::Stdio::null())
|
||||||
.stderr(std::process::Stdio::null()) // Suppress stderr
|
.stderr(std::process::Stdio::null())
|
||||||
.status() // Execute the command and get its status
|
.status()
|
||||||
.is_ok() // is_ok() will be true if the command was found and ran
|
.is_ok()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
@ -194,12 +191,13 @@ pub fn is_osuwinello_available() -> bool {
|
|||||||
|
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
pub fn is_wmctrl_available() -> bool {
|
pub fn is_wmctrl_available() -> bool {
|
||||||
|
use std::process::Command;
|
||||||
Command::new("wmctrl")
|
Command::new("wmctrl")
|
||||||
.arg("-V") // A lightweight operation like getting the version is ideal.
|
.arg("-V")
|
||||||
.stdout(std::process::Stdio::null()) // Suppress stdout
|
.stdout(std::process::Stdio::null())
|
||||||
.stderr(std::process::Stdio::null()) // Suppress stderr
|
.stderr(std::process::Stdio::null())
|
||||||
.status() // Execute the command and get its status
|
.status()
|
||||||
.is_ok() // is_ok() will be true if the command was found and ran
|
.is_ok()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
@ -209,27 +207,24 @@ pub fn is_wmctrl_available() -> bool {
|
|||||||
|
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
pub fn get_window_title_by_pid(target_pid: Pid) -> String {
|
pub fn get_window_title_by_pid(target_pid: Pid) -> String {
|
||||||
|
use std::process::Command;
|
||||||
let find_title = || -> Option<String> {
|
let find_title = || -> Option<String> {
|
||||||
// 1. Execute `wmctrl -lp`
|
|
||||||
let output = Command::new("wmctrl").arg("-lp").output().ok()?;
|
let output = Command::new("wmctrl").arg("-lp").output().ok()?;
|
||||||
|
|
||||||
if !output.status.success() {
|
if !output.status.success() {
|
||||||
return None; // wmctrl command failed (e.g., not on X11)
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
let output_str = String::from_utf8(output.stdout).ok()?;
|
let output_str = String::from_utf8(output.stdout).ok()?;
|
||||||
|
|
||||||
// 2. Parse the output line by line
|
|
||||||
for line in output_str.lines() {
|
for line in output_str.lines() {
|
||||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
let parts: Vec<&str> = line.split_whitespace().collect();
|
||||||
if parts.len() < 4 {
|
if parts.len() < 4 {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The PID is typically the 3rd column (index 2)
|
|
||||||
if let Ok(pid) = parts[2].parse::<u32>() {
|
if let Ok(pid) = parts[2].parse::<u32>() {
|
||||||
if pid == target_pid.as_u32() {
|
if pid == target_pid.as_u32() {
|
||||||
// 3. Extract the title and return it as Some(title)
|
|
||||||
let title = parts[4..].join(" ");
|
let title = parts[4..].join(" ");
|
||||||
return Some(title);
|
return Some(title);
|
||||||
}
|
}
|
||||||
@ -271,11 +266,11 @@ pub fn get_window_title_by_pid(pid: Pid) -> String {
|
|||||||
let title_str = title.to_string_lossy().into_owned();
|
let title_str = title.to_string_lossy().into_owned();
|
||||||
if !title_str.is_empty() {
|
if !title_str.is_empty() {
|
||||||
*result.lock().unwrap() = Some(title_str);
|
*result.lock().unwrap() = Some(title_str);
|
||||||
return 0; // Stop enumeration
|
return 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
1 // Continue enumeration
|
1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user