chore: cargo fmt

This commit is contained in:
Clément DOUIN
2026-05-20 23:48:27 +02:00
parent c2228e504f
commit 6ae09790aa
68 changed files with 90 additions and 100 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
use std::{fmt, path::PathBuf}; use std::{fmt, path::PathBuf};
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
use pimalaya_config::toml::TomlConfig; use pimalaya_config::toml::TomlConfig;
+1 -1
View File
@@ -30,7 +30,7 @@
use std::{collections::HashMap, env::temp_dir, path::PathBuf}; use std::{collections::HashMap, env::temp_dir, path::PathBuf};
use comfy_table::{presets, Color as TableColor, ContentArrangement}; use comfy_table::{Color as TableColor, ContentArrangement, presets};
use crossterm::style::Color; use crossterm::style::Color;
use dirs::download_dir; use dirs::download_dir;
+2 -1
View File
@@ -17,7 +17,7 @@
use std::{fmt, str::FromStr}; use std::{fmt, str::FromStr};
use anyhow::{bail, Error}; use anyhow::{Error, bail};
use clap::Parser; use clap::Parser;
/// Selects which backend a cross-protocol command should target. /// Selects which backend a cross-protocol command should target.
@@ -39,6 +39,7 @@ pub enum Backend {
Smtp, Smtp,
} }
#[allow(unused)]
impl Backend { impl Backend {
/// Whether the IMAP arm of a shared command is allowed to run. /// Whether the IMAP arm of a shared command is allowed to run.
pub fn allows_imap(self) -> bool { pub fn allows_imap(self) -> bool {
+1 -1
View File
@@ -17,7 +17,7 @@
use std::path::PathBuf; use std::path::PathBuf;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::{CommandFactory, Parser, Subcommand}; use clap::{CommandFactory, Parser, Subcommand};
use pimalaya_cli::{ use pimalaya_cli::{
clap::{ clap::{
+1 -1
View File
@@ -22,7 +22,7 @@ use comfy_table::ContentArrangement;
use crossterm::style::Color; use crossterm::style::Color;
use pimalaya_config::{ use pimalaya_config::{
secret::Secret, secret::Secret,
toml::{shell_expanded_string, TomlConfig}, toml::{TomlConfig, shell_expanded_string},
}; };
use pimalaya_stream::{ use pimalaya_stream::{
sasl::{ sasl::{
+1 -1
View File
@@ -27,7 +27,7 @@ use std::{
path::PathBuf, path::PathBuf,
}; };
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use io_imap::client::ImapClientStd as Inner; use io_imap::client::ImapClientStd as Inner;
use pimalaya_config::toml::TomlConfig; use pimalaya_config::toml::TomlConfig;
use pimalaya_stream::{sasl::Sasl, std::stream::StreamStd, tls::Tls}; use pimalaya_stream::{sasl::Sasl, std::stream::StreamStd, tls::Tls};
+1 -1
View File
@@ -17,7 +17,7 @@
use std::fmt; use std::fmt;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use comfy_table::{Cell, Row, Table}; use comfy_table::{Cell, Row, Table};
use io_imap::types::{ use io_imap::types::{
+1 -1
View File
@@ -17,7 +17,7 @@
use std::{collections::BTreeMap, fmt, num::NonZeroU32}; use std::{collections::BTreeMap, fmt, num::NonZeroU32};
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use comfy_table::{Cell, Color, ContentArrangement, Row, Table}; use comfy_table::{Cell, Color, ContentArrangement, Row, Table};
use io_imap::types::{ use io_imap::types::{
+1 -1
View File
@@ -17,7 +17,7 @@
use std::fmt; use std::fmt;
use anyhow::{anyhow, bail, Result}; use anyhow::{Result, anyhow, bail};
use clap::Parser; use clap::Parser;
use comfy_table::{Cell, Color, ContentArrangement, Row, Table}; use comfy_table::{Cell, Color, ContentArrangement, Row, Table};
use io_imap::types::{ use io_imap::types::{
+2 -2
View File
@@ -17,9 +17,9 @@
use std::fmt; use std::fmt;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use comfy_table::{presets, Cell, Color, ContentArrangement, Row, Table}; use comfy_table::{Cell, Color, ContentArrangement, Row, Table, presets};
use io_imap::types::{ use io_imap::types::{
core::Vec1, core::Vec1,
extensions::sort::{SortCriterion, SortKey}, extensions::sort::{SortCriterion, SortKey},
+2 -2
View File
@@ -17,7 +17,7 @@
use std::{collections::HashMap, fmt, num::NonZeroU32}; use std::{collections::HashMap, fmt, num::NonZeroU32};
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_imap::types::{ use io_imap::types::{
extensions::thread::{Thread, ThreadingAlgorithm}, extensions::thread::{Thread, ThreadingAlgorithm},
@@ -25,7 +25,7 @@ use io_imap::types::{
sequence::SequenceSet, sequence::SequenceSet,
}; };
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
use serde::{ser::SerializeStruct, Serialize, Serializer}; use serde::{Serialize, Serializer, ser::SerializeStruct};
use crate::imap::{ use crate::imap::{
client::ImapClient, client::ImapClient,
+1 -1
View File
@@ -18,8 +18,8 @@
use anyhow::Result; use anyhow::Result;
use clap::Parser; use clap::Parser;
use io_imap::types::{ use io_imap::types::{
flag::{Flag, StoreType},
IntoStatic, IntoStatic,
flag::{Flag, StoreType},
}; };
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -18,8 +18,8 @@
use anyhow::Result; use anyhow::Result;
use clap::Parser; use clap::Parser;
use io_imap::types::{ use io_imap::types::{
flag::{Flag, StoreType},
IntoStatic, IntoStatic,
flag::{Flag, StoreType},
}; };
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -18,8 +18,8 @@
use anyhow::Result; use anyhow::Result;
use clap::Parser; use clap::Parser;
use io_imap::types::{ use io_imap::types::{
flag::{Flag, StoreType},
IntoStatic, IntoStatic,
flag::{Flag, StoreType},
}; };
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -21,8 +21,8 @@ use anyhow::Result;
use clap::Parser; use clap::Parser;
use comfy_table::{Cell, Row, Table}; use comfy_table::{Cell, Row, Table};
use io_imap::types::{ use io_imap::types::{
core::{IString, NString},
IntoStatic, IntoStatic,
core::{IString, NString},
}; };
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
use serde::Serialize; use serde::Serialize;
+1 -1
View File
@@ -21,7 +21,7 @@ use std::{
path::PathBuf, path::PathBuf,
}; };
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_imap::types::fetch::{MacroOrMessageDataItemNames, MessageDataItem, MessageDataItemName}; use io_imap::types::fetch::{MacroOrMessageDataItemNames, MessageDataItem, MessageDataItemName};
use mail_parser::{MessageParser, MimeHeaders}; use mail_parser::{MessageParser, MimeHeaders};
+2 -2
View File
@@ -17,9 +17,9 @@
use std::fmt; use std::fmt;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use comfy_table::{presets, Cell, ContentArrangement, Row, Table}; use comfy_table::{Cell, ContentArrangement, Row, Table, presets};
use io_imap::types::fetch::{MacroOrMessageDataItemNames, MessageDataItem, MessageDataItemName}; use io_imap::types::fetch::{MacroOrMessageDataItemNames, MessageDataItem, MessageDataItemName};
use mail_parser::{Addr, Address, ContentType, Message, MessageParser, MimeHeaders}; use mail_parser::{Addr, Address, ContentType, Message, MessageParser, MimeHeaders};
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
+1 -1
View File
@@ -17,7 +17,7 @@
use std::fmt; use std::fmt;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_imap::types::fetch::{MacroOrMessageDataItemNames, MessageDataItem, MessageDataItemName}; use io_imap::types::fetch::{MacroOrMessageDataItemNames, MessageDataItem, MessageDataItemName};
use mail_parser::{Message, MessageParser}; use mail_parser::{Message, MessageParser};
+2 -2
View File
@@ -15,12 +15,12 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use std::io::{stdin, BufRead, IsTerminal}; use std::io::{BufRead, IsTerminal, stdin};
use anyhow::Result; use anyhow::Result;
use clap::Parser; use clap::Parser;
use io_imap::types::{ use io_imap::types::{
core::Literal, extensions::binary::LiteralOrLiteral8, flag::Flag, mailbox::Mailbox, IntoStatic, IntoStatic, core::Literal, extensions::binary::LiteralOrLiteral8, flag::Flag, mailbox::Mailbox,
}; };
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+2 -2
View File
@@ -27,8 +27,8 @@ use std::{
path::PathBuf, path::PathBuf,
}; };
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use base64::{prelude::BASE64_STANDARD, Engine}; use base64::{Engine, prelude::BASE64_STANDARD};
use io_jmap::client::JmapClientStd as Inner; use io_jmap::client::JmapClientStd as Inner;
use pimalaya_config::toml::TomlConfig; use pimalaya_config::toml::TomlConfig;
use pimalaya_stream::tls::Tls; use pimalaya_stream::tls::Tls;
+1 -1
View File
@@ -17,7 +17,7 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::email::EmailCopy; use io_jmap::rfc8621::email::EmailCopy;
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::email_set::JmapEmailSetArgs; use io_jmap::rfc8621::email_set::JmapEmailSetArgs;
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+2 -2
View File
@@ -15,14 +15,14 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use clap::Parser; use clap::Parser;
use io_jmap::{client::JmapClientStd, rfc8621::capabilities::MAIL}; use io_jmap::{client::JmapClientStd, rfc8621::capabilities::MAIL};
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
use pimalaya_stream::tls::Tls; use pimalaya_stream::tls::Tls;
use url::Url; use url::Url;
use crate::jmap::client::{jmap_http_auth, JmapClient}; use crate::jmap::client::{JmapClient, jmap_http_auth};
/// Export a raw RFC 5322 message to stdout (Email/get + blob download). /// Export a raw RFC 5322 message to stdout (Email/get + blob download).
/// ///
+3 -3
View File
@@ -17,10 +17,10 @@
use std::{ use std::{
collections::BTreeMap, collections::BTreeMap,
io::{stdin, BufRead, IsTerminal}, io::{BufRead, IsTerminal, stdin},
}; };
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::{ use io_jmap::{
client::JmapClientStd, client::JmapClientStd,
@@ -31,7 +31,7 @@ use pimalaya_stream::tls::Tls;
use url::Url; use url::Url;
use crate::jmap::{ use crate::jmap::{
client::{jmap_http_auth, JmapClient}, client::{JmapClient, jmap_http_auth},
error::format_set_error, error::format_set_error,
}; };
+2 -7
View File
@@ -140,11 +140,7 @@ impl JmapEmailQueryCommand {
|| f.subject.is_some() || f.subject.is_some()
|| f.body.is_some(); || f.body.is_some();
if has_one_filter { if has_one_filter { Some(f) } else { None }
Some(f)
} else {
None
}
}; };
let sort = Some(vec![EmailComparator { let sort = Some(vec![EmailComparator {
@@ -247,8 +243,7 @@ impl fmt::Display for EmailsTable {
row.add_cell(Cell::new(&flags).fg(self.colors.flags)); row.add_cell(Cell::new(&flags).fg(self.colors.flags));
row.add_cell(Cell::new(e.subject.as_deref().unwrap_or("")).fg(self.colors.subject)); row.add_cell(Cell::new(e.subject.as_deref().unwrap_or("")).fg(self.colors.subject));
row.add_cell( row.add_cell(
Cell::new(format_addresses(e.from.as_deref().unwrap_or(&[]))) Cell::new(format_addresses(e.from.as_deref().unwrap_or(&[]))).fg(self.colors.from),
.fg(self.colors.from),
); );
row.add_cell(Cell::new(e.received_at.as_deref().unwrap_or("")).fg(self.colors.date)); row.add_cell(Cell::new(e.received_at.as_deref().unwrap_or("")).fg(self.colors.date));
table.add_row(row); table.add_row(row);
+1 -1
View File
@@ -17,7 +17,7 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::email_set::JmapEmailSetArgs; use io_jmap::rfc8621::email_set::JmapEmailSetArgs;
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::{identity::IdentityCreate, identity_set::JmapIdentitySetArgs}; use io_jmap::rfc8621::{identity::IdentityCreate, identity_set::JmapIdentitySetArgs};
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::identity_set::JmapIdentitySetArgs; use io_jmap::rfc8621::identity_set::JmapIdentitySetArgs;
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::{identity::IdentityUpdate, identity_set::JmapIdentitySetArgs}; use io_jmap::rfc8621::{identity::IdentityUpdate, identity_set::JmapIdentitySetArgs};
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -17,7 +17,7 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::{mailbox::MailboxCreate, mailbox_set::JmapMailboxSetArgs}; use io_jmap::rfc8621::{mailbox::MailboxCreate, mailbox_set::JmapMailboxSetArgs};
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::mailbox_set::JmapMailboxSetArgs; use io_jmap::rfc8621::mailbox_set::JmapMailboxSetArgs;
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -5
View File
@@ -88,11 +88,7 @@ impl JmapMailboxQueryCommand {
|| f.is_subscribed.is_some() || f.is_subscribed.is_some()
|| f.has_any_role.is_some(); || f.has_any_role.is_some();
if has_one_filter { if has_one_filter { Some(f) } else { None }
Some(f)
} else {
None
}
}; };
let sort = Some(vec![MailboxSortComparator { let sort = Some(vec![MailboxSortComparator {
+1 -1
View File
@@ -17,7 +17,7 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::{mailbox::MailboxUpdate, mailbox_set::JmapMailboxSetArgs}; use io_jmap::rfc8621::{mailbox::MailboxUpdate, mailbox_set::JmapMailboxSetArgs};
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+2 -2
View File
@@ -17,10 +17,10 @@
use std::{ use std::{
fmt, fmt,
io::{stdin, BufRead}, io::{BufRead, stdin},
}; };
use anyhow::{bail, Context, Result}; use anyhow::{Context, Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::{ use io_jmap::{
rfc8620::{send::JmapRequest, session::capabilities::CORE}, rfc8620::{send::JmapRequest, session::capabilities::CORE},
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+1 -1
View File
@@ -17,7 +17,7 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::email_submission::{ use io_jmap::rfc8621::email_submission::{
EmailAddressWithParameters, EmailSubmissionCreate, Envelope, EmailAddressWithParameters, EmailSubmissionCreate, Envelope,
+1 -5
View File
@@ -80,11 +80,7 @@ impl JmapSubmissionQueryCommand {
let has_one = f.undo_status.is_some() || f.before.is_some() || f.after.is_some(); let has_one = f.undo_status.is_some() || f.before.is_some() || f.after.is_some();
if has_one { if has_one { Some(f) } else { None }
Some(f)
} else {
None
}
}; };
let output = client.email_submission_query( let output = client.email_submission_query(
+1 -1
View File
@@ -17,7 +17,7 @@
use std::fmt; use std::fmt;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use comfy_table::{Cell, Row, Table}; use comfy_table::{Cell, Row, Table};
use io_jmap::rfc8621::{capabilities::VACATION_RESPONSE, vacation_response::VacationResponse}; use io_jmap::rfc8621::{capabilities::VACATION_RESPONSE, vacation_response::VacationResponse};
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_jmap::rfc8621::{ use io_jmap::rfc8621::{
capabilities::VACATION_RESPONSE, vacation_response::VacationResponseUpdate, capabilities::VACATION_RESPONSE, vacation_response::VacationResponseUpdate,
+1 -1
View File
@@ -27,7 +27,7 @@ use std::{
path::PathBuf, path::PathBuf,
}; };
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use io_maildir::client::MaildirClient as Inner; use io_maildir::client::MaildirClient as Inner;
use pimalaya_config::toml::TomlConfig; use pimalaya_config::toml::TomlConfig;
+1 -1
View File
@@ -17,7 +17,7 @@
use std::fmt; use std::fmt;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use comfy_table::{Cell, Row, Table}; use comfy_table::{Cell, Row, Table};
use io_maildir::maildir::Maildir; use io_maildir::maildir::Maildir;
+1 -1
View File
@@ -17,7 +17,7 @@
use std::{fmt, fs, path::PathBuf}; use std::{fmt, fs, path::PathBuf};
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::{Parser, ValueEnum}; use clap::{Parser, ValueEnum};
use convert_case::ccase; use convert_case::ccase;
use io_maildir::maildir::Maildir; use io_maildir::maildir::Maildir;
+1 -1
View File
@@ -17,7 +17,7 @@
use std::fmt; use std::fmt;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_maildir::maildir::Maildir; use io_maildir::maildir::Maildir;
use mail_parser::Message; use mail_parser::Message;
+1 -1
View File
@@ -17,7 +17,7 @@
use std::fmt; use std::fmt;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_maildir::maildir::Maildir; use io_maildir::maildir::Maildir;
use mail_parser::Message; use mail_parser::Message;
+1 -1
View File
@@ -17,7 +17,7 @@
use std::{ use std::{
fmt, fmt,
io::{stdin, BufRead, IsTerminal}, io::{BufRead, IsTerminal, stdin},
path::PathBuf, path::PathBuf,
}; };
+2 -2
View File
@@ -21,13 +21,13 @@ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use mail_parser::{MessageParser, MimeHeaders}; use mail_parser::{MessageParser, MimeHeaders};
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
use crate::shared::{ use crate::shared::{
attachments::list::{mime_string, Attachment, AttachmentColors, Attachments}, attachments::list::{Attachment, AttachmentColors, Attachments, mime_string},
client::EmailClient, client::EmailClient,
mailboxes::arg::MailboxArg, mailboxes::arg::MailboxArg,
}; };
+2 -2
View File
@@ -17,10 +17,10 @@
use std::fmt; use std::fmt;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use comfy_table::{Cell, Color, ContentArrangement, Row, Table}; use comfy_table::{Cell, Color, ContentArrangement, Row, Table};
use humansize::{format_size, BINARY}; use humansize::{BINARY, format_size};
use mail_parser::{MessageParser, MessagePart, MimeHeaders}; use mail_parser::{MessageParser, MessagePart, MimeHeaders};
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
use serde::Serialize; use serde::Serialize;
+4 -2
View File
@@ -21,7 +21,7 @@ use anyhow::Result;
use chrono::{DateTime, FixedOffset, Local}; use chrono::{DateTime, FixedOffset, Local};
use clap::Parser; use clap::Parser;
use comfy_table::{Cell, Color, ContentArrangement, Row, Table}; use comfy_table::{Cell, Color, ContentArrangement, Row, Table};
use humansize::{format_size, BINARY}; use humansize::{BINARY, format_size};
use io_email::{address::Address, envelope::Envelope, flag::Flag}; use io_email::{address::Address, envelope::Envelope, flag::Flag};
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
use serde::Serialize; use serde::Serialize;
@@ -184,7 +184,9 @@ impl fmt::Display for Envelopes {
let mut row = Row::new(); let mut row = Row::new();
row.max_height(1); row.max_height(1);
row.add_cell(Cell::new(&env.id).fg(self.colors.id)); row.add_cell(Cell::new(&env.id).fg(self.colors.id));
row.add_cell(Cell::new(format_flags(&env.flags, &self.chars)).fg(self.colors.flags)); row.add_cell(
Cell::new(format_flags(&env.flags, &self.chars)).fg(self.colors.flags),
);
if self.with_attachment { if self.with_attachment {
row.add_cell( row.add_cell(
Cell::new(format_attachment(env.has_attachment, self.chars.attachment)) Cell::new(format_attachment(env.has_attachment, self.chars.attachment))
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use clap::Parser; use clap::Parser;
use crate::account::context::Account; use crate::account::context::Account;
+2 -2
View File
@@ -16,11 +16,11 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use std::{ use std::{
io::{stdin, IsTerminal, Read}, io::{IsTerminal, Read, stdin},
path::PathBuf, path::PathBuf,
}; };
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_email::flag::Flag; use io_email::flag::Flag;
use pimalaya_cli::printer::Message; use pimalaya_cli::printer::Message;
+3 -3
View File
@@ -29,15 +29,15 @@
//! external command and never go through this module. //! external command and never go through this module.
use std::{ use std::{
io::{stdin, IsTerminal, Read as _}, io::{IsTerminal, Read as _, stdin},
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use clap::ValueEnum; use clap::ValueEnum;
use mail_builder::{ use mail_builder::{
headers::{address::Address, raw::Raw},
MessageBuilder, MessageBuilder,
headers::{address::Address, raw::Raw},
}; };
use mail_parser::{HeaderValue, MessageParser}; use mail_parser::{HeaderValue, MessageParser};
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{anyhow, bail, Result}; use anyhow::{Result, anyhow, bail};
use clap::Parser; use clap::Parser;
use percent_encoding::percent_decode_str; use percent_encoding::percent_decode_str;
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
+2 -2
View File
@@ -23,9 +23,9 @@
//! `Sent` mailbox. With neither flag, the raw bytes are written to //! `Sent` mailbox. With neither flag, the raw bytes are written to
//! stdout — same shape as a manual `mml compile > out.eml`. //! stdout — same shape as a manual `mml compile > out.eml`.
use std::io::{stdout, Write}; use std::io::{Write, stdout};
use anyhow::{anyhow, bail, Result}; use anyhow::{Result, anyhow, bail};
use mail_parser::{Address as ParserAddress, HeaderValue, MessageParser}; use mail_parser::{Address as ParserAddress, HeaderValue, MessageParser};
use pimalaya_cli::printer::{Message, Printer}; use pimalaya_cli::printer::{Message, Printer};
+2 -2
View File
@@ -17,10 +17,10 @@
use std::{ use std::{
fmt, fmt,
io::{stdout, Write}, io::{Write, stdout},
}; };
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use mail_parser::{Message, MessageParser}; use mail_parser::{Message, MessageParser};
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use std::io::{stdout, Write}; use std::io::{Write, stdout};
use anyhow::Result; use anyhow::Result;
use clap::Parser; use clap::Parser;
+1 -1
View File
@@ -15,7 +15,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use pimalaya_cli::printer::Printer; use pimalaya_cli::printer::Printer;
+1 -1
View File
@@ -31,7 +31,7 @@ use std::{
process::{Command, Stdio}, process::{Command, Stdio},
}; };
use anyhow::{anyhow, bail, Result}; use anyhow::{Result, anyhow, bail};
use crate::config::{ComposerConfig, ReaderConfig}; use crate::config::{ComposerConfig, ReaderConfig};
+1 -1
View File
@@ -16,7 +16,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use std::{ use std::{
io::{stdin, BufRead, IsTerminal}, io::{BufRead, IsTerminal, stdin},
path::PathBuf, path::PathBuf,
}; };
+1 -1
View File
@@ -29,7 +29,7 @@ use std::{
path::PathBuf, path::PathBuf,
}; };
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use io_smtp::{client::SmtpClientStd as Inner, rfc5321::types::ehlo_domain::EhloDomain}; use io_smtp::{client::SmtpClientStd as Inner, rfc5321::types::ehlo_domain::EhloDomain};
use pimalaya_config::toml::TomlConfig; use pimalaya_config::toml::TomlConfig;
use pimalaya_stream::{sasl::Sasl, std::stream::StreamStd, tls::Tls}; use pimalaya_stream::{sasl::Sasl, std::stream::StreamStd, tls::Tls};
+2 -2
View File
@@ -18,10 +18,10 @@
use std::{ use std::{
borrow::Cow, borrow::Cow,
collections::HashSet, collections::HashSet,
io::{stdin, BufRead, IsTerminal}, io::{BufRead, IsTerminal, stdin},
}; };
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use clap::Parser; use clap::Parser;
use io_smtp::rfc5321::types::{ use io_smtp::rfc5321::types::{
domain::Domain, ehlo_domain::EhloDomain, forward_path::ForwardPath, local_part::LocalPart, domain::Domain, ehlo_domain::EhloDomain, forward_path::ForwardPath, local_part::LocalPart,
+1 -1
View File
@@ -23,7 +23,7 @@
use std::process::Command; use std::process::Command;
use anyhow::{bail, Result}; use anyhow::{Result, bail};
use pimalaya_cli::wizard::{ use pimalaya_cli::wizard::{
imap::{Encryption as ImapEncryption, ImapAuth, ImapSecret, WizardImapConfig}, imap::{Encryption as ImapEncryption, ImapAuth, ImapSecret, WizardImapConfig},
jmap::{JmapAuth, JmapSecret, WizardJmapConfig}, jmap::{JmapAuth, JmapSecret, WizardJmapConfig},
+1 -1
View File
@@ -33,7 +33,7 @@ use pimalaya_cli::{
}, },
}; };
use crate::wizard::discover::{discovery_resolver, discovery_tls, DiscoveryResult}; use crate::wizard::discover::{DiscoveryResult, discovery_resolver, discovery_tls};
pub fn run(local_part: &str, domain: &str) -> Option<Autoconfig> { pub fn run(local_part: &str, domain: &str) -> Option<Autoconfig> {
let mut client = let mut client =
+1 -1
View File
@@ -34,7 +34,7 @@
use std::{collections::HashMap, path::Path, process::exit}; use std::{collections::HashMap, path::Path, process::exit};
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use log::info; use log::info;
use pimalaya_cli::{ use pimalaya_cli::{
prompt, prompt,
+1 -1
View File
@@ -23,7 +23,7 @@
use std::path::Path; use std::path::Path;
use anyhow::{anyhow, Result}; use anyhow::{Result, anyhow};
use log::info; use log::info;
use pimalaya_cli::{ use pimalaya_cli::{
prompt, prompt,
+1 -1
View File
@@ -28,7 +28,7 @@ use pimalaya_cli::{
}, },
}; };
use crate::wizard::discover::{discovery_resolver, discovery_tls, DiscoveryResult}; use crate::wizard::discover::{DiscoveryResult, discovery_resolver, discovery_tls};
pub fn run(domain: &str) -> Option<PaccConfig> { pub fn run(domain: &str) -> Option<PaccConfig> {
let spinner = Spinner::start(format!("Probing PACC for {domain}")); let spinner = Spinner::start(format!("Probing PACC for {domain}"));
+1 -1
View File
@@ -36,7 +36,7 @@ use pimalaya_cli::{
}, },
}; };
use crate::wizard::discover::{discovery_resolver, DiscoveryResult}; use crate::wizard::discover::{DiscoveryResult, discovery_resolver};
pub fn run(domain: &str) -> Option<SrvReport> { pub fn run(domain: &str) -> Option<SrvReport> {
let spinner = Spinner::start(format!("Probing SRV records for {domain}")); let spinner = Spinner::start(format!("Probing SRV records for {domain}"));