Merge pull request #106 from silicon-heaven/fix-find-path

Fix find_path, add --find-path to cp2cp

Author: syyyr

Cargo.toml

@@ -5,7 +5,7 @@ name = "shvproto"
 description = "Rust implementation of the SHV protocol"
 license = "MIT"
 repository = "https://github.com/silicon-heaven/libshvproto-rs"
-version = "6.1.1"
+version = "6.1.2"
 edition = "2024"
 
 [dependencies]

src/bin/cp2cp.rs

@@ -21,21 +21,32 @@ use jaq_all::{jaq_core::{Ctx, Vars, data::JustLut}, jaq_std};
 struct Cli {
     #[arg(short, long, help = "Cpon indentation string")]
     indent: Option<String>,
+
     #[arg(short, long, help = "Do not create oneliners in Cpon indented string output")]
     no_oneliners: bool,
+
     #[arg(long = "ip", help = "Cpon input")]
     cpon_input: bool,
+
     #[arg(long = "oc", help = "ChainPack output")]
     chainpack_output: bool,
+
     /// Expect input data in RPC block transport format, https://silicon-heaven.github.io/shv-doc/rpctransportlayer/stream.html
     #[arg(long)]
     chainpack_rpc_block: bool,
+
+    /// Find this path in the input before processing
+    #[arg(long)]
+    find_path: Option<String>,
+
     /// Verbose mode (module, .)
     #[arg(short = 'v', long = "verbose")]
     verbose: Option<String>,
+
     /// File to process
     #[arg(value_name = "FILE")]
     file: Option<PathBuf>,
+
     /// Run cq with this filter.
     #[cfg(feature = "cq")]
     #[arg(long = "cq")]
@@ -152,6 +163,19 @@ fn main() {
         process_chainpack_rpc_block_and_exit(reader)
     }
 
+    if let Some(find_path) = opts.find_path {
+        let mut rd: Box<dyn Reader + '_> = if opts.cpon_input {
+            Box::new(CponReader::new(&mut reader))
+        } else {
+            Box::new(ChainPackReader::new(&mut reader))
+        };
+        let path = find_path.split('/').collect::<Vec<_>>();
+        if let Err(e) = rd.find_path(&path) {
+            eprintln!("Path not found: {e:?}");
+            process::exit(CODE_READ_ERROR);
+        }
+    }
+
     let cpon_output = !opts.chainpack_output;
     let use_in_memory_parser = cpon_output && !opts.no_oneliners;
     #[cfg(feature = "cq")]

src/chainpack.rs

@@ -1126,3 +1126,49 @@ fn test_find_path_imap_nested() {
     rd.find_path(&["0", "1", "2"]).unwrap();
     assert_eq!(rd.read().unwrap(), "baz".into());
 }
+
+#[test]
+fn test_find_path_chainpack() {
+    let cpon = r#"
+    i{
+      10:2,
+      20:{"timeZone":"Europe/Prague"},
+      30:i{
+        10:i{
+          0:20708,
+          1:141,
+          26:0.,
+          35:5.4
+        },
+        20:{"comment":"", "commissioner":"", "tram_ids":""},
+        30:{
+          ".app:version":<1:5, 8:d"2026-02-19T22:08:33.130Z">"0.18.0",
+          ".broker/currentClient:info":<1:5, 8:d"2026-02-19T22:08:33.057Z">{
+            "clientId":9,
+            "role":"default",
+            "subscriptions":{"**:*:chng":null},
+            "userName":"test"
+          },
+          ".device:name":<1:5, 8:d"2026-02-19T22:08:33.269Z">"BRCg2",
+          ".device:serialNumber":<1:5, 8:d"2026-02-19T22:08:33.329Z">"IDG24027",
+          ".device:version":<1:5, 8:d"2026-02-19T22:08:33.396Z">"M2D1",
+          "fwStable":<1:5, 8:d"2026-02-19T22:08:34.680Z">true,
+          "location":<1:5, 8:d"2026-02-19T22:08:33.521Z">i{
+            0:"CZE",
+            1:"Prague",
+            2:"Kobylisy",
+            3:"Obratiště RTC",
+            4:[0, 42],
+            5:"Europe/Prague"
+          }
+      	}
+      }
+    }
+"#;
+    let rv = RpcValue::from_cpon(cpon).unwrap();
+    let chpk = rv.to_chainpack();
+    let mut data_slice = &chpk[..];
+    let mut rd = ChainPackReader::new(&mut data_slice);
+    rd.find_path(&["30", "30", "location", "4", "1"]).unwrap();
+    assert_eq!(rd.read().unwrap(), 42.into());
+}

src/reader.rs

@@ -193,6 +193,7 @@ pub trait Reader {
                             }
                             break;
                         }
+                        self.skip()?;
                     }
                 }
                 _ => return Err(make_error("Not container".into()))