diff --git a/Cargo.toml b/Cargo.toml index 11543fe..8289c2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" description = "A wip universal Linux settings application." [dependencies] -reset_daemon = "0.2.3" +reset_daemon = "0.2.4" ReSet-Lib = "0.4.6" adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] } dbus = "0.9.7" diff --git a/src/components/base/cardEntry.rs b/src/components/base/cardEntry.rs index 4ecb67e..6f0ce9d 100644 --- a/src/components/base/cardEntry.rs +++ b/src/components/base/cardEntry.rs @@ -5,7 +5,7 @@ use adw::glib::Object; use adw::prelude::{ComboRowExt, PreferencesRowExt}; use dbus::blocking::Connection; use dbus::Error; -use glib::{Cast, clone, ObjectExt, ToValue}; +use glib::{Cast, clone, ObjectExt}; use glib::subclass::types::ObjectSubclassIsExt; use gtk::{Align, gio, SignalListItemFactory, StringList, StringObject}; use gtk::prelude::{GObjectPropertyExpressionExt, ListItemExt, WidgetExt}; diff --git a/src/components/base/utils.rs b/src/components/base/utils.rs index 0e5ea4d..c9cb5ff 100644 --- a/src/components/base/utils.rs +++ b/src/components/base/utils.rs @@ -137,7 +137,7 @@ impl dbus::message::SignalArgs for SinkRemoved { impl GetVal<(u32,)> for SinkRemoved { fn get_value(&self) -> (u32,) { - (self.index.clone(),) + (self.index,) } } @@ -215,7 +215,7 @@ impl dbus::message::SignalArgs for InputStreamRemoved { impl GetVal<(u32,)> for InputStreamRemoved { fn get_value(&self) -> (u32,) { - (self.index.clone(),) + (self.index,) } } @@ -299,7 +299,7 @@ impl dbus::message::SignalArgs for SourceRemoved { impl GetVal<(u32,)> for SourceRemoved { fn get_value(&self) -> (u32,) { - (self.index.clone(),) + (self.index,) } } @@ -377,7 +377,7 @@ impl dbus::message::SignalArgs for OutputStreamRemoved { impl GetVal<(u32,)> for OutputStreamRemoved { fn get_value(&self) -> (u32,) { - (self.index.clone(),) + (self.index,) } } @@ -387,7 +387,7 @@ pub fn start_audio_listener( source_box: Option>, ) { gio::spawn_blocking(move || { - let mut conn = Connection::new_session().unwrap(); + let conn = Connection::new_session().unwrap(); if listeners.pulse_listener.load(Ordering::SeqCst) { return; } diff --git a/src/components/bluetooth/bluetoothBox.rs b/src/components/bluetooth/bluetoothBox.rs index f2e0872..c03037d 100644 --- a/src/components/bluetooth/bluetoothBox.rs +++ b/src/components/bluetooth/bluetoothBox.rs @@ -166,7 +166,7 @@ pub fn start_bluetooth_listener(listeners: Arc, bluetooth_box: Arc) { let default_sink = output_box_imp.resetDefaultSource.clone(); let source = default_sink.borrow(); - let volume = source.volume.first().unwrap_or_else(|| &(0 as u32)); + let volume = source.volume.first().unwrap_or(&0_u32); let fraction = (*volume as f64 / 655.36).round(); let percentage = (fraction).to_string() + "%"; output_box_imp.resetVolumePercentage.set_text(&percentage); @@ -441,7 +441,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc) -> let output_box = source_box.clone(); let output_box_imp = output_box.imp(); let is_default = ir.source.name == default_source.name; - let volume = ir.source.volume.first().unwrap_or_else(|| &(0 as u32)); + let volume = ir.source.volume.first().unwrap_or(&0_u32); let fraction = (*volume as f64 / 655.36).round(); let percentage = (fraction).to_string() + "%"; let list = output_box_imp.resetSourceList.read().unwrap(); @@ -531,7 +531,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc) -> } let name = ir.stream.application_name.clone() + ": " + ir.stream.name.as_str(); imp.resetSourceName.set_text(name.as_str()); - let volume = ir.stream.volume.first().unwrap_or_else(|| &(0 as u32)); + let volume = ir.stream.volume.first().unwrap_or(&0_u32); let fraction = (*volume as f64 / 655.36).round(); let percentage = (fraction).to_string() + "%"; imp.resetVolumePercentage.set_text(&percentage); diff --git a/src/components/input/sourceBoxImpl.rs b/src/components/input/sourceBoxImpl.rs index cc29a0d..4209436 100644 --- a/src/components/input/sourceBoxImpl.rs +++ b/src/components/input/sourceBoxImpl.rs @@ -7,7 +7,7 @@ use adw::{ActionRow, ComboRow, PreferencesGroup}; use crate::components::base::listEntry::ListEntry; use crate::components::input::sourceBox; use gtk::subclass::prelude::*; -use gtk::{glib, CheckButton, CompositeTemplate, DropDown, StringList, TemplateChild}; +use gtk::{glib, CheckButton, CompositeTemplate, StringList, TemplateChild}; use gtk::{prelude::*, Button, Label, ProgressBar, Scale}; use ReSet_Lib::audio::audio::Source; diff --git a/src/components/input/sourceEntry.rs b/src/components/input/sourceEntry.rs index f8dd676..f22eff4 100644 --- a/src/components/input/sourceEntry.rs +++ b/src/components/input/sourceEntry.rs @@ -30,7 +30,7 @@ impl SourceEntry { let imp = obj.imp(); imp.resetSourceName.set_text(stream.alias.clone().as_str()); let name = Arc::new(stream.name.clone()); - let volume = stream.volume.first().unwrap_or_else(|| &(0 as u32)); + let volume = stream.volume.first().unwrap_or(&0_u32); let fraction = (*volume as f64 / 655.36).round(); let percentage = (fraction).to_string() + "%"; imp.resetVolumePercentage.set_text(&percentage); diff --git a/src/components/output/inputStreamEntry.rs b/src/components/output/inputStreamEntry.rs index 3c80f5b..e8cd95d 100644 --- a/src/components/output/inputStreamEntry.rs +++ b/src/components/output/inputStreamEntry.rs @@ -37,7 +37,7 @@ impl InputStreamEntry { } let name = stream.application_name.clone() + ": " + stream.name.as_str(); imp.resetSinkName.set_text(name.as_str()); - let volume = stream.volume.first().unwrap_or_else(|| &(0 as u32)); + let volume = stream.volume.first().unwrap_or(&0_u32); let fraction = (*volume as f64 / 655.36).round(); let percentage = (fraction).to_string() + "%"; imp.resetVolumePercentage.set_text(&percentage); diff --git a/src/components/output/sinkBox.rs b/src/components/output/sinkBox.rs index 3dbcebd..87174b7 100644 --- a/src/components/output/sinkBox.rs +++ b/src/components/output/sinkBox.rs @@ -445,7 +445,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc) -> Co let output_box = sink_box.clone(); let output_box_imp = output_box.imp(); let is_default = ir.sink.name == default_sink.name; - let volume = ir.sink.volume.first().unwrap_or_else(|| &(0 as u32)); + let volume = ir.sink.volume.first().unwrap_or(&0_u32); let fraction = (*volume as f64 / 655.36).round(); let percentage = (fraction).to_string() + "%"; @@ -532,7 +532,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc) -> Co } let name = ir.stream.application_name.clone() + ": " + ir.stream.name.as_str(); imp.resetSinkName.set_text(name.as_str()); - let volume = ir.stream.volume.first().unwrap_or_else(|| &(0 as u32)); + let volume = ir.stream.volume.first().unwrap_or(&0_u32); let fraction = (*volume as f64 / 655.36).round(); let percentage = (fraction).to_string() + "%"; imp.resetVolumePercentage.set_text(&percentage); diff --git a/src/components/output/sinkBoxImpl.rs b/src/components/output/sinkBoxImpl.rs index e87438f..26aa88e 100644 --- a/src/components/output/sinkBoxImpl.rs +++ b/src/components/output/sinkBoxImpl.rs @@ -8,7 +8,7 @@ use crate::components::base::listEntry::ListEntry; use crate::components::output::inputStreamEntry::InputStreamEntry; use gtk::subclass::prelude::*; use gtk::{ - glib, Box, Button, CheckButton, CompositeTemplate, DropDown, Label, StringList, TemplateChild, + glib, Box, Button, CheckButton, CompositeTemplate, Label, StringList, TemplateChild, }; use gtk::{prelude::*, ProgressBar, Scale}; use ReSet_Lib::audio::audio::Sink; diff --git a/src/components/output/sinkEntry.rs b/src/components/output/sinkEntry.rs index 592532a..303c17e 100644 --- a/src/components/output/sinkEntry.rs +++ b/src/components/output/sinkEntry.rs @@ -28,7 +28,7 @@ impl SinkEntry { let imp = obj.imp(); imp.resetSinkName.set_text(stream.alias.clone().as_str()); let name = Arc::new(stream.name.clone()); - let volume = stream.volume.first().unwrap_or_else(|| &(0 as u32)); + let volume = stream.volume.first().unwrap_or(&0_u32); let fraction = (*volume as f64 / 655.36).round(); let percentage = (fraction).to_string() + "%"; imp.resetVolumePercentage.set_text(&percentage); diff --git a/src/components/wifi/wifiAddressEntry.rs b/src/components/wifi/wifiAddressEntry.rs index ca651ae..62f569d 100644 --- a/src/components/wifi/wifiAddressEntry.rs +++ b/src/components/wifi/wifiAddressEntry.rs @@ -25,9 +25,9 @@ impl WifiAddressEntry { let addr = getValueFromKey(&map, "address"); let prefix = getValueFromKey(&map, "prefix-length"); - entryImp.resetAddressAddress.set_text(&*addr); - entryImp.resetAddressNetmask.set_text(&*prefix); - entryImp.resetAddressRow.set_title(&*format!("{}, {}", addr, prefix)); + entryImp.resetAddressAddress.set_text(&addr); + entryImp.resetAddressNetmask.set_text(&prefix); + entryImp.resetAddressRow.set_title(&format!("{}, {}", addr, prefix)); } entry } diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs index b8a4a0c..ea7df37 100644 --- a/src/components/wifi/wifiBox.rs +++ b/src/components/wifi/wifiBox.rs @@ -1,18 +1,18 @@ use std::collections::HashMap; -use std::net::Shutdown::Read; + use std::sync::atomic::Ordering; -use std::sync::mpsc::{channel, Receiver, Sender}; + use std::sync::Arc; -use std::thread; + use std::time::Duration; -use crate::components::base::listEntry::ListEntry; + use crate::components::base::utils::Listeners; use adw::glib; use adw::glib::Object; use adw::prelude::{ListBoxRowExt, PreferencesGroupExt}; use adw::subclass::prelude::ObjectSubclassIsExt; -use dbus::arg::{AppendAll, ReadAll, RefArg}; +use dbus::arg::{RefArg}; use dbus::blocking::Connection; use dbus::message::SignalArgs; use dbus::Error; @@ -22,9 +22,9 @@ use gtk::gio; use gtk::glib::Variant; use gtk::prelude::{ActionableExt, WidgetExt}; use ReSet_Lib::network::network::{AccessPoint, WifiStrength}; -use ReSet_Lib::signals::{AccessPointAdded, GetVal}; +use ReSet_Lib::signals::{AccessPointAdded}; use ReSet_Lib::signals::{AccessPointChanged, AccessPointRemoved}; -use ReSet_Lib::utils::Events; + use crate::components::wifi::wifiBoxImpl; use crate::components::wifi::wifiEntry::WifiEntry; @@ -63,9 +63,9 @@ impl WifiBox { } } -pub fn scanForWifi(listeners: Arc, wifiBox: Arc) { +pub fn scanForWifi(_listeners: Arc, wifiBox: Arc) { let wifibox_ref = wifiBox.clone(); - let wifibox_ref_listener = wifiBox.clone(); + let _wifibox_ref_listener = wifiBox.clone(); let wifiEntries = wifiBox.imp().wifiEntries.clone(); let wifiEntriesPath = wifiBox.imp().wifiEntriesPath.clone(); diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs index 6263d2d..60a6c1a 100644 --- a/src/components/wifi/wifiBoxImpl.rs +++ b/src/components/wifi/wifiBoxImpl.rs @@ -3,7 +3,7 @@ use adw::{ActionRow, ComboRow, NavigationView, PreferencesGroup}; use dbus::Path; use gtk::prelude::*; use gtk::subclass::prelude::*; -use gtk::{glib, CompositeTemplate, ListBox, Switch}; +use gtk::{glib, CompositeTemplate, Switch}; use std::collections::HashMap; use std::sync::{Arc, Mutex}; diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs index 9a45cde..aac9e41 100644 --- a/src/components/wifi/wifiEntry.rs +++ b/src/components/wifi/wifiEntry.rs @@ -7,10 +7,10 @@ use adw::glib::{Object, PropertySet}; use adw::prelude::{ActionRowExt, ButtonExt, EditableExt, PopoverExt}; use adw::subclass::prelude::ObjectSubclassIsExt; use dbus::blocking::Connection; -use dbus::{Error, Path}; -use glib::{clone, Cast}; +use dbus::{Error}; +use glib::{clone}; use gtk::prelude::{ListBoxRowExt, WidgetExt}; -use gtk::{gio, AlertDialog, GestureClick}; +use gtk::{gio}; use ReSet_Lib::network::network::{AccessPoint, WifiStrength}; use crate::components::wifi::wifiBox::getConnectionSettings; @@ -18,7 +18,7 @@ use crate::components::wifi::wifiBoxImpl::WifiBox; use crate::components::wifi::wifiEntryImpl; use crate::components::wifi::wifiOptions::WifiOptions; -use super::savedWifiEntry::SavedWifiEntry; + glib::wrapper! { pub struct WifiEntry(ObjectSubclass) @@ -133,7 +133,7 @@ pub fn click_stored_network(entry: Arc) { ); glib::spawn_future(async move { glib::idle_add_once(move || { - let imp = entry_ref.imp(); + let _imp = entry_ref.imp(); if res.is_err() { println!("wat bro?"); result.store(false, std::sync::atomic::Ordering::SeqCst); diff --git a/src/components/wifi/wifiOptions.rs b/src/components/wifi/wifiOptions.rs index 1dfb17a..6b32cbb 100644 --- a/src/components/wifi/wifiOptions.rs +++ b/src/components/wifi/wifiOptions.rs @@ -5,7 +5,7 @@ use adw::glib::Object; use adw::prelude::{ActionRowExt, ComboRowExt, PreferencesGroupExt}; use adw::subclass::prelude::ObjectSubclassIsExt; use dbus::arg::PropMap; -use glib::{PropertySet, Cast, ObjectExt, clone}; +use glib::{PropertySet, ObjectExt}; use gtk::prelude::{EditableExt, WidgetExt}; use ReSet_Lib::network::connection::{Connection, Enum, TypeSettings}; @@ -31,13 +31,13 @@ impl WifiOptions { let selfImp = self.imp(); let conn = selfImp.connection.borrow(); // General - selfImp.resetWifiName.set_subtitle(&*conn.settings.name); + selfImp.resetWifiName.set_subtitle(&conn.settings.name); selfImp.resetWifiAutoConnect.set_active(conn.settings.autoconnect); - selfImp.resetWifiMetered.set_active(if conn.settings.metered != -1 { true } else { false }); + selfImp.resetWifiMetered.set_active(conn.settings.metered != -1); match &conn.device { - TypeSettings::WIFI(wifi) => {} - TypeSettings::ETHERNET(ethernet) => {} - TypeSettings::VPN(vpn) => {} + TypeSettings::WIFI(_wifi) => {} + TypeSettings::ETHERNET(_ethernet) => {} + TypeSettings::VPN(_vpn) => {} TypeSettings::None => {} }; // IPv4 @@ -52,8 +52,8 @@ impl WifiOptions { .join(".") }) .collect(); - selfImp.resetIP4DNS.set_text(&*ipv4Dns.join(", ")); - selfImp.resetIP4Gateway.set_text(&*conn.ipv4.gateway); + selfImp.resetIP4DNS.set_text(&ipv4Dns.join(", ")); + selfImp.resetIP4Gateway.set_text(&conn.ipv4.gateway); if conn.ipv4.address_data.is_empty() { selfImp.resetIP4AddressGroup.add(&WifiAddressEntry::new(None)) @@ -82,8 +82,8 @@ impl WifiOptions { .join(":") }) .collect(); - selfImp.resetIP6DNS.set_text(&*ipv6Dns.join(", ")); - selfImp.resetIP6Gateway.set_text(&*conn.ipv6.gateway); + selfImp.resetIP6DNS.set_text(&ipv6Dns.join(", ")); + selfImp.resetIP6Gateway.set_text(&conn.ipv6.gateway); if conn.ipv6.address_data.is_empty() { selfImp.resetIP6AddressGroup.add(&WifiAddressEntry::new(None)) diff --git a/src/components/wifi/wifiRouteEntry.rs b/src/components/wifi/wifiRouteEntry.rs index 0de75bf..f2deceb 100644 --- a/src/components/wifi/wifiRouteEntry.rs +++ b/src/components/wifi/wifiRouteEntry.rs @@ -26,11 +26,11 @@ impl WifiRouteEntry { let gateway = getValueFromKey(&map, "gateway"); let metric = getValueFromKey(&map, "metric"); - entryImp.resetRouteAddress.set_text(&*addr); - entryImp.resetRouteNetmask.set_text(&*prefix); - entryImp.resetRouteGateway.set_text(&*gateway); - entryImp.resetRouteMetric.set_text(&*metric); - entryImp.resetRouteRow.set_title(&*format!("{}, {}, {}, {}", addr, prefix, gateway, metric)); + entryImp.resetRouteAddress.set_text(&addr); + entryImp.resetRouteNetmask.set_text(&prefix); + entryImp.resetRouteGateway.set_text(&gateway); + entryImp.resetRouteMetric.set_text(&metric); + entryImp.resetRouteRow.set_title(&format!("{}, {}, {}, {}", addr, prefix, gateway, metric)); } entry } diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs index 0505660..292ad90 100644 --- a/src/components/window/handleSidebarClick.rs +++ b/src/components/window/handleSidebarClick.rs @@ -94,7 +94,7 @@ pub const HANDLE_VOLUME_CLICK: fn(Arc, FlowBox) = listeners.stop_bluetooth_listener(); let audioOutput = Arc::new(SinkBox::new()); start_audio_listener(listeners.clone(), Some(audioOutput.clone()), None); - while !listeners.pulse_listener.load(Ordering::SeqCst) {} + while !listeners.pulse_listener.load(Ordering::SeqCst) { std::hint::spin_loop() } populate_sinks(audioOutput.clone()); let audioFrame = wrapInFrame(SettingBox::new(&*audioOutput)); resetMain.remove_all(); diff --git a/src/components/window/window.rs b/src/components/window/window.rs index 4d18560..61c66e1 100644 --- a/src/components/window/window.rs +++ b/src/components/window/window.rs @@ -81,7 +81,7 @@ impl Window { pub fn filterList(&self) { let text = self.imp().resetSearchEntry.text().to_string(); for (mainEntry, subEntries) in self.imp().sidebarEntries.borrow().iter() { - if text == "" { + if text.is_empty() { mainEntry.set_visible(true); for subEntry in subEntries { subEntry.set_visible(true); diff --git a/src/components/window/windowImpl.rs b/src/components/window/windowImpl.rs index c468dcc..4c096d1 100644 --- a/src/components/window/windowImpl.rs +++ b/src/components/window/windowImpl.rs @@ -6,7 +6,7 @@ use adw::subclass::prelude::AdwApplicationWindowImpl; use adw::{Breakpoint, OverlaySplitView}; use glib::subclass::InitializingObject; use gtk::subclass::prelude::*; -use gtk::{glib, Box, Button, CompositeTemplate, FlowBox, ListBox, PopoverMenu, SearchEntry}; +use gtk::{glib, Button, CompositeTemplate, FlowBox, ListBox, PopoverMenu, SearchEntry}; use crate::components::base::utils::Listeners; use crate::components::wifi::wifiBox::WifiBox;