mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 06:25:41 +00:00
fix(cli): suppress dead-code warnings on Windows for Linux-only helpers
Wrap tauri_identifier, single_instance_bus_name and single_instance_object_path with #[cfg(target_os = "linux")] since they are only reachable via D-Bus paths. Move the argv collection into the linux-only block in lib.rs for the same reason. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -517,6 +517,7 @@ fn print_search_human(v: &Value) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
fn tauri_identifier() -> &'static str {
|
fn tauri_identifier() -> &'static str {
|
||||||
static ID: OnceLock<String> = OnceLock::new();
|
static ID: OnceLock<String> = OnceLock::new();
|
||||||
ID.get_or_init(|| {
|
ID.get_or_init(|| {
|
||||||
@@ -531,10 +532,12 @@ fn tauri_identifier() -> &'static str {
|
|||||||
.as_str()
|
.as_str()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
fn single_instance_bus_name() -> String {
|
fn single_instance_bus_name() -> String {
|
||||||
format!("{}.SingleInstance", tauri_identifier())
|
format!("{}.SingleInstance", tauri_identifier())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
fn single_instance_object_path(dbus_name: &str) -> String {
|
fn single_instance_object_path(dbus_name: &str) -> String {
|
||||||
let mut dbus_path = dbus_name.replace('.', "/").replace('-', "_");
|
let mut dbus_path = dbus_name.replace('.', "/").replace('-', "_");
|
||||||
if !dbus_path.starts_with('/') {
|
if !dbus_path.starts_with('/') {
|
||||||
|
|||||||
@@ -2253,11 +2253,10 @@ fn is_tiling_wm_cmd() -> bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn run() {
|
pub fn run() {
|
||||||
let argv: Vec<String> = std::env::args().collect();
|
|
||||||
|
|
||||||
// Linux: second `psysonic --player …` forwards over D-Bus before heavy startup.
|
// Linux: second `psysonic --player …` forwards over D-Bus before heavy startup.
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
{
|
{
|
||||||
|
let argv: Vec<String> = std::env::args().collect();
|
||||||
if crate::cli::parse_cli_command(&argv).is_some() {
|
if crate::cli::parse_cli_command(&argv).is_some() {
|
||||||
match crate::cli::linux_try_forward_player_cli_secondary(&argv) {
|
match crate::cli::linux_try_forward_player_cli_secondary(&argv) {
|
||||||
Ok(crate::cli::LinuxPlayerForwardResult::Forwarded) => std::process::exit(0),
|
Ok(crate::cli::LinuxPlayerForwardResult::Forwarded) => std::process::exit(0),
|
||||||
|
|||||||
Reference in New Issue
Block a user