working provider class

Signed-off-by: Deren Vural <[email protected]>

Author: Deren Vural

src/property/imp.rs

@@ -21,9 +21,9 @@
 // Imports
 use gtk::glib::once_cell::sync::Lazy;
 use gtk::glib::{self, ParamSpec, Value};
-use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use std::cell::Cell;
+use glib::ToValue;
 
 // Modules
 use crate::formatter::Formatter;

src/property/mod.rs

@@ -24,7 +24,7 @@ mod imp;
 // Imports
 use glib::Object;
 use gtk::glib;
-use gtk::prelude::ObjectExt;
+use gtk::prelude::*;
 
 // Modules
 use crate::formatter::Formatter;
@@ -119,4 +119,34 @@ impl Property {
     pub fn get_call_extension(&self) -> String {
         self.property::<String>("call-extension")
     }
+
+    pub fn open_settings(&self) {
+        if self.property::<bool>("settings") {
+            //
+        } else {
+            //
+        }
+    }
+}
+
+/*
+ * Trait Name:
+ * Default
+ *
+ * Description:
+ * Default object
+ *
+ * Made:
+ * 09/10/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ *
+ */
+impl Default for Property {
+    fn default() -> Self {
+        Self::new(&Processor::new("", ""), &"", &"", &Formatter::new(), &0)
+    }
 }

src/provider/imp.rs

@@ -25,9 +25,18 @@ use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use std::cell::Cell;
 
+// Modules
+use crate::property::Property;
+
 // Object holding the State
 #[derive(Default)]
-pub struct Provider;
+pub struct Provider {
+    utilization: Cell<Property>,
+    temperature: Cell<Property>,
+    memory_usage: Cell<Property>,
+    fan_speed: Cell<Property>,
+    power_usage: Cell<Property>,
+}
 
 // The central trait for subclassing a GObject
 #[glib::object_subclass]
@@ -82,7 +91,13 @@ impl ObjectImpl for Provider {
      * glib::ParamSpecObject::builder("formatter").build(),
      */
     fn properties() -> &'static [ParamSpec] {
-        static PROPERTIES: Lazy<Vec<ParamSpec>> = Lazy::new(|| vec![]);
+        static PROPERTIES: Lazy<Vec<ParamSpec>> = Lazy::new(|| vec![
+            glib::ParamSpecObject::builder("utilization-property", glib::Type::OBJECT).build(),
+            glib::ParamSpecObject::builder("temperature-property", glib::Type::OBJECT).build(),
+            glib::ParamSpecObject::builder("memory-usage-property", glib::Type::OBJECT).build(),
+            glib::ParamSpecObject::builder("fan-speed-property", glib::Type::OBJECT).build(),
+            glib::ParamSpecObject::builder("power-usage-property", glib::Type::OBJECT).build(),
+        ]);
 
         //println!("PROPERTIES: {:?}", PROPERTIES);//TEST
         //println!("trying to add `base_call`: {:?}", glib::ParamSpecString::builder("base_call").build());//TEST
@@ -110,6 +125,36 @@ impl ObjectImpl for Provider {
         //println!("setting: {:?}", pspec.name());//TEST
 
         match pspec.name() {
+            "utilization" => {
+                let input_utilization_property = value
+                    .get()
+                    .expect("The value needs to be of type `Property`.");
+                self.utilization.replace(input_utilization_property);
+            }
+            "temperature" => {
+                let input_temperature_property = value
+                    .get()
+                    .expect("The value needs to be of type `Property`.");
+                self.temperature.replace(input_temperature_property);
+            }
+            "memory-usage" => {
+                let input_memory_usage_property = value
+                    .get()
+                    .expect("The value needs to be of type `Property`.");
+                self.memory_usage.replace(input_memory_usage_property);
+            }
+            "fan-speed" => {
+                let input_fan_speed_property = value
+                    .get()
+                    .expect("The value needs to be of type `Property`.");
+                self.fan_speed.replace(input_fan_speed_property);
+            }
+            "power-usage" => {
+                let input_power_usage_property = value
+                    .get()
+                    .expect("The value needs to be of type `Property`.");
+                self.power_usage.replace(input_power_usage_property);
+            }
             _ => unimplemented!(), //TODO
         }
     }
@@ -134,6 +179,46 @@ impl ObjectImpl for Provider {
         //println!("getting: {:?}", pspec.name());//TEST
 
         match pspec.name() {
+            "utilization" => {
+                //TODO: this seems ridiculous..
+                let value = self.utilization.take();
+
+                self.utilization.set(value.clone());
+
+                value.to_value()
+            }
+            "temperature" => {
+                //TODO: this seems ridiculous..
+                let value = self.temperature.take();
+
+                self.temperature.set(value.clone());
+
+                value.to_value()
+            }
+            "memory-usage" => {
+                //TODO: this seems ridiculous..
+                let value = self.memory_usage.take();
+
+                self.memory_usage.set(value.clone());
+
+                value.to_value()
+            }
+            "fan-speed" => {
+                //TODO: this seems ridiculous..
+                let value = self.fan_speed.take();
+
+                self.fan_speed.set(value.clone());
+
+                value.to_value()
+            }
+            "power-usage" => {
+                //TODO: this seems ridiculous..
+                let value = self.power_usage.take();
+
+                self.power_usage.set(value.clone());
+
+                value.to_value()
+            }
             _ => unimplemented!(), //TODO
         }
     }

src/provider/mod.rs

@@ -21,11 +21,13 @@
 // Custom GObjects
 mod imp;
 
+use crate::property::Property;
+
 // Imports
-use super::subprocess;
 use glib::Object;
-use gtk::{gio, glib, prelude::ObjectExt};
-use std::ffi::OsStr;
+use gtk::{ glib, prelude::ObjectExt };
+//use shell::*;
+use gtk::gio;
 
 // GObject wrapper for Provider
 glib::wrapper! {
@@ -34,6 +36,14 @@ glib::wrapper! {
         @implements gtk::Accessible, gtk::Actionable, gtk::Buildable, gtk::ConstraintTarget;
 }
 
+#[derive(Default)]
+pub enum ProviderType {
+    #[default]
+    NvidiaSettings = 0,
+    NvidiaSmi = 1,
+    NvidiaOptimus = 2,
+}
+
 /*
  * Trait Name:
  * Provider
@@ -67,14 +77,30 @@ impl Provider {
      * Notes:
      *
      */
-    pub fn new() -> Self {
+    pub fn new(func: fn() -> Vec<Property>/*, provider_type: ProviderType*/) -> Self {
         let obj: Provider = Object::new(&[]).expect("Failed to create `Provider`");
 
-        // TODO: set properties
-        //obj.set_property("call", base_call.to_string().clone());
+        //obj.set_property("provider-type", provider_type);
+
+        // Set properties
+        let properties: Vec<Property> = func();
+        obj.set_property("utilization", properties[0].clone());
+        obj.set_property("temperature", properties[1].clone());
+        obj.set_property("memory-usage", properties[2].clone());
+        obj.set_property("fan-speed", properties[3].clone());
+        if properties.len() == 5 {
+            obj.set_property("power-usage", properties[4].clone());
+        }
 
         obj
     }
+
+    pub fn open_settings() {
+        //let defaultAppSystem = Shell.AppSystem.get_default();
+        //let nvidiaSettingsApp = defaultAppSystem.lookup_app('nvidia-settings.desktop');
+        //let def = shell::Edge::Top;
+        let dd = gio::DesktopAppInfo::from_filename("nvidia-settings.desktop");
+    }
 }
 
 /*
@@ -95,6 +121,6 @@ impl Provider {
  */
 impl Default for Provider {
     fn default() -> Self {
-        Self::new()
+        Self::new(|| Vec::new()/*, ProviderType::NvidiaSettings*/)
     }
 }