gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: destroy the deref clone stackoverflow

Browse Source
This commit is contained in:
Luke D Jones
2021-03-11 23:42:38 +13:00
parent 01386599f4
commit 8a63dce85f
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -33,7 +33,7 @@ dependencies = [
[[package]] [[package]]
name = "asusctl" name = "asusctl"
version = "3.1.2" version = "3.1.3"
dependencies = [ dependencies = [
"daemon", "daemon",
"gumdrop", "gumdrop",

2
asusctl/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "asusctl" name = "asusctl"
version = "3.1.2" version = "3.1.3"
authors = ["Luke D Jones <luke@ljones.dev>"] authors = ["Luke D Jones <luke@ljones.dev>"]
edition = "2018" edition = "2018"

21
asusctl/src/main.rs
View File

@@ -4,12 +4,7 @@ use daemon::{
}; };
use gumdrop::{Opt, Options}; use gumdrop::{Opt, Options};
use rog_dbus::AuraDbusClient; use rog_dbus::AuraDbusClient;
use rog_types::{ use rog_types::{anime_matrix::{AniMeDataBuffer, FULL_PANE_LEN}, aura_modes::AuraModes, cli_options::{AniMeActions, AniMeStatusValue, LedBrightness, SetAuraBuiltin}, gfx_vendors::GfxVendors, profile::{FanLevel, ProfileCommand, ProfileEvent}};
anime_matrix::{AniMeDataBuffer, FULL_PANE_LEN},
cli_options::{AniMeActions, AniMeStatusValue, LedBrightness, SetAuraBuiltin},
gfx_vendors::GfxVendors,
profile::{FanLevel, ProfileCommand, ProfileEvent},
};
use std::env::args; use std::env::args;
use yansi_term::Colour::Green; use yansi_term::Colour::Green;
use yansi_term::Colour::Red; use yansi_term::Colour::Red;
@@ -336,17 +331,23 @@ fn handle_led_mode(
} }
println!("\nHelp can also be requested on modes, e.g: static --help"); println!("\nHelp can also be requested on modes, e.g: static --help");
std::process::exit(1); return Ok(());
} }
if mode.next_mode && mode.prev_mode { if mode.next_mode && mode.prev_mode {
println!("Please specify either next or previous") println!("Please specify either next or previous");
return Ok(());
} }
if mode.next_mode { if mode.next_mode {
dbus.proxies().led().next_led_mode()?; dbus.proxies().led().next_led_mode()?;
} else if mode.prev_mode { } else if mode.prev_mode {
dbus.proxies().led().prev_led_mode()?; dbus.proxies().led().prev_led_mode()?;
} else if let Some(command) = mode.command.as_ref() { } else if let Some(mode) = mode.command.as_ref() {
dbus.proxies().led().set_led_mode(&command.into())? if mode.help_requested() {
println!("{}", mode.self_usage());
return Ok(());
}
dbus.proxies().led().set_led_mode(&<AuraModes>::from(mode))?;
} }
Ok(()) Ok(())
} }

34
rog-types/src/aura_modes.rs
View File

@@ -204,28 +204,28 @@ pub enum AuraModes {
impl From<SetAuraBuiltin> for AuraModes { impl From<SetAuraBuiltin> for AuraModes {
fn from(mode: SetAuraBuiltin) -> Self { fn from(mode: SetAuraBuiltin) -> Self {
match mode { (&mode).into()
SetAuraBuiltin::Static(x) => AuraModes::Static(x),
SetAuraBuiltin::Breathe(x) => AuraModes::Breathe(x),
SetAuraBuiltin::Strobe(x) => AuraModes::Strobe(x),
SetAuraBuiltin::Rainbow(x) => AuraModes::Rainbow(x),
SetAuraBuiltin::Star(x) => AuraModes::Star(x),
SetAuraBuiltin::Rain(x) => AuraModes::Rain(x),
SetAuraBuiltin::Highlight(x) => AuraModes::Highlight(x),
SetAuraBuiltin::Laser(x) => AuraModes::Laser(x),
SetAuraBuiltin::Ripple(x) => AuraModes::Ripple(x),
SetAuraBuiltin::Pulse(x) => AuraModes::Pulse(x),
SetAuraBuiltin::Comet(x) => AuraModes::Comet(x),
SetAuraBuiltin::Flash(x) => AuraModes::Flash(x),
SetAuraBuiltin::MultiStatic(x) => AuraModes::MultiStatic(x),
SetAuraBuiltin::MultiBreathe(x) => AuraModes::MultiBreathe(x),
}
} }
} }
impl From<&SetAuraBuiltin> for AuraModes { impl From<&SetAuraBuiltin> for AuraModes {
fn from(mode: &SetAuraBuiltin) -> Self { fn from(mode: &SetAuraBuiltin) -> Self {
mode.clone().into() match mode {
SetAuraBuiltin::Static(x) => AuraModes::Static(x.clone()),
SetAuraBuiltin::Breathe(x) => AuraModes::Breathe(x.clone()),
SetAuraBuiltin::Strobe(x) => AuraModes::Strobe(x.clone()),
SetAuraBuiltin::Rainbow(x) => AuraModes::Rainbow(x.clone()),
SetAuraBuiltin::Star(x) => AuraModes::Star(x.clone()),
SetAuraBuiltin::Rain(x) => AuraModes::Rain(x.clone()),
SetAuraBuiltin::Highlight(x) => AuraModes::Highlight(x.clone()),
SetAuraBuiltin::Laser(x) => AuraModes::Laser(x.clone()),
SetAuraBuiltin::Ripple(x) => AuraModes::Ripple(x.clone()),
SetAuraBuiltin::Pulse(x) => AuraModes::Pulse(x.clone()),
SetAuraBuiltin::Comet(x) => AuraModes::Comet(x.clone()),
SetAuraBuiltin::Flash(x) => AuraModes::Flash(x.clone()),
SetAuraBuiltin::MultiStatic(x) => AuraModes::MultiStatic(x.clone()),
SetAuraBuiltin::MultiBreathe(x) => AuraModes::MultiBreathe(x.clone()),
}
} }
} }