ADD: correct full body search flag to find

Cargo.lock

···
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
···
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
···
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
···
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
···
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
···
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
···
 
 [[package]]
 name = "iocraft-macros"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2737d46d5f3c13db67066e5055ccda0d2379f993f77ce2ca90cf1dbd92edfe4"
+checksum = "1c23693fa666552feadf75efc3e0da9d144f3bea30b6a703d3f0b8adf8619434"
 dependencies = [
  "proc-macro2",
  "quote",
···
 
 [[package]]
 name = "once_cell"
-version = "1.20.1"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
-dependencies = [
- "portable-atomic",
-]
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "parking"
···
  "tracing",
  "windows-sys 0.59.0",
 ]
-
-[[package]]
-name = "portable-atomic"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "proc-macro2"

src/fzf.rs

···
     // unwrap: this can never fail
     let child_in = child.stdin.as_mut().unwrap();
     for item in input.into_iter() {
-        write!(child_in, "{}\n", item.to_string())?;
+        write!(child_in, "{item}\n")?;
     }
     let output = child.wait_with_output()?;
     if output.stdout.is_empty() {

src/main.rs

···
             println!("{}", id.0);
         }
     } else {
-        eprintln!("No task to drop.");
+        eprintln!("No task selected.");
         exit(1);
     }
     Ok(())

src/workspace.rs

···
 use nix::fcntl::{Flock, FlockArg};
 
 use crate::errors::{Error, Result};
-use crate::stack::TaskStack;
+use crate::stack::{StackItem, TaskStack};
 use crate::{fzf, util};
+use std::collections::vec_deque;
 use std::fmt::Display;
 use std::fs::{self, File};
 use std::io::{BufRead as _, BufReader, Read, Seek, SeekFrom};
···
     pub fn search(
         &self,
         stack: Option<TaskStack>,
-        _search_body: bool,
+        search_body: bool,
         _include_archived: bool,
     ) -> Result<Option<Id>> {
         let stack = if let Some(stack) = stack {
···
         } else {
             self.read_stack()?
         };
-        Ok(fzf::select(stack)?.map(|si| si.id))
+        if search_body {
+            let loader = LazyTaskLoader {
+                files: stack.into_iter(),
+                workspace: self,
+            };
+            // search the entirety of a task
+            Ok(fzf::select(loader)?.map(|bt| bt.id))
+        } else {
+            // just search the stack
+            Ok(fzf::select(stack)?.map(|si| si.id))
+        }
     }
 
     pub fn reprioritize(&self, identifier: TaskIdentifier) -> Result<()> {
···
     pub file: Flock<File>,
 }
 
+/// A task container without a file handle
+pub struct BareTask {
+    pub id: Id,
+    pub title: String,
+    pub body: String,
+}
+
 impl Task {
     /// Consumes a task and saves it to disk.
     pub fn save(mut self) -> Result<()> {
···
         self.file.write_all(b"\n\n")?;
         self.file.write_all(self.body.trim().as_bytes())?;
         Ok(())
+    }
+
+    fn bare(self) -> BareTask {
+        BareTask {
+            id: self.id,
+            title: self.title,
+            body: self.body,
+        }
+    }
+}
+
+impl FromStr for BareTask {
+    type Err = Error;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        let (tsk_id, task_content) = s.split_once('\t').ok_or(Error::Parse(format!(
+            "Missing TSK-ID or content or task parse."
+        )))?;
+        let (title, body) = task_content
+            .split_once('\t')
+            .ok_or(Error::Parse(format!("Missing body for task parse.")))?;
+        Ok(Self {
+            id: tsk_id.parse()?,
+            title: title.to_string(),
+            body: body.to_string(),
+        })
+    }
+}
+
+impl Display for BareTask {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}\t{}\t{}",
+            self.id,
+            self.title.trim(),
+            self.body.replace('\n', " ").replace('\r', "")
+        )
+    }
+}
+
+struct LazyTaskLoader<'a> {
+    files: vec_deque::IntoIter<StackItem>,
+    workspace: &'a Workspace,
+}
+
+impl<'a> Iterator for LazyTaskLoader<'a> {
+    type Item = BareTask;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let stack_item = self.files.next()?;
+        let task = self
+            .workspace
+            .task(TaskIdentifier::Id(stack_item.id))
+            .ok()?;
+        Some(task.bare())
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_bare_task_display() {
+        let task = BareTask {
+            id: Id(123),
+            title: "Hello, world".to_string(),
+            body: "The body of the task.\nAnother line\r\nis here.".to_string(),
+        };
+        assert_eq!(
+            "tsk-123\tHello, world\tThe body of the task. Another line is here.",
+            task.to_string()
+        );
     }
 }