replace himalaya-lib by pimalaya-email

src/config/config.rs

@@ -5,8 +5,8 @@
 
 use anyhow::{anyhow, Context, Result};
 use dirs::{config_dir, home_dir};
-use himalaya_lib::{AccountConfig, BackendConfig, EmailHooks, EmailTextPlainFormat};
 use log::{debug, trace};
+use pimalaya_email::{AccountConfig, BackendConfig, EmailHooks, EmailTextPlainFormat};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, fs, path::PathBuf};
 use toml;
@@ -119,12 +119,12 @@ impl DeserializedConfig {
 
 #[cfg(test)]
 mod tests {
-    use himalaya_lib::{EmailSender, MaildirConfig, SendmailConfig, SmtpConfig};
+    use pimalaya_email::{EmailSender, MaildirConfig, SendmailConfig, SmtpConfig};
 
     #[cfg(feature = "imap-backend")]
-    use himalaya_lib::ImapConfig;
+    use pimalaya_email::ImapConfig;
     #[cfg(feature = "notmuch-backend")]
-    use himalaya_lib::NotmuchConfig;
+    use pimalaya_email::NotmuchConfig;
 
     use std::io::Write;
     use tempfile::NamedTempFile;

src/config/prelude.rs

@@ -1,4 +1,4 @@
-use himalaya_lib::{
+use pimalaya_email::{
     folder::sync::Strategy as SyncFoldersStrategy, EmailHooks, EmailSender, EmailTextPlainFormat,
     MaildirConfig, SendmailConfig, SmtpConfig,
 };
@@ -6,10 +6,10 @@ use serde::{Deserialize, Serialize};
 use std::{collections::HashSet, path::PathBuf};
 
 #[cfg(feature = "imap-backend")]
-use himalaya_lib::ImapConfig;
+use pimalaya_email::ImapConfig;
 
 #[cfg(feature = "notmuch-backend")]
-use himalaya_lib::NotmuchConfig;
+use pimalaya_email::NotmuchConfig;
 
 #[derive(Clone, Debug, Default, Eq, PartialEq, Deserialize, Serialize)]
 #[serde(remote = "SmtpConfig")]

src/config/wizard/imap.rs

@@ -4,7 +4,7 @@ use crate::account::{
 };
 use anyhow::Result;
 use dialoguer::{Input, Select};
-use himalaya_lib::ImapConfig;
+use pimalaya_email::ImapConfig;
 
 #[cfg(feature = "imap-backend")]
 pub(crate) fn configure(base: DeserializedBaseAccountConfig) -> Result<DeserializedAccountConfig> {

src/config/wizard/maildir.rs

@@ -5,7 +5,7 @@ use crate::account::{
 use anyhow::Result;
 use dialoguer::Input;
 use dirs::home_dir;
-use himalaya_lib::MaildirConfig;
+use pimalaya_email::MaildirConfig;
 
 pub(crate) fn configure(base: DeserializedBaseAccountConfig) -> Result<DeserializedAccountConfig> {
     let input = if let Some(home) = home_dir() {

src/config/wizard/notmuch.rs

@@ -4,7 +4,7 @@ use crate::account::{
 };
 use anyhow::Result;
 use dialoguer::Input;
-use himalaya_lib::{NotmuchBackend, NotmuchConfig};
+use pimalaya_email::{NotmuchBackend, NotmuchConfig};
 
 pub(crate) fn configure(base: DeserializedBaseAccountConfig) -> Result<DeserializedAccountConfig> {
     let db_path = match NotmuchBackend::get_default_db_path() {

src/config/wizard/sendmail.rs

@@ -1,7 +1,7 @@
 use super::THEME;
 use anyhow::Result;
 use dialoguer::Input;
-use himalaya_lib::{EmailSender, SendmailConfig};
+use pimalaya_email::{EmailSender, SendmailConfig};
 
 pub(crate) fn configure() -> Result<EmailSender> {
     Ok(EmailSender::Sendmail(SendmailConfig {

src/config/wizard/smtp.rs

@@ -2,7 +2,7 @@ use super::{SECURITY_PROTOCOLS, THEME};
 use crate::account::DeserializedBaseAccountConfig;
 use anyhow::Result;
 use dialoguer::{Input, Select};
-use himalaya_lib::{EmailSender, SmtpConfig};
+use pimalaya_email::{EmailSender, SmtpConfig};
 
 pub(crate) fn configure(base: &DeserializedBaseAccountConfig) -> Result<EmailSender> {
     let mut smtp_config = SmtpConfig {

src/domain/account/args.rs

@@ -2,8 +2,8 @@
 
 use anyhow::Result;
 use clap::{Arg, ArgAction, ArgMatches, Command};
-use himalaya_lib::folder::sync::Strategy as SyncFoldersStrategy;
 use log::info;
+use pimalaya_email::folder::sync::Strategy as SyncFoldersStrategy;
 use std::collections::HashSet;
 
 use crate::{folder, ui::table};

src/domain/account/config.rs

@@ -3,7 +3,7 @@
 //! This module contains the raw deserialized representation of an
 //! account in the accounts section of the user configuration file.
 
-use himalaya_lib::{
+use pimalaya_email::{
     folder::sync::Strategy as SyncFoldersStrategy, AccountConfig, BackendConfig, EmailHooks,
     EmailSender, EmailTextPlainFormat, MaildirConfig,
 };
@@ -11,10 +11,10 @@ use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, path::PathBuf};
 
 #[cfg(feature = "imap-backend")]
-use himalaya_lib::ImapConfig;
+use pimalaya_email::ImapConfig;
 
 #[cfg(feature = "notmuch-backend")]
-use himalaya_lib::NotmuchConfig;
+use pimalaya_email::NotmuchConfig;
 
 use crate::config::{prelude::*, DeserializedConfig};
 

src/domain/account/handlers.rs

@@ -3,12 +3,12 @@
 //! This module gathers all account actions triggered by the CLI.
 
 use anyhow::Result;
-use himalaya_lib::{
+use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
+use log::{info, trace};
+use pimalaya_email::{
     folder::sync::Strategy as SyncFoldersStrategy, AccountConfig, Backend, BackendSyncBuilder,
     BackendSyncProgressEvent,
 };
-use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
-use log::{info, trace};
 
 use crate::{
     config::DeserializedConfig,
@@ -226,7 +226,7 @@ pub fn sync<P: Printer>(
 
 #[cfg(test)]
 mod tests {
-    use himalaya_lib::{AccountConfig, ImapConfig};
+    use pimalaya_email::{AccountConfig, ImapConfig};
     use std::{collections::HashMap, fmt::Debug, io};
     use termcolor::ColorSpec;
 

src/domain/email/handlers.rs

@@ -1,9 +1,9 @@
 use anyhow::{anyhow, Context, Result};
 use atty::Stream;
-use himalaya_lib::{
+use log::{debug, trace};
+use pimalaya_email::{
     AccountConfig, Backend, Email, Flag, Flags, Sender, ShowTextPartsStrategy, Tpl, TplBuilder,
 };
-use log::{debug, trace};
 use std::{
     fs,
     io::{self, BufRead},

src/domain/envelope/envelope.rs

@@ -26,8 +26,8 @@ pub struct Envelope {
     pub date: DateTime<Local>,
 }
 
-impl From<&himalaya_lib::Envelope> for Envelope {
-    fn from(envelope: &himalaya_lib::Envelope) -> Self {
+impl From<&pimalaya_email::Envelope> for Envelope {
+    fn from(envelope: &pimalaya_email::Envelope) -> Self {
         Envelope {
             id: envelope.id.clone(),
             flags: envelope.flags.clone().into(),

src/domain/envelope/envelopes.rs

@@ -21,8 +21,8 @@ impl ops::Deref for Envelopes {
     }
 }
 
-impl From<himalaya_lib::Envelopes> for Envelopes {
-    fn from(envelopes: himalaya_lib::Envelopes) -> Self {
+impl From<pimalaya_email::Envelopes> for Envelopes {
+    fn from(envelopes: pimalaya_email::Envelopes) -> Self {
         Envelopes(envelopes.iter().map(Envelope::from).collect())
     }
 }

src/domain/flag/args.rs

@@ -5,8 +5,8 @@
 
 use anyhow::Result;
 use clap::{Arg, ArgMatches, Command};
-use himalaya_lib::{Flag, Flags};
 use log::{debug, info};
+use pimalaya_email::{Flag, Flags};
 
 use crate::email;
 

src/domain/flag/flag.rs

@@ -11,15 +11,15 @@ pub enum Flag {
     Custom(String),
 }
 
-impl From<&himalaya_lib::Flag> for Flag {
-    fn from(flag: &himalaya_lib::Flag) -> Self {
+impl From<&pimalaya_email::Flag> for Flag {
+    fn from(flag: &pimalaya_email::Flag) -> Self {
         match flag {
-            himalaya_lib::Flag::Seen => Flag::Seen,
-            himalaya_lib::Flag::Answered => Flag::Answered,
-            himalaya_lib::Flag::Flagged => Flag::Flagged,
-            himalaya_lib::Flag::Deleted => Flag::Deleted,
-            himalaya_lib::Flag::Draft => Flag::Draft,
-            himalaya_lib::Flag::Custom(flag) => Flag::Custom(flag.clone()),
+            pimalaya_email::Flag::Seen => Flag::Seen,
+            pimalaya_email::Flag::Answered => Flag::Answered,
+            pimalaya_email::Flag::Flagged => Flag::Flagged,
+            pimalaya_email::Flag::Deleted => Flag::Deleted,
+            pimalaya_email::Flag::Draft => Flag::Draft,
+            pimalaya_email::Flag::Custom(flag) => Flag::Custom(flag.clone()),
         }
     }
 }

src/domain/flag/flags.rs

@@ -14,8 +14,8 @@ impl ops::Deref for Flags {
     }
 }
 
-impl From<himalaya_lib::Flags> for Flags {
-    fn from(flags: himalaya_lib::Flags) -> Self {
+impl From<pimalaya_email::Flags> for Flags {
+    fn from(flags: pimalaya_email::Flags) -> Self {
         Flags(flags.iter().map(Flag::from).collect())
     }
 }

src/domain/flag/handlers.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use himalaya_lib::{Backend, Flags};
+use pimalaya_email::{Backend, Flags};
 
 use crate::printer::Printer;
 

src/domain/folder/folder.rs

@@ -9,8 +9,8 @@ pub struct Folder {
     pub desc: String,
 }
 
-impl From<&himalaya_lib::Folder> for Folder {
-    fn from(folder: &himalaya_lib::Folder) -> Self {
+impl From<&pimalaya_email::Folder> for Folder {
+    fn from(folder: &pimalaya_email::Folder) -> Self {
         Folder {
             delim: folder.delim.clone(),
             name: folder.name.clone(),

src/domain/folder/folders.rs

@@ -20,8 +20,8 @@ impl ops::Deref for Folders {
     }
 }
 
-impl From<himalaya_lib::Folders> for Folders {
-    fn from(folders: himalaya_lib::Folders) -> Self {
+impl From<pimalaya_email::Folders> for Folders {
+    fn from(folders: pimalaya_email::Folders) -> Self {
         Folders(folders.iter().map(Folder::from).collect())
     }
 }

src/domain/folder/handlers.rs

@@ -4,7 +4,7 @@
 
 use anyhow::Result;
 use dialoguer::Confirm;
-use himalaya_lib::{AccountConfig, Backend};
+use pimalaya_email::{AccountConfig, Backend};
 use std::process;
 
 use crate::{
@@ -67,7 +67,7 @@ pub fn delete<P: Printer, B: Backend + ?Sized>(
 
 #[cfg(test)]
 mod tests {
-    use himalaya_lib::{
+    use pimalaya_email::{
         backend, AccountConfig, Backend, Emails, Envelope, Envelopes, Flags, Folder, Folders,
     };
     use std::{any::Any, fmt::Debug, io};

src/domain/imap/handlers.rs

@@ -3,7 +3,7 @@
 //! This module gathers all IMAP handlers triggered by the CLI.
 
 use anyhow::{Context, Result};
-use himalaya_lib::ImapBackend;
+use pimalaya_email::ImapBackend;
 
 pub fn notify(imap: &ImapBackend, folder: &str, keepalive: u64) -> Result<()> {
     imap.notify(keepalive, folder).context("cannot imap notify")

src/domain/tpl/handlers.rs

@@ -1,6 +1,6 @@
 use anyhow::{anyhow, Result};
 use atty::Stream;
-use himalaya_lib::{AccountConfig, Backend, CompilerBuilder, Email, Flags, Sender, Tpl};
+use pimalaya_email::{AccountConfig, Backend, CompilerBuilder, Email, Flags, Sender, Tpl};
 use std::io::{stdin, BufRead};
 
 use crate::printer::Printer;

src/main.rs

@@ -10,7 +10,7 @@ use himalaya::{
     printer::StdoutPrinter,
     tpl,
 };
-use himalaya_lib::{
+use pimalaya_email::{
     BackendBuilder, BackendConfig, ImapBackend, SenderBuilder, DEFAULT_INBOX_FOLDER,
 };
 

src/printer/print.rs

@@ -1,5 +1,5 @@
 use anyhow::{Context, Result};
-use himalaya_lib::Tpl;
+use pimalaya_email::Tpl;
 
 use crate::printer::WriteColor;
 

src/printer/print_table.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use himalaya_lib::EmailTextPlainFormat;
+use pimalaya_email::EmailTextPlainFormat;
 use std::io;
 use termcolor::{self, StandardStream};
 

src/ui/editor.rs

@@ -1,9 +1,9 @@
 use anyhow::{Context, Result};
-use himalaya_lib::{
+use log::debug;
+use pimalaya_email::{
     email::{local_draft_path, remove_local_draft},
     AccountConfig, Backend, CompilerBuilder, Flag, Flags, Sender, Tpl,
 };
-use log::debug;
 use std::{env, fs, process::Command};
 
 use crate::{

src/ui/table/table.rs

@@ -5,8 +5,8 @@
 //! [builder design pattern]: https://refactoring.guru/design-patterns/builder
 
 use anyhow::{Context, Result};
-use himalaya_lib::EmailTextPlainFormat;
 use log::trace;
+use pimalaya_email::EmailTextPlainFormat;
 use termcolor::{Color, ColorSpec};
 use terminal_size;
 use unicode_width::UnicodeWidthStr;