Changes based on CR

Author: teclator

rust/agama-lib/src/network/client.rs

@@ -20,7 +20,7 @@
 
 use super::{settings::NetworkConnection, types::Device};
 use crate::http::{BaseHTTPClient, BaseHTTPClientError};
-use url::form_urlencoded::byte_serialize;
+use crate::utils::url::encoded;
 
 #[derive(Debug, thiserror::Error)]
 pub enum NetworkClientError {
@@ -57,8 +57,7 @@ impl NetworkClient {
 
     /// Returns an array of network connections
     pub async fn connection(&self, id: &str) -> Result<NetworkConnection, NetworkClientError> {
-        let encoded_id: String = byte_serialize(id.as_bytes()).collect();
-        let encoded_id = encoded_id.replace("+", "%20");
+        let encoded_id = encoded(id.to_string());
         let json = self
             .client
             .get::<NetworkConnection>(format!("/network/connections/{encoded_id}").as_str())
@@ -73,8 +72,7 @@ impl NetworkClient {
         connection: NetworkConnection,
     ) -> Result<(), NetworkClientError> {
         let id = connection.id.clone();
-        let encoded_id: String = byte_serialize(id.as_bytes()).collect();
-        let encoded_id = encoded_id.replace("+", "%20");
+        let encoded_id = encoded(id.to_string());
         let response = self.connection(id.as_str()).await;
 
         if response.is_ok() {

rust/agama-lib/src/utils.rs

@@ -22,6 +22,7 @@
 
 mod file_format;
 mod transfer;
+pub mod url;
 
 pub use file_format::*;
 pub use transfer::*;

rust/agama-lib/src/utils/url.rs

@@ -0,0 +1,41 @@
+// Copyright (c) [2025] SUSE LLC
+//
+// All Rights Reserved.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, contact SUSE LLC.
+//
+// To contact SUSE LLC about this file by physical or electronic mail, you may
+// find current contact information at www.suse.com.
+
+use url::form_urlencoded::byte_serialize;
+
+pub fn encoded(value: String) -> String {
+    let serialized_value: String = byte_serialize(value.as_bytes()).collect();
+    // Encode space to '%20' as per url standard
+    // Should be fixed by https://github.com/servo/rust-url/pull/1028
+    serialized_value.replace("+", "%20")
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::encoded;
+
+    #[test]
+    fn test_encode_value() {
+        let id = "Wired #1";
+        let encoded_id = encoded(id.to_string());
+        assert_eq!(encoded_id, "Wired%20%231");
+    }
+}