beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-09-28 20:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip: use custom struct ThreadedEnvelopes

Browse source
This commit is contained in:
Clément DOUIN 2024-05-18 09:45:03 +02:00
parent 90e12ddc51
commit 55ba892436
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
2 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/backend/mod.rs
View file

@ -26,7 +26,7 @@ use email::{
list::{ListEnvelopes, ListEnvelopesOptions}, list::{ListEnvelopes, ListEnvelopesOptions},
thread::ThreadEnvelopes, thread::ThreadEnvelopes,
watch::WatchEnvelopes, watch::WatchEnvelopes,
Id, SingleId, Id, SingleId, ThreadedEnvelopes,
}, },
flag::{add::AddFlags, remove::RemoveFlags, set::SetFlags, Flag, Flags}, flag::{add::AddFlags, remove::RemoveFlags, set::SetFlags, Flag, Flags},
folder::{ folder::{
@ -710,7 +710,7 @@ impl Backend {
&self, &self,
folder: &str, folder: &str,
opts: ListEnvelopesOptions, opts: ListEnvelopesOptions,
) -> Result<DiGraphMap<u32, u32>> { ) -> Result<ThreadedEnvelopes> {
let backend_kind = self.toml_account_config.thread_envelopes_kind(); let backend_kind = self.toml_account_config.thread_envelopes_kind();
let id_mapper = self.build_id_mapper(folder, backend_kind)?; let id_mapper = self.build_id_mapper(folder, backend_kind)?;
let envelopes = self.backend.thread_envelopes(folder, opts).await?; let envelopes = self.backend.thread_envelopes(folder, opts).await?;

44
src/email/envelope/command/thread.rs
View file

@ -204,12 +204,10 @@ impl ThreadEnvelopesCommand {
query: None, query: None,
}; };
let graph = backend.thread_envelopes(folder, opts).await?; let envelopes = backend.thread_envelopes(folder, opts).await?;
println!("graph: {graph:#?}");
let mut stdout = std::io::stdout(); let mut stdout = std::io::stdout();
write_tree(&mut stdout, &graph, 0, String::new(), 0)?; write_tree(&mut stdout, envelopes.graph(), "root", String::new(), 0)?;
stdout.flush()?; stdout.flush()?;
// printer.print_table(envelopes, self.table_max_width)?; // printer.print_table(envelopes, self.table_max_width)?;
@ -220,10 +218,10 @@ impl ThreadEnvelopesCommand {
pub fn write_tree( pub fn write_tree(
w: &mut impl std::io::Write, w: &mut impl std::io::Write,
graph: &DiGraphMap<u32, u32>, graph: &DiGraphMap<&str, u8>,
parent: u32, parent: &str,
pad: String, pad: String,
weight: u32, weight: u8,
) -> std::io::Result<()> { ) -> std::io::Result<()> {
let edges = graph let edges = graph
.all_edges() .all_edges()
@ -264,11 +262,11 @@ mod test {
fn tree_1() { fn tree_1() {
let mut buf = Vec::new(); let mut buf = Vec::new();
let mut graph = DiGraphMap::new(); let mut graph = DiGraphMap::new();
graph.add_edge(0, 1, 0); graph.add_edge("0", "1", 0);
graph.add_edge(0, 2, 0); graph.add_edge("0", "2", 0);
graph.add_edge(0, 3, 0); graph.add_edge("0", "3", 0);
write_tree(&mut buf, &graph, 0, String::new(), 0).unwrap(); write_tree(&mut buf, &graph, "0", String::new(), 0).unwrap();
let buf = String::from_utf8_lossy(&buf); let buf = String::from_utf8_lossy(&buf);
let expected = " let expected = "
@ -284,11 +282,11 @@ mod test {
fn tree_2() { fn tree_2() {
let mut buf = Vec::new(); let mut buf = Vec::new();
let mut graph = DiGraphMap::new(); let mut graph = DiGraphMap::new();
graph.add_edge(0, 1, 0); graph.add_edge("0", "1", 0);
graph.add_edge(1, 2, 1); graph.add_edge("1", "2", 1);
graph.add_edge(1, 3, 1); graph.add_edge("1", "3", 1);
write_tree(&mut buf, &graph, 0, String::new(), 0).unwrap(); write_tree(&mut buf, &graph, "0", String::new(), 0).unwrap();
let buf = String::from_utf8_lossy(&buf); let buf = String::from_utf8_lossy(&buf);
let expected = " let expected = "
@ -304,15 +302,15 @@ mod test {
fn tree_3() { fn tree_3() {
let mut buf = Vec::new(); let mut buf = Vec::new();
let mut graph = DiGraphMap::new(); let mut graph = DiGraphMap::new();
graph.add_edge(0, 1, 0); graph.add_edge("0", "1", 0);
graph.add_edge(1, 2, 1); graph.add_edge("1", "2", 1);
graph.add_edge(2, 22, 2); graph.add_edge("2", "22", 2);
graph.add_edge(1, 3, 1); graph.add_edge("1", "3", 1);
graph.add_edge(0, 4, 0); graph.add_edge("0", "4", 0);
graph.add_edge(4, 5, 1); graph.add_edge("4", "5", 1);
graph.add_edge(5, 6, 2); graph.add_edge("5", "6", 2);
write_tree(&mut buf, &graph, 0, String::new(), 0).unwrap(); write_tree(&mut buf, &graph, "0", String::new(), 0).unwrap();
let buf = String::from_utf8_lossy(&buf); let buf = String::from_utf8_lossy(&buf);
let expected = " let expected = "