minot-cli 0.11.2__tar.gz → 0.11.3__tar.gz

{minot_cli-0.11.2 → minot_cli-0.11.3}/Cargo.lock

@@ -3808,7 +3808,7 @@ dependencies = [
 
 [[package]]
 name = "minot"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "bytesize",
@@ -3935,7 +3935,7 @@ dependencies = [
 
 [[package]]
 name = "mt_action"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "log",
@@ -3950,7 +3950,7 @@ dependencies = [
 
 [[package]]
 name = "mt_bagread"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "camino",
@@ -3971,7 +3971,7 @@ dependencies = [
 
 [[package]]
 name = "mt_coord"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "fs2",
@@ -3985,7 +3985,7 @@ dependencies = [
 
 [[package]]
 name = "mt_dataset"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4028,7 +4028,7 @@ dependencies = [
 
 [[package]]
 name = "mt_flow"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -4042,7 +4042,7 @@ dependencies = [
 
 [[package]]
 name = "mt_log"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "env_filter 2.0.0",
  "env_logger",
@@ -4054,7 +4054,7 @@ dependencies = [
 
 [[package]]
 name = "mt_mtc"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "ariadne",
@@ -4067,7 +4067,7 @@ dependencies = [
 
 [[package]]
 name = "mt_net"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "rkyv 0.8.18",
@@ -4077,7 +4077,7 @@ dependencies = [
 
 [[package]]
 name = "mt_pubsub"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4096,7 +4096,7 @@ dependencies = [
 
 [[package]]
 name = "mt_rat"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4111,7 +4111,7 @@ dependencies = [
 
 [[package]]
 name = "mt_scope"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -4124,7 +4124,7 @@ dependencies = [
 
 [[package]]
 name = "mt_sea"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4141,7 +4141,7 @@ dependencies = [
 
 [[package]]
 name = "mt_service"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "log",
@@ -4155,7 +4155,7 @@ dependencies = [
 
 [[package]]
 name = "mt_wind"
-version = "0.11.2"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "async-trait",

{minot_cli-0.11.2 → minot_cli-0.11.3}/Cargo.toml

@@ -4,7 +4,7 @@ members = ["minot", "mt_pubsub", "mt_coord", "mt_bagread", "mt_mtc", "mt_sea", "
 resolver = "3"
 
 [workspace.package]
-version = "0.11.2"
+version = "0.11.3"
 keywords = ["robotics"]
 license = "MIT OR Apache-2.0"
 repository = "https://codeberg.org/stelzo/minot.git"
@@ -28,19 +28,19 @@ exclude = [
 ]
 
 [workspace.dependencies]
-mt_sea = { path = "mt_sea", version = "0.11.2", default-features = false }
-mt_coord = { path = "mt_coord", version = "0.11.2", default-features = false }
-mt_pubsub = { path = "mt_pubsub", version = "0.11.2", default-features = false }
-mt_service = { path = "mt_service", version = "0.11.2", default-features = false }
-mt_action = { path = "mt_action", version = "0.11.2", default-features = false }
-mt_scope = { path = "mt_scope", version = "0.11.2", default-features = false }
-mt_bagread = { path = "mt_bagread", version = "0.11.2", default-features = false }
-mt_net = { path = "mt_net", version = "0.11.2", default-features = false }
-mt_flow = { path = "mt_flow", version = "0.11.2", default-features = false }
-mt_dataset = { path = "mt_dataset", version = "0.11.2", default-features = false }
-mt_wind = { path = "mt_wind", version = "0.11.2", default-features = false }
-mt_mtc = { path = "mt_mtc", version = "0.11.2", default-features = false }
-mt_log = { path = "mt_log", version = "0.11.2", default-features = false }
+mt_sea = { path = "mt_sea", version = "0.11.3", default-features = false }
+mt_coord = { path = "mt_coord", version = "0.11.3", default-features = false }
+mt_pubsub = { path = "mt_pubsub", version = "0.11.3", default-features = false }
+mt_service = { path = "mt_service", version = "0.11.3", default-features = false }
+mt_action = { path = "mt_action", version = "0.11.3", default-features = false }
+mt_scope = { path = "mt_scope", version = "0.11.3", default-features = false }
+mt_bagread = { path = "mt_bagread", version = "0.11.3", default-features = false }
+mt_net = { path = "mt_net", version = "0.11.3", default-features = false }
+mt_flow = { path = "mt_flow", version = "0.11.3", default-features = false }
+mt_dataset = { path = "mt_dataset", version = "0.11.3", default-features = false }
+mt_wind = { path = "mt_wind", version = "0.11.3", default-features = false }
+mt_mtc = { path = "mt_mtc", version = "0.11.3", default-features = false }
+mt_log = { path = "mt_log", version = "0.11.3", default-features = false }
 
 # Tools
 anyhow = "1.0"

{minot_cli-0.11.2 → minot_cli-0.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minot-cli
-Version: 0.11.2
+Version: 0.11.3
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License

{minot_cli-0.11.2 → minot_cli-0.11.3}/mt_bagread/src/lib.rs

@@ -496,6 +496,8 @@ where
 
     let mut breaked_until = false;
     let mut time_iter_before = None;
+    // Log time of the message that stopped this call. It was not consumed, so the next call starts there.
+    let mut break_log_time = None;
     let span_start = last_iter_time.unwrap_or(start_time);
     while let Some(event) = reader.next_event() {
         match event? {
@@ -510,7 +512,7 @@ where
                 let log_time = nanos_to_system_time(header.log_time);
 
                 if time_iter_before.is_none() {
-                    time_iter_before.replace(start_time);
+                    time_iter_before.replace(span_start);
                 } else {
                     time_iter_before = *last_iter_time;
                 }
@@ -522,6 +524,7 @@ where
                         let end_abs = span_start + rel_dur;
                         if log_time > end_abs {
                             breaked_until = true;
+                            break_log_time = Some(header.log_time);
                             reached_end_naturally = false;
                             break;
                         }
@@ -532,6 +535,7 @@ where
                         let end_abs = span_start + rel_dur;
                         if log_time > end_abs {
                             breaked_until = true;
+                            break_log_time = Some(header.log_time);
                             reached_end_naturally = false;
                             break;
                         }
@@ -541,6 +545,7 @@ where
                         let end_abs = span_start + max;
                         if log_time > end_abs {
                             breaked_until = true;
+                            break_log_time = Some(header.log_time);
                             reached_end_naturally = false;
                             break;
                         }
@@ -548,6 +553,7 @@ where
                     Some(PlayCount::Amount(count)) => {
                         if rel_since_begin >= *count {
                             breaked_until = true;
+                            break_log_time = Some(header.log_time);
                             reached_end_naturally = false;
                             break;
                         }
@@ -563,6 +569,7 @@ where
                         pc,
                     )? {
                         breaked_until = true;
+                        break_log_time = Some(header.log_time);
                         reached_end_naturally = false;
                         break;
                     }
@@ -606,10 +613,12 @@ where
         }
     }
 
-    // going back one message
+    // Resume at the message that stopped this call. Seeking to the previous message instead
+    // would replay an already consumed message.
     if breaked_until {
-        let options = IndexedReaderOptions::new()
-            .log_time_on_or_after(system_time_to_nanos(&time_iter_before.unwrap()));
+        let options = IndexedReaderOptions::new().log_time_on_or_after(
+            break_log_time.expect("break_log_time is set whenever breaked_until is set"),
+        );
         *reader = mcap::sans_io::indexed_reader::IndexedReader::new_with_options(summary, options)
             .expect("could not construct reader");
         *last_iter_time = time_iter_before;