From 2fa377ef736ba7ab6460663adca86d345431f26f Mon Sep 17 00:00:00 2001
From: Dominik Werder <dominik.werder@gmail.com>
Date: Fri, 16 May 2025 13:17:06 +0200
Subject: [PATCH] Rename, clean up

---
 crates/daqbuffer/Cargo.toml                       |  4 ++--
 .../src/bin/{daqbuffer.rs => daqretrieve.rs}      |  8 ++++----
 crates/dq/src/{bin/daq-convert.rs => convert.rs}  | 15 ++-------------
 crates/dq/src/{bin => }/dq.rs                     |  6 +++---
 crates/dq/src/lib.rs                              |  3 ++-
 crates/scyllaconn/src/binned2/msplspiter.rs       |  2 +-
 6 files changed, 14 insertions(+), 24 deletions(-)
 rename crates/daqbuffer/src/bin/{daqbuffer.rs => daqretrieve.rs} (98%)
 rename crates/dq/src/{bin/daq-convert.rs => convert.rs} (85%)
 rename crates/dq/src/{bin => }/dq.rs (100%)

diff --git a/crates/daqbuffer/Cargo.toml b/crates/daqbuffer/Cargo.toml
index 33e741e..115a643 100644
--- a/crates/daqbuffer/Cargo.toml
+++ b/crates/daqbuffer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "daqbuffer"
-version = "0.5.5-aa.12"
+name = "daqretrieve"
+version = "0.5.5-aa.13"
 authors = ["Dominik Werder <dominik.werder@gmail.com>"]
 edition = "2024"
 
diff --git a/crates/daqbuffer/src/bin/daqbuffer.rs b/crates/daqbuffer/src/bin/daqretrieve.rs
similarity index 98%
rename from crates/daqbuffer/src/bin/daqbuffer.rs
rename to crates/daqbuffer/src/bin/daqretrieve.rs
index 277060c..c12c7be 100644
--- a/crates/daqbuffer/src/bin/daqbuffer.rs
+++ b/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 daqbuffer::cli::Opts;
-use daqbuffer::cli::SubCmd;
+use daqretrieve::cli::ClientType;
+use daqretrieve::cli::Opts;
+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(),
diff --git a/crates/dq/src/bin/daq-convert.rs b/crates/dq/src/convert.rs
similarity index 85%
rename from crates/dq/src/bin/daq-convert.rs
rename to crates/dq/src/convert.rs
index 4e726ac..a61d619 100644
--- a/crates/dq/src/bin/daq-convert.rs
+++ b/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(())
-            }
-        }
-    })
-}
diff --git a/crates/dq/src/bin/dq.rs b/crates/dq/src/dq.rs
similarity index 100%
rename from crates/dq/src/bin/dq.rs
rename to crates/dq/src/dq.rs
index 76449e3..789d142 100644
--- a/crates/dq/src/bin/dq.rs
+++ b/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;
diff --git a/crates/dq/src/lib.rs b/crates/dq/src/lib.rs
index 8b13789..12035d5 100644
--- a/crates/dq/src/lib.rs
+++ b/crates/dq/src/lib.rs
@@ -1 +1,2 @@
-
+pub mod convert;
+pub mod dq;
diff --git a/crates/scyllaconn/src/binned2/msplspiter.rs b/crates/scyllaconn/src/binned2/msplspiter.rs
index 5122ead..b73234f 100644
--- a/crates/scyllaconn/src/binned2/msplspiter.rs
+++ b/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);
     }