Rename, clean up

crates/daqbuffer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "daqbuffer"
+name = "daqretrieve"
-version = "0.5.5-aa.12"
+version = "0.5.5-aa.13"
 authors = ["Dominik Werder <dominik.werder@gmail.com>"]
 edition = "2024"
 

crates/daqbuffer/src/bin/daqretrieve.rs

@@ -3,9 +3,9 @@ use chrono::Duration;
 use chrono::Utc;
 use clap::Parser;
 use daqbuf_err::Error;
-use daqbuffer::cli::ClientType;
+use daqretrieve::cli::ClientType;
-use daqbuffer::cli::Opts;
+use daqretrieve::cli::Opts;
-use daqbuffer::cli::SubCmd;
+use daqretrieve::cli::SubCmd;
 use netpod::NodeConfig;
 use netpod::NodeConfigCached;
 use netpod::ProxyConfig;
@@ -129,7 +129,7 @@ async fn go() -> Result<(), Error> {
                 .await?;
             }
             ClientType::CborEvents(opts) => {
-                daqbuffer::fetch::fetch_cbor(
+                daqretrieve::fetch::fetch_cbor(
                     &opts.url,
                     ScalarType::from_variant_str(&opts.scalar_type).unwrap(),
                     Shape::from_dims_str(&opts.shape).unwrap(),

crates/dq/src/convert.rs

@@ -1,4 +1,5 @@
-use clap::{ArgAction, Parser};
+use clap::ArgAction;
+use clap::Parser;
 use daqbuf_err as err;
 use err::Error;
 use netpod::timeunits::*;
@@ -66,15 +67,3 @@ impl FromStr for TimeBinSize {
         }
     }
 }
-
-pub fn main() -> Result<(), Error> {
-    taskrun::run(async {
-        let opts = Opts::parse();
-        match opts.subcmd {
-            SubCmd::ConvertArchiverApplianceChannel(_) => {
-                eprintln!("error: archapp not built");
-                Ok(())
-            }
-        }
-    })
-}

crates/dq/src/dq.rs

@@ -4,12 +4,12 @@ use daqbuf_err as err;
 use disk::eventchunker::EventChunker;
 use disk::eventchunker::EventChunkerConf;
 use err::Error;
-#[allow(unused)]
-use netpod::log::*;
-use netpod::range::evrange::NanoRange;
 use netpod::ByteOrder;
 use netpod::ByteSize;
 use netpod::SfChFetchInfo;
+#[allow(unused)]
+use netpod::log::*;
+use netpod::range::evrange::NanoRange;
 use std::path::PathBuf;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;

crates/dq/src/lib.rs

@@ -1 +1,2 @@
-
+pub mod convert;
+pub mod dq;

crates/scyllaconn/src/binned2/msplspiter.rs

@@ -45,7 +45,7 @@ fn test_iter_00() {
     let range = NanoRange::from_strings("2024-06-07T09:17:31Z", "2024-06-07T09:17:31Z").unwrap();
     let pbp = PrebinnedPartitioning::Sec1;
     let mut it = MspLspIter::new(range, pbp);
-    taskrun;
+    // taskrun;
     for x in it {
         eprintln!("{:?}", x);
     }