resolve issue #23 i.e. add parse/from_str method to AeronUriStringBui…

…lder
mimran1980 · Jan 15, 2025 · c8db770 · c8db770
1 parent 559474e
commit c8db770
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/rusteron-archive/src/lib.rs b/rusteron-archive/src/lib.rs
@@ -16,6 +16,7 @@ pub mod bindings {
 }
 
 use bindings::*;
+use std::str::FromStr;
 
 pub mod testing;
 
@@ -149,6 +150,12 @@ mod tests {
             .build(1024)?;
         assert_eq!("aeron:udp?ttl=2|control-mode=dynamic|endpoint=localhost:1235|control=localhost:1234|reliable=false", uri);
 
+        let uri = AeronUriStringBuilder::from_str("aeron:udp?endpoint=localhost:8010")?
+            .ttl(5)?
+            .build(1024)?;
+
+        assert_eq!("aeron:udp?ttl=5|endpoint=localhost:8010", uri);
+
         Ok(())
     }
 

diff --git a/rusteron-code-gen/src/aeron_custom.rs b/rusteron-code-gen/src/aeron_custom.rs
@@ -187,6 +187,16 @@ impl AeronPublication {
     }
 }
 
+impl std::str::FromStr for AeronUriStringBuilder {
+    type Err = AeronCError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let builder = AeronUriStringBuilder::default();
+        builder.init_on_string(s)?;
+        Ok(builder)
+    }
+}
+
 impl AeronUriStringBuilder {
     #[inline]
     pub fn build(&self, max_str_length: usize) -> Result<String, AeronCError> {

diff --git a/rusteron-docker-samples/.justfile b/rusteron-docker-samples/.justfile
@@ -8,10 +8,12 @@ fix:
   cd rusteron-dummy-example && cargo clippy --allow-dirty --allow-staged --fix && cd -
 
 docker-build:
+    cd rusteron-docker-samples/rusteron-dummy-example && cargo update && cd -
     docker build -t aeron-media-driver aeron-media-driver
     docker build -t rusteron-dummy-example rusteron-dummy-example
 
 podman-build:
+    cd rusteron-docker-samples/rusteron-dummy-example && cargo update && cd -
     podman build -t rusteron-dummy-example -f Dockerfile rusteron-dummy-example
     podman build -t aeron-media-driver -f Dockerfile aeron-media-driver
 

diff --git a/rusteron-docker-samples/rusteron-dummy-example/Cargo.toml b/rusteron-docker-samples/rusteron-dummy-example/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 websocket-lite = "0.5"
 tokio = { version = "1", features = ["full"] }
 futures-util = "0.3"
-rusteron-archive = { version = "0.1.59", features = ["static"]}
-rusteron-media-driver = { version = "0.1.59", features = ["static"]}
+rusteron-archive = { version = "0.1", features = ["static"]}
+rusteron-media-driver = { version = "0.1", features = ["static"]}
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 futures = "0.3"