Merge pull request #538 from peterdk/feature/wifi-link-ssid

Show SSID for Wifi connections

Author: nokyan

data/resources/ui/pages/network.ui

@@ -85,6 +85,15 @@
                         <property name="title" translatable="yes">Hardware Address</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="AdwActionRow" id="network_name">
+                        <style>
+                          <class name="property"/>
+                        </style>
+                        <property name="subtitle-selectable">true</property>
+                        <property name="title" translatable="yes">Network Name</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="AdwActionRow" id="link">
                         <style>

src/ui/pages/network.rs

@@ -46,6 +46,8 @@ mod imp {
         #[template_child]
         pub hw_address: TemplateChild<adw::ActionRow>,
         #[template_child]
+        pub network_name: TemplateChild<adw::ActionRow>,
+        #[template_child]
         pub link: TemplateChild<adw::ActionRow>,
         #[template_child]
         pub link_speed: TemplateChild<adw::ActionRow>,
@@ -115,6 +117,7 @@ mod imp {
                 driver: Default::default(),
                 interface: Default::default(),
                 hw_address: Default::default(),
+                network_name: Default::default(),
                 link: Default::default(),
                 link_speed: Default::default(),
                 uses_progress_bar: Cell::new(true),
@@ -274,6 +277,17 @@ impl ResNetwork {
             imp.hw_address.set_subtitle(&hw_address);
         }
 
+        if let Ok(wifi_link) = &wifi_link {
+            imp.network_name.set_visible(true);
+            if let Some(ssid) = &wifi_link.current.ssid {
+                imp.network_name.set_subtitle(ssid);
+            } else {
+                imp.network_name.set_subtitle(&i18n("N/A"));
+            }
+        } else {
+            imp.network_name.set_visible(false);
+        }
+
         imp.link.set_subtitle(&wifi_link.as_ref().map_or_else(
             |_| i18n("N/A"),
             |network_link_data| network_link_data.to_string(),
@@ -394,6 +408,18 @@ impl ResNetwork {
 
             (0.0, i18n("N/A"))
         };
+
+        if let Ok(wifi_link) = &wifi_link {
+            imp.network_name.set_visible(true);
+            if let Some(ssid) = &wifi_link.current.ssid {
+                imp.network_name.set_subtitle(ssid);
+            } else {
+                imp.network_name.set_subtitle(&i18n("N/A"));
+            }
+        } else {
+            imp.network_name.set_visible(false);
+        }
+
         imp.link.set_subtitle(&wifi_link.as_ref().map_or_else(
             |_| i18n("N/A"),
             |network_link_data| network_link_data.to_string(),

src/utils/link/mod.rs

@@ -30,13 +30,12 @@ pub struct LinkData<T> {
 impl<T> Display for LinkData<T>
 where
     T: Display,
-    T: Copy,
     T: PartialEq,
 {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         let has_different_max = {
-            if let Ok(max) = self.max {
-                self.current != max
+            if let Ok(max) = self.max.as_ref() {
+                self.current != *max
             } else {
                 false
             }

src/utils/link/wifi.rs

@@ -18,12 +18,13 @@ static NELI_SOCKET: LazyLock<Result<Mutex<Socket>>> = LazyLock::new(|| {
         .map(Mutex::new)
 });
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct WifiLinkData {
     pub generation: Option<WifiGeneration>,
     pub frequency_mhz: u32,
     pub rx_bps: usize,
     pub tx_bps: usize,
+    pub ssid: Option<String>,
 }
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum WifiGeneration {
@@ -79,7 +80,6 @@ impl LinkData<WifiLinkData> {
         if interface.interface_type != InterfaceType::Wlan {
             bail!("Wifi interface type is required for wifi generation detection");
         }
-
         let name = interface
             .interface_name
             .to_str()
@@ -104,6 +104,10 @@ impl LinkData<WifiLinkData> {
         if let Some(wifi_interface) = wifi_interface {
             let wifi_interface_name =
                 String::from_utf8_lossy(wifi_interface.name.as_ref().unwrap());
+            let ssid = wifi_interface
+                .ssid
+                .as_ref()
+                .map(|s| String::from_utf8_lossy(s).to_string());
             trace!("Found interface '{wifi_interface_name}': {interface:?}");
             let index = wifi_interface
                 .index
@@ -122,6 +126,7 @@ impl LinkData<WifiLinkData> {
                         rx_bps: rx,
                         tx_bps: tx,
                         frequency_mhz: wifi_interface.frequency.unwrap_or(0),
+                        ssid,
                     },
                     max: Err(anyhow!("No max yet supported")),
                 });
@@ -165,7 +170,7 @@ impl Display for WifiLinkData {
             } else {
                 i18n("N/A")
             },
-            self.frequency_display()
+            self.frequency_display(),
         )
     }
 }
@@ -297,6 +302,7 @@ mod test {
                     frequency_mhz: step,
                     rx_bps: 0,
                     tx_bps: 0,
+                    ssid: None,
                 };
                 let result = input.frequency_display();
                 let expected = map[mhz_range];
@@ -320,6 +326,7 @@ mod test {
                 frequency_mhz: *mhz,
                 rx_bps: 0,
                 tx_bps: 0,
+                ssid: None,
             };
             let result = input.frequency_display();
             let expected = map[mhz];
@@ -360,6 +367,7 @@ mod test {
                 frequency_mhz: 0,
                 rx_bps: receive,
                 tx_bps: send,
+                ssid: None,
             };
             let result = input.link_speed_display();
             pretty_assertions::assert_eq!(*expected, result);