Better as a param

Author: huntc

streambed-confidant-cli/src/main.rs

@@ -75,6 +75,10 @@ struct DecryptCommand {
     #[clap(env, short, long)]
     pub file: PathBuf,
 
+    /// The max number utf-8 characters to read from the file.
+    #[clap(env, long, default_value_t = 8 * 1024)]
+    pub max_line_len: u64,
+
     /// By default, records are output to STDOUT as a BASE64 values followed newlines.
     /// This option can be used to write to a file.
     #[clap(env, short, long)]
@@ -88,6 +92,10 @@ struct EncryptCommand {
     #[clap(env, short, long)]
     pub file: PathBuf,
 
+    /// The max number utf-8 characters to read from the file.
+    #[clap(env, long, default_value_t = 8 * 1024)]
+    pub max_line_len: u64,
+
     /// By default, records are output to STDOUT as a BASE64 values followed newlines.
     /// This option can be used to write to a file.
     #[clap(env, short, long)]
@@ -148,9 +156,11 @@ async fn secret_store(
 type LineReaderFn = Box<dyn FnMut() -> Result<Option<String>, io::Error> + Send>;
 type OutputFn = Box<dyn Write + Send>;
 
-const LINE_LIMIT: u64 = 8 * 1024;
-
-fn pipeline(file: PathBuf, output: Option<PathBuf>) -> Result<(LineReaderFn, OutputFn), Errors> {
+fn pipeline(
+    file: PathBuf,
+    output: Option<PathBuf>,
+    max_line_len: u64,
+) -> Result<(LineReaderFn, OutputFn), Errors> {
     // A line reader function is provided rather than something based on the
     // Read trait as reading a line from stdin involves locking it via its
     // own read_line function. A Read trait will cause a lock to occur for
@@ -162,14 +172,15 @@ fn pipeline(file: PathBuf, output: Option<PathBuf>) -> Result<(LineReaderFn, Out
         let mut line = String::new();
         Box::new(move || {
             line.clear();
-            if stdin.lock().take(LINE_LIMIT).read_line(&mut line)? > 0 {
+            if stdin.lock().take(max_line_len).read_line(&mut line)? > 0 {
                 Ok(Some(line.clone()))
             } else {
                 Ok(None)
             }
         })
     } else {
-        let mut buf = BufReader::new(fs::File::open(file).map_err(Errors::from)?).take(LINE_LIMIT);
+        let mut buf =
+            BufReader::new(fs::File::open(file).map_err(Errors::from)?).take(max_line_len);
         let mut line = String::new();
         Box::new(move || {
             line.clear();
@@ -209,11 +220,13 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let task = tokio::spawn(async move {
         match args.command {
             Command::Decrypt(command) => {
-                let (line_reader, output) = pipeline(command.file, command.output)?;
+                let (line_reader, output) =
+                    pipeline(command.file, command.output, command.max_line_len)?;
                 cryptor::decrypt(ss, line_reader, output).await
             }
             Command::Encrypt(command) => {
-                let (line_reader, output) = pipeline(command.file, command.output)?;
+                let (line_reader, output) =
+                    pipeline(command.file, command.output, command.max_line_len)?;
                 cryptor::encrypt(ss, line_reader, output).await
             }
         }

streambed-logged-cli/src/main.rs

@@ -45,6 +45,10 @@ struct ProduceCommand {
     /// The file to consume records from, or `-` to indicate STDIN.
     #[clap(env, short, long)]
     pub file: PathBuf,
+
+    /// The max number utf-8 characters to read from the file.
+    #[clap(env, long, default_value_t = 8 * 1024)]
+    pub max_line_len: u64,
 }
 
 /// Subscribe to topics and consume from them producing JSON-line records to a stream.
@@ -155,8 +159,6 @@ fn parse_offset(arg: &str) -> Result<Offset, OffsetParseError> {
 type LineReaderFn = Box<dyn FnMut() -> Result<Option<String>, io::Error> + Send>;
 type OutputFn = Box<dyn Write + Send>;
 
-const LINE_LIMIT: u64 = 8 * 1024;
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
     let args = ProgramArgs::parse();
@@ -179,7 +181,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
                     let mut line = String::new();
                     Box::new(move || {
                         line.clear();
-                        if stdin.lock().take(LINE_LIMIT).read_line(&mut line)? > 0 {
+                        if stdin
+                            .lock()
+                            .take(command.max_line_len)
+                            .read_line(&mut line)?
+                            > 0
+                        {
                             Ok(Some(line.clone()))
                         } else {
                             Ok(None)
@@ -188,7 +195,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 } else {
                     let mut buf =
                         BufReader::new(fs::File::open(command.file).map_err(Errors::from)?)
-                            .take(LINE_LIMIT);
+                            .take(command.max_line_len);
                     let mut line = String::new();
                     Box::new(move || {
                         line.clear();