From 7629a66c9c79708861b97b0fc14b7d7bc5808e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Mon, 27 Nov 2023 17:15:34 +0100 Subject: [PATCH] use email-lib git instead of path --- Cargo.lock | 48 +++++++++++++++++++++++------------------- Cargo.toml | 8 +++---- src/cache/id_mapper.rs | 1 + 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3bfaa3..d220ddf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -984,6 +984,7 @@ dependencies = [ [[package]] name = "email-lib" version = "0.15.3" +source = "git+https://git.sr.ht/~soywod/pimalaya#012d31179908063affe3eec77365e5ac86c436fe" dependencies = [ "advisory-lock", "anyhow", @@ -2069,15 +2070,15 @@ dependencies = [ "keyring-lib", "log", "md5", - "mml-lib 1.0.1", - "oauth-lib 0.1.0", + "mml-lib 1.0.1 (git+https://git.sr.ht/~soywod/pimalaya)", + "oauth-lib 0.1.0 (git+https://git.sr.ht/~soywod/pimalaya)", "once_cell", "process-lib", "rusqlite", "secret-lib", "serde", "serde_json", - "shellexpand-utils 0.1.0", + "shellexpand-utils 0.1.0 (git+https://git.sr.ht/~soywod/pimalaya)", "tempfile", "termcolor", "terminal_size", @@ -2684,21 +2685,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mml-lib" -version = "1.0.1" -dependencies = [ - "async-recursion", - "chumsky", - "log", - "mail-builder", - "mail-parser", - "nanohtml2text", - "shellexpand-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", - "tree_magic_mini", -] - [[package]] name = "mml-lib" version = "1.0.1" @@ -2721,6 +2707,22 @@ dependencies = [ "tree_magic_mini", ] +[[package]] +name = "mml-lib" +version = "1.0.1" +source = "git+https://git.sr.ht/~soywod/pimalaya#012d31179908063affe3eec77365e5ac86c436fe" +dependencies = [ + "async-recursion", + "chumsky", + "log", + "mail-builder", + "mail-parser", + "nanohtml2text", + "shellexpand-utils 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", + "tree_magic_mini", +] + [[package]] name = "nanohtml2text" version = "0.1.4" @@ -2846,6 +2848,8 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "oauth-lib" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1484d9864dbf6b55b3785380631a253fa0ff7f8e1bbb078bfd7effd11283d61" dependencies = [ "log", "oauth2", @@ -2858,8 +2862,7 @@ dependencies = [ [[package]] name = "oauth-lib" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1484d9864dbf6b55b3785380631a253fa0ff7f8e1bbb078bfd7effd11283d61" +source = "git+https://git.sr.ht/~soywod/pimalaya#012d31179908063affe3eec77365e5ac86c436fe" dependencies = [ "log", "oauth2", @@ -3856,6 +3859,8 @@ dependencies = [ [[package]] name = "shellexpand-utils" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b44114d15a72740d3049e739929d0f4af335ba2eb855ea0f1fa2bfb4d7066215" dependencies = [ "log", "shellexpand", @@ -3865,8 +3870,7 @@ dependencies = [ [[package]] name = "shellexpand-utils" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b44114d15a72740d3049e739929d0f4af335ba2eb855ea0f1fa2bfb4d7066215" +source = "git+https://git.sr.ht/~soywod/pimalaya#012d31179908063affe3eec77365e5ac86c436fe" dependencies = [ "log", "shellexpand", diff --git a/Cargo.toml b/Cargo.toml index e8f25e9..2686546 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -93,21 +93,21 @@ version = "1.16.0" [dependencies.email-lib] # version = "=0.15.3" default-features = false -path = "/home/soywod/sourcehut/pimalaya/email" +git = "https://git.sr.ht/~soywod/pimalaya" [dependencies.keyring-lib] version = "=0.1.0" [dependencies.oauth-lib] # version = "=0.1.0" -path = "/home/soywod/sourcehut/pimalaya/oauth" +git = "https://git.sr.ht/~soywod/pimalaya" [dependencies.process-lib] version = "=0.1.0" [dependencies.mml-lib] # version = "=1.0.1" -path = "/home/soywod/sourcehut/pimalaya/mml" +git = "https://git.sr.ht/~soywod/pimalaya" [dependencies.secret-lib] version = "=0.1.0" @@ -121,7 +121,7 @@ version = "1.0" [dependencies.shellexpand-utils] # version = "=0.1.0" -path = "/home/soywod/sourcehut/pimalaya/shellexpand-utils" +git = "https://git.sr.ht/~soywod/pimalaya" [dependencies.termcolor] version = "1.1" diff --git a/src/cache/id_mapper.rs b/src/cache/id_mapper.rs index a022640..5193e46 100644 --- a/src/cache/id_mapper.rs +++ b/src/cache/id_mapper.rs @@ -36,6 +36,7 @@ impl IdMapper { db_path } + // FIXME pub fn new(backend: &Backend, account_config: &AccountConfig, folder: &str) -> Result { Ok(IdMapper::Dummy)