mirror of
https://github.com/soywod/himalaya.git
synced 2024-09-29 04:31:11 +00:00
Compare commits
1 commit
ec3f915922
...
b7a60e2011
Author | SHA1 | Date | |
---|---|---|---|
b7a60e2011 |
24
Cargo.lock
generated
24
Cargo.lock
generated
|
@ -1399,7 +1399,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "email-lib"
|
name = "email-lib"
|
||||||
version = "0.24.1"
|
version = "0.24.1"
|
||||||
source = "git+https://git.sr.ht/~soywod/pimalaya?branch=thread#bbb579312d7f10dd3359cc5068b6eb7d5d7fee50"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"advisory-lock",
|
"advisory-lock",
|
||||||
"async-ctrlc",
|
"async-ctrlc",
|
||||||
|
@ -2188,7 +2187,7 @@ dependencies = [
|
||||||
"httpdate",
|
"httpdate",
|
||||||
"itoa",
|
"itoa",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"socket2 0.4.10",
|
"socket2 0.5.6",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
"tracing",
|
"tracing",
|
||||||
|
@ -2222,7 +2221,7 @@ dependencies = [
|
||||||
"iana-time-zone-haiku",
|
"iana-time-zone-haiku",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
"windows-core",
|
"windows-core 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
@ -2272,7 +2271,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "imap-client"
|
name = "imap-client"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/soywod/imap-flow.git?branch=session#7d60dd27829b82602e7c7f794633aef432f4c191"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"imap-flow",
|
"imap-flow",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
|
@ -2287,7 +2285,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "imap-codec"
|
name = "imap-codec"
|
||||||
version = "2.0.0"
|
version = "2.0.0"
|
||||||
source = "git+https://github.com/duesee/imap-codec.git#638924e92d9a8ea82208397d8e739110296daf01"
|
source = "git+https://github.com/duesee/imap-codec.git#d6b265fd01123334db2d48100537eb140932589c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"abnf-core",
|
"abnf-core",
|
||||||
"base64 0.21.7",
|
"base64 0.21.7",
|
||||||
|
@ -2302,7 +2300,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "imap-flow"
|
name = "imap-flow"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/soywod/imap-flow.git?branch=session#7d60dd27829b82602e7c7f794633aef432f4c191"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bounded-static",
|
"bounded-static",
|
||||||
"bytes",
|
"bytes",
|
||||||
|
@ -2318,7 +2315,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "imap-types"
|
name = "imap-types"
|
||||||
version = "2.0.0"
|
version = "2.0.0"
|
||||||
source = "git+https://github.com/duesee/imap-codec.git#638924e92d9a8ea82208397d8e739110296daf01"
|
source = "git+https://github.com/duesee/imap-codec.git#d6b265fd01123334db2d48100537eb140932589c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.21.7",
|
"base64 0.21.7",
|
||||||
"bounded-static",
|
"bounded-static",
|
||||||
|
@ -4582,7 +4579,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tag-generator"
|
name = "tag-generator"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/soywod/imap-flow.git?branch=session#7d60dd27829b82602e7c7f794633aef432f4c191"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"imap-types",
|
"imap-types",
|
||||||
"rand",
|
"rand",
|
||||||
|
@ -4597,7 +4593,6 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tasks"
|
name = "tasks"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/soywod/imap-flow.git?branch=session#7d60dd27829b82602e7c7f794633aef432f4c191"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"imap-flow",
|
"imap-flow",
|
||||||
"imap-types",
|
"imap-types",
|
||||||
|
@ -5240,7 +5235,7 @@ version = "0.51.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
|
checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-core",
|
"windows-core 0.51.1",
|
||||||
"windows-targets 0.48.5",
|
"windows-targets 0.48.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -5253,6 +5248,15 @@ dependencies = [
|
||||||
"windows-targets 0.48.5",
|
"windows-targets 0.48.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-core"
|
||||||
|
version = "0.52.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
|
||||||
|
dependencies = [
|
||||||
|
"windows-targets 0.52.5",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-sys"
|
name = "windows-sys"
|
||||||
version = "0.48.0"
|
version = "0.48.0"
|
||||||
|
|
|
@ -87,8 +87,11 @@ uuid = { version = "0.8", features = ["v4"] }
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
# WIP: transition from `imap` to `imap-codec`
|
# WIP: transition from `imap` to `imap-codec`
|
||||||
email-lib = { git = "https://git.sr.ht/~soywod/pimalaya", branch = "thread" }
|
email-lib = { path = "/home/soywod/sourcehut/pimalaya/email" }
|
||||||
imap-client = { git = "https://github.com/soywod/imap-flow.git", branch = "session" }
|
imap-client = { path = "/home/soywod/code/imap-flow/client" }
|
||||||
tasks = { git = "https://github.com/soywod/imap-flow.git", branch = "session" }
|
tasks = { path = "/home/soywod/code/imap-flow/tasks" }
|
||||||
|
# email-lib = { git = "https://git.sr.ht/~soywod/pimalaya" }
|
||||||
|
# imap-client = { git = "https://github.com/soywod/imap-flow.git", branch = "session" }
|
||||||
|
# tasks = { git = "https://github.com/soywod/imap-flow.git", branch = "session" }
|
||||||
imap-codec = { git = "https://github.com/duesee/imap-codec.git" }
|
imap-codec = { git = "https://github.com/duesee/imap-codec.git" }
|
||||||
imap-types = { git = "https://github.com/duesee/imap-codec.git" }
|
imap-types = { git = "https://github.com/duesee/imap-codec.git" }
|
||||||
|
|
|
@ -729,7 +729,6 @@ impl Backend {
|
||||||
) -> Result<ThreadedEnvelopes> {
|
) -> 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 id = id_mapper.get_id(id)?;
|
|
||||||
let envelopes = self
|
let envelopes = self
|
||||||
.backend
|
.backend
|
||||||
.thread_envelope(folder, SingleId::from(id), opts)
|
.thread_envelope(folder, SingleId::from(id), opts)
|
||||||
|
|
|
@ -267,12 +267,7 @@ impl ThreadedEnvelopes {
|
||||||
let prev_edges = envelopes
|
let prev_edges = envelopes
|
||||||
.graph()
|
.graph()
|
||||||
.all_edges()
|
.all_edges()
|
||||||
.map(|(a, b, w)| {
|
.map(|(a, b, w)| (a.id.to_string(), b.id.to_string(), *w));
|
||||||
let a = id_mapper.get_or_create_alias(&a.id)?;
|
|
||||||
let b = id_mapper.get_or_create_alias(&b.id)?;
|
|
||||||
Ok((a, b, *w))
|
|
||||||
})
|
|
||||||
.collect::<Result<Vec<_>>>()?;
|
|
||||||
|
|
||||||
let envelopes = envelopes
|
let envelopes = envelopes
|
||||||
.map()
|
.map()
|
||||||
|
@ -282,7 +277,6 @@ impl ThreadedEnvelopes {
|
||||||
let envelope = email::envelope::Envelope {
|
let envelope = email::envelope::Envelope {
|
||||||
id: id.clone(),
|
id: id.clone(),
|
||||||
message_id: envelope.message_id.clone(),
|
message_id: envelope.message_id.clone(),
|
||||||
in_reply_to: envelope.in_reply_to.clone(),
|
|
||||||
flags: envelope.flags.clone(),
|
flags: envelope.flags.clone(),
|
||||||
subject: envelope.subject.clone(),
|
subject: envelope.subject.clone(),
|
||||||
from: envelope.from.clone(),
|
from: envelope.from.clone(),
|
||||||
|
|
Loading…
Reference in a new issue