meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 11 Actions Packages Projects 1 Releases 18 Wiki Activity

melib: rename `notmuch_backend` feature to `notmuch`

pull/262/head
Manos Pitsidianakis 2023-07-22 20:51:12 +03:00
parent fe027fa300
commit fe7dcc508e
Signed by: Manos Pitsidianakis
GPG Key ID: 7729C7707F7E09D0
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meli/Cargo.toml
View File

@ -72,7 +72,7 @@ tempfile = "3.3"
[features]
default = ["sqlite3", "notmuch", "regexp", "smtp", "dbus-notifications", "gpgme", "cli-docs", "jmap"]
notmuch = ["melib/notmuch_backend", ]
notmuch = ["melib/notmuch", ]
jmap = ["melib/jmap_backend",]
sqlite3 = ["melib/sqlite3"]
smtp = ["melib/smtp"]

2
melib/Cargo.toml
View File

@ -81,7 +81,7 @@ imap = ["imap-codec", "tls"]
jmap_backend = ["http"]
maildir = ["notify"]
mbox_backend = ["notify"]
notmuch_backend = []
notmuch = []
smtp = ["tls", "base64"]
smtp-trace = ["smtp"]
sqlite3 = ["rusqlite", ]

2
melib/README.md
View File

@ -13,7 +13,7 @@ Library for handling mail.
| `jmap_backend` | `isahc`, `native-tls`, `serde_json` | |
| `maildir` | `notify` | |
| `mbox_backend` | `notify` | |
| `notmuch_backend` | `notify` | |
| `notmuch` | `notify` | |
| `sqlite` | `rusqlite` | used in IMAP cache |
| `unicode_algorithms` | `unicode-segmentation` | linebreaking algo etc |
| `vcard` | | vcard parsing |

25
melib/src/backends.rs
View File

@ -26,9 +26,9 @@ use smallvec::SmallVec;
pub mod imap;
#[cfg(feature = "imap")]
pub mod nntp;
#[cfg(feature = "notmuch_backend")]
#[cfg(feature = "notmuch")]
pub mod notmuch;
#[cfg(feature = "notmuch_backend")]
#[cfg(feature = "notmuch")]
pub use self::notmuch::NotmuchDb;
#[cfg(feature = "jmap_backend")]
pub mod jmap;
@ -105,19 +105,19 @@ impl Default for Backends {
}
}
#[cfg(feature = "notmuch_backend")]
#[cfg(feature = "notmuch")]
pub const NOTMUCH_ERROR_MSG: &str = "libnotmuch5 was not found in your system. Make sure it is \
installed and in the library paths. For a custom file path, \
use `library_file_path` setting in your notmuch account.\n";
#[cfg(not(feature = "notmuch_backend"))]
#[cfg(not(feature = "notmuch"))]
pub const NOTMUCH_ERROR_MSG: &str = "this version of meli is not compiled with notmuch support. \
Use an appropriate version and make sure libnotmuch5 is \
installed and in the library paths.\n";
#[cfg(not(feature = "notmuch_backend"))]
#[cfg(not(feature = "notmuch"))]
pub const NOTMUCH_ERROR_DETAILS: &str = "";
#[cfg(all(feature = "notmuch_backend", target_os = "unix"))]
#[cfg(all(feature = "notmuch", target_os = "unix"))]
pub const NOTMUCH_ERROR_DETAILS: &str = r#"If you have installed the library manually, try setting the `LD_LIBRARY_PATH` environment variable to its `lib` directory. Otherwise, set it to the location of libnotmuch.5.so. Example:
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/path/to/notmuch/lib" meli
@ -128,7 +128,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/path/to/notmuch/lib"
You can also set any location by specifying the library file path with the configuration flag `library_file_path`."#;
#[cfg(all(feature = "notmuch_backend", target_os = "macos"))]
#[cfg(all(feature = "notmuch", target_os = "macos"))]
pub const NOTMUCH_ERROR_DETAILS: &str = r#"If you have installed the library via homebrew, try setting the `DYLD_LIBRARY_PATH` environment variable to its `lib` directory. Otherwise, set it to the location of libnotmuch.5.dylib. Example:
DYLD_LIBRARY_PATH="$(brew --prefix)/lib" meli
@ -143,10 +143,7 @@ export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$(brew --prefix)/lib"
You can also set any location by specifying the library file path with the configuration flag `library_file_path`."#;
#[cfg(all(
feature = "notmuch_backend",
not(any(target_os = "unix", target_os = "macos"))
))]
#[cfg(all(feature = "notmuch", not(any(target_os = "unix", target_os = "macos"))))]
pub const NOTMUCH_ERROR_DETAILS: &str = r#"If notmuch is installed but the library isn't found, consult your system's documentation on how to make dynamic libraries discoverable."#;
impl Backends {
@ -191,7 +188,7 @@ impl Backends {
},
);
}
#[cfg(feature = "notmuch_backend")]
#[cfg(feature = "notmuch")]
{
b.register(
"notmuch".to_string(),
@ -218,7 +215,7 @@ impl Backends {
if !self.map.contains_key(key) {
if key == "notmuch" {
eprint!("{}", NOTMUCH_ERROR_MSG);
#[cfg(feature = "notmuch_backend")]
#[cfg(feature = "notmuch")]
{
eprint!("{}", NOTMUCH_ERROR_DETAILS);
}
@ -248,7 +245,7 @@ impl Backends {
""
},
key,
if cfg!(feature = "notmuch_backend") && key == "notmuch" {
if cfg!(feature = "notmuch") && key == "notmuch" {
NOTMUCH_ERROR_DETAILS
} else {
""