mirror of
https://github.com/chatmail/core.git
synced 2026-05-08 17:36:29 +03:00
Merge branch 'master' into flub/ongoing-guard
This commit is contained in:
Floris Bruynooghe
206
.github/workflows/ci.yml
vendored
206
.github/workflows/ci.yml
vendored
@@ -16,11 +16,11 @@ env:
|
|||||||
RUSTFLAGS: -Dwarnings
|
RUSTFLAGS: -Dwarnings
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint_rust:
|
||||||
name: Rustfmt and Clippy
|
name: Lint Rust
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
RUSTUP_TOOLCHAIN: 1.68.0
|
RUSTUP_TOOLCHAIN: 1.68.2
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Install rustfmt and clippy
|
- name: Install rustfmt and clippy
|
||||||
@@ -31,6 +31,8 @@ jobs:
|
|||||||
run: cargo fmt --all -- --check
|
run: cargo fmt --all -- --check
|
||||||
- name: Run clippy
|
- name: Run clippy
|
||||||
run: scripts/clippy.sh
|
run: scripts/clippy.sh
|
||||||
|
- name: Check
|
||||||
|
run: cargo check --workspace --all-targets --all-features
|
||||||
|
|
||||||
cargo_deny:
|
cargo_deny:
|
||||||
name: cargo deny
|
name: cargo deny
|
||||||
@@ -64,34 +66,28 @@ jobs:
|
|||||||
- name: Rustdoc
|
- name: Rustdoc
|
||||||
run: cargo doc --document-private-items --no-deps
|
run: cargo doc --document-private-items --no-deps
|
||||||
|
|
||||||
build_and_test:
|
rust_tests:
|
||||||
name: Build and test
|
name: Rust tests
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
# Currently used Rust version.
|
|
||||||
- os: ubuntu-latest
|
- os: ubuntu-latest
|
||||||
rust: 1.68.0
|
rust: 1.68.2
|
||||||
python: 3.9
|
|
||||||
- os: windows-latest
|
- os: windows-latest
|
||||||
rust: 1.68.0
|
rust: 1.68.2
|
||||||
python: false # Python bindings compilation on Windows is not supported.
|
|
||||||
- os: macos-latest
|
- os: macos-latest
|
||||||
rust: 1.68.0
|
rust: 1.68.2
|
||||||
python: 3.9
|
|
||||||
|
|
||||||
# Minimum Supported Rust Version = 1.64.0
|
# Minimum Supported Rust Version = 1.65.0
|
||||||
#
|
#
|
||||||
# Minimum Supported Python Version = 3.7
|
# Minimum Supported Python Version = 3.7
|
||||||
# This is the minimum version for which manylinux Python wheels are
|
# This is the minimum version for which manylinux Python wheels are
|
||||||
# built.
|
# built.
|
||||||
- os: ubuntu-latest
|
- os: ubuntu-latest
|
||||||
rust: 1.64.0
|
rust: 1.65.0
|
||||||
python: 3.7
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@master
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Install Rust ${{ matrix.rust }}
|
- name: Install Rust ${{ matrix.rust }}
|
||||||
run: rustup toolchain install --profile minimal ${{ matrix.rust }}
|
run: rustup toolchain install --profile minimal ${{ matrix.rust }}
|
||||||
@@ -100,64 +96,176 @@ jobs:
|
|||||||
- name: Cache rust cargo artifacts
|
- name: Cache rust cargo artifacts
|
||||||
uses: swatinem/rust-cache@v2
|
uses: swatinem/rust-cache@v2
|
||||||
|
|
||||||
- name: Check
|
|
||||||
run: cargo check --workspace --bins --examples --tests --benches
|
|
||||||
|
|
||||||
- name: Tests
|
- name: Tests
|
||||||
run: cargo test --workspace
|
run: cargo test --workspace
|
||||||
|
|
||||||
- name: Test cargo vendor
|
- name: Test cargo vendor
|
||||||
run: cargo vendor
|
run: cargo vendor
|
||||||
|
|
||||||
|
c_library:
|
||||||
|
name: Build C library
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-latest, macos-latest]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Cache rust cargo artifacts
|
||||||
|
uses: swatinem/rust-cache@v2
|
||||||
|
|
||||||
|
- name: Build C library
|
||||||
|
run: cargo build -p deltachat_ffi --features jsonrpc
|
||||||
|
|
||||||
|
- name: Upload C library
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: ${{ matrix.os }}-${{matrix.rust}}-libdeltachat.a
|
||||||
|
path: target/debug/libdeltachat.a
|
||||||
|
retention-days: 1
|
||||||
|
|
||||||
|
rpc_server:
|
||||||
|
name: Build deltachat-rpc-server
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ubuntu-latest, macos-latest]
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Cache rust cargo artifacts
|
||||||
|
uses: swatinem/rust-cache@v2
|
||||||
|
|
||||||
|
- name: Build deltachat-rpc-server
|
||||||
|
run: cargo build -p deltachat-rpc-server
|
||||||
|
|
||||||
|
- name: Upload deltachat-rpc-server
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: ${{ matrix.os }}-${{matrix.rust}}-deltachat-rpc-server
|
||||||
|
path: target/debug/deltachat-rpc-server
|
||||||
|
retention-days: 1
|
||||||
|
|
||||||
|
python_lint:
|
||||||
|
name: Python lint
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout sources
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Install tox
|
||||||
|
run: pip install tox
|
||||||
|
|
||||||
|
- name: Lint Python bindings
|
||||||
|
working-directory: python
|
||||||
|
run: tox -e lint
|
||||||
|
|
||||||
|
- name: Lint deltachat-rpc-client
|
||||||
|
working-directory: deltachat-rpc-client
|
||||||
|
run: tox -e lint
|
||||||
|
|
||||||
|
python_tests:
|
||||||
|
name: Python tests
|
||||||
|
needs: ["c_library", "python_lint"]
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
# Currently used Rust version.
|
||||||
|
- os: ubuntu-latest
|
||||||
|
python: 3.11
|
||||||
|
- os: macos-latest
|
||||||
|
python: 3.11
|
||||||
|
|
||||||
|
# PyPy tests
|
||||||
|
- os: ubuntu-latest
|
||||||
|
python: pypy3.9
|
||||||
|
- os: macos-latest
|
||||||
|
python: pypy3.9
|
||||||
|
|
||||||
|
# Minimum Supported Python Version = 3.7
|
||||||
|
# This is the minimum version for which manylinux Python wheels are
|
||||||
|
# built. Test it with minimum supported Rust version.
|
||||||
|
- os: ubuntu-latest
|
||||||
|
python: 3.7
|
||||||
|
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Download libdeltachat.a
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: ${{ matrix.os }}-${{matrix.rust}}-libdeltachat.a
|
||||||
|
path: target/debug
|
||||||
|
|
||||||
- name: Install python
|
- name: Install python
|
||||||
if: ${{ matrix.python }}
|
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python }}
|
python-version: ${{ matrix.python }}
|
||||||
|
|
||||||
- name: Install tox
|
- name: Install tox
|
||||||
if: ${{ matrix.python }}
|
|
||||||
run: pip install tox
|
run: pip install tox
|
||||||
|
|
||||||
- name: Build C library
|
|
||||||
if: ${{ matrix.python }}
|
|
||||||
run: cargo build -p deltachat_ffi --features jsonrpc
|
|
||||||
|
|
||||||
- name: Run python tests
|
- name: Run python tests
|
||||||
if: ${{ matrix.python }}
|
|
||||||
env:
|
env:
|
||||||
DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
|
DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
|
||||||
DCC_RS_TARGET: debug
|
DCC_RS_TARGET: debug
|
||||||
DCC_RS_DEV: ${{ github.workspace }}
|
DCC_RS_DEV: ${{ github.workspace }}
|
||||||
working-directory: python
|
working-directory: python
|
||||||
run: tox -e lint,mypy,doc,py3
|
run: tox -e mypy,doc,py
|
||||||
|
|
||||||
- name: Build deltachat-rpc-server
|
aysnc_python_tests:
|
||||||
if: ${{ matrix.python }}
|
name: Async Python tests
|
||||||
run: cargo build -p deltachat-rpc-server
|
needs: ["python_lint", "rpc_server"]
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
# Currently used Rust version.
|
||||||
|
- os: ubuntu-latest
|
||||||
|
python: 3.11
|
||||||
|
- os: macos-latest
|
||||||
|
python: 3.11
|
||||||
|
|
||||||
|
# PyPy tests
|
||||||
|
- os: ubuntu-latest
|
||||||
|
python: pypy3.9
|
||||||
|
- os: macos-latest
|
||||||
|
python: pypy3.9
|
||||||
|
|
||||||
|
# Minimum Supported Python Version = 3.7
|
||||||
|
# This is the minimum version for which manylinux Python wheels are
|
||||||
|
# built. Test it with minimum supported Rust version.
|
||||||
|
- os: ubuntu-latest
|
||||||
|
python: 3.7
|
||||||
|
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Install python
|
||||||
|
uses: actions/setup-python@v4
|
||||||
|
with:
|
||||||
|
python-version: ${{ matrix.python }}
|
||||||
|
|
||||||
|
- name: Install tox
|
||||||
|
run: pip install tox
|
||||||
|
|
||||||
|
- name: Download deltachat-rpc-server
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: ${{ matrix.os }}-${{matrix.rust}}-deltachat-rpc-server
|
||||||
|
path: target/debug
|
||||||
|
|
||||||
|
- name: Make deltachat-rpc-server executable
|
||||||
|
run: chmod +x target/debug/deltachat-rpc-server
|
||||||
|
|
||||||
- name: Add deltachat-rpc-server to path
|
- name: Add deltachat-rpc-server to path
|
||||||
if: ${{ matrix.python }}
|
|
||||||
run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH
|
run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH
|
||||||
|
|
||||||
- name: Run deltachat-rpc-client tests
|
- name: Run deltachat-rpc-client tests
|
||||||
if: ${{ matrix.python }}
|
|
||||||
env:
|
env:
|
||||||
DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
|
DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
|
||||||
working-directory: deltachat-rpc-client
|
working-directory: deltachat-rpc-client
|
||||||
run: tox -e py3,lint
|
run: tox -e py
|
||||||
|
|
||||||
- name: Install pypy
|
|
||||||
if: ${{ matrix.python }}
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: "pypy${{ matrix.python }}"
|
|
||||||
|
|
||||||
- name: Run pypy tests
|
|
||||||
if: ${{ matrix.python }}
|
|
||||||
env:
|
|
||||||
DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
|
|
||||||
DCC_RS_TARGET: debug
|
|
||||||
DCC_RS_DEV: ${{ github.workspace }}
|
|
||||||
working-directory: python
|
|
||||||
run: tox -e pypy3
|
|
||||||
|
|||||||
37
CHANGELOG.md
37
CHANGELOG.md
@@ -3,9 +3,40 @@
|
|||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
### Changes
|
### Changes
|
||||||
|
- Increase MSRV to 1.65.0. #4236
|
||||||
|
- Remove upper limit on the attachment size. #4253
|
||||||
|
- Update rPGP to 0.10.1. #4236
|
||||||
|
- Compress `mime_headers` column with HTML emails stored in database
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- Fix python bindings README documentation on installing the bindings from source.
|
||||||
|
- Show a warning if quota list is empty #4261
|
||||||
|
|
||||||
|
## [1.112.5] - 2023-04-02
|
||||||
|
|
||||||
### Fixes
|
### Fixes
|
||||||
|
|
||||||
|
- Run SQL database migrations after receiving a backup from the network. #4287
|
||||||
|
|
||||||
|
## [1.112.4] - 2023-03-31
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- Fix call to `auditwheel` in `scripts/run_all.sh`.
|
||||||
|
|
||||||
|
## [1.112.3] - 2023-03-30
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- `transfer::get_backup` now frees ongoing process when cancelled. #4249
|
||||||
|
|
||||||
|
## [1.112.2] - 2023-03-30
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
- Update iroh, remove `default-net` from `[patch.crates-io]` section.
|
||||||
|
- transfer backup: Connect to mutliple provider addresses concurrently. This should speed up connection time significantly on the getter side. #4240
|
||||||
|
- Make sure BackupProvider is cancelled on drop (or dc_backup_provider_unref). The BackupProvider will now alaway finish with an IMEX event of 1000 or 0, previoulsy it would sometimes finishe with 1000 (success) when it really was 0 (failure). #4242
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- Do not return media from trashed messages in the "All media" view. #4247
|
||||||
|
|
||||||
## [1.112.1] - 2023-03-27
|
## [1.112.1] - 2023-03-27
|
||||||
|
|
||||||
@@ -2337,7 +2368,11 @@ For a full list of changes, please see our closed Pull Requests:
|
|||||||
|
|
||||||
https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
|
https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
|
||||||
|
|
||||||
[unreleased]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.1...HEAD
|
[unreleased]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.5...HEAD
|
||||||
[1.111.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.110.0...v1.111.0
|
[1.111.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.110.0...v1.111.0
|
||||||
[1.112.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.111.0...v1.112.0
|
[1.112.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.111.0...v1.112.0
|
||||||
[1.112.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.0...v1.112.1
|
[1.112.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.0...v1.112.1
|
||||||
|
[1.112.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.1...v1.112.2
|
||||||
|
[1.112.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.2...v1.112.3
|
||||||
|
[1.112.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.3...v1.112.4
|
||||||
|
[1.112.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.112.4...v1.112.5
|
||||||
|
|||||||
1179
Cargo.lock
generated
1179
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
29
Cargo.toml
29
Cargo.toml
@@ -1,9 +1,9 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "deltachat"
|
name = "deltachat"
|
||||||
version = "1.112.1"
|
version = "1.112.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MPL-2.0"
|
license = "MPL-2.0"
|
||||||
rust-version = "1.64"
|
rust-version = "1.65"
|
||||||
|
|
||||||
[profile.dev]
|
[profile.dev]
|
||||||
debug = 0
|
debug = 0
|
||||||
@@ -25,7 +25,6 @@ panic = 'abort'
|
|||||||
opt-level = "z"
|
opt-level = "z"
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
default-net = { git = "https://github.com/dignifiedquire/default-net.git", rev="7a257095bac009c4be0b93c2979801624fdd337b" }
|
|
||||||
quinn-udp = { git = "https://github.com/quinn-rs/quinn", branch="main" }
|
quinn-udp = { git = "https://github.com/quinn-rs/quinn", branch="main" }
|
||||||
quinn-proto = { git = "https://github.com/quinn-rs/quinn", branch="main" }
|
quinn-proto = { git = "https://github.com/quinn-rs/quinn", branch="main" }
|
||||||
|
|
||||||
@@ -36,13 +35,13 @@ ratelimit = { path = "./deltachat-ratelimit" }
|
|||||||
|
|
||||||
anyhow = "1"
|
anyhow = "1"
|
||||||
async-channel = "1.8.0"
|
async-channel = "1.8.0"
|
||||||
async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
|
async-imap = { version = "0.7.0", default-features = false, features = ["runtime-tokio"] }
|
||||||
async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
|
async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] }
|
||||||
async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
|
async-smtp = { version = "0.9", default-features = false, features = ["runtime-tokio"] }
|
||||||
async_zip = { version = "0.0.11", default-features = false, features = ["deflate", "fs"] }
|
async_zip = { version = "0.0.12", default-features = false, features = ["deflate", "fs"] }
|
||||||
backtrace = "0.3"
|
backtrace = "0.3"
|
||||||
base64 = "0.21"
|
base64 = "0.21"
|
||||||
bitflags = "1.3"
|
brotli = "3.3"
|
||||||
chrono = { version = "0.4", default-features=false, features = ["clock", "std"] }
|
chrono = { version = "0.4", default-features=false, features = ["clock", "std"] }
|
||||||
email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
|
email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
|
||||||
encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
|
encoded-words = { git = "https://github.com/async-email/encoded-words", branch = "master" }
|
||||||
@@ -52,9 +51,8 @@ futures = "0.3"
|
|||||||
futures-lite = "1.12.0"
|
futures-lite = "1.12.0"
|
||||||
hex = "0.4.0"
|
hex = "0.4.0"
|
||||||
humansize = "2"
|
humansize = "2"
|
||||||
image = { version = "0.24.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
|
image = { version = "0.24.6", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
|
||||||
# iroh = { version = "0.3.0", default-features = false }
|
iroh = { version = "0.4.1", default-features = false }
|
||||||
iroh = { git = 'https://github.com/n0-computer/iroh', branch = "main" }
|
|
||||||
kamadak-exif = "0.5"
|
kamadak-exif = "0.5"
|
||||||
lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
|
lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
@@ -65,14 +63,14 @@ num-traits = "0.2"
|
|||||||
once_cell = "1.17.0"
|
once_cell = "1.17.0"
|
||||||
percent-encoding = "2.2"
|
percent-encoding = "2.2"
|
||||||
parking_lot = "0.12"
|
parking_lot = "0.12"
|
||||||
pgp = { version = "0.9", default-features = false }
|
pgp = { version = "0.10", default-features = false }
|
||||||
pretty_env_logger = { version = "0.4", optional = true }
|
pretty_env_logger = { version = "0.4", optional = true }
|
||||||
qrcodegen = "1.7.0"
|
qrcodegen = "1.7.0"
|
||||||
quick-xml = "0.27"
|
quick-xml = "0.28"
|
||||||
rand = "0.8"
|
rand = "0.8"
|
||||||
regex = "1.7"
|
regex = "1.7"
|
||||||
reqwest = { version = "0.11.14", features = ["json"] }
|
reqwest = { version = "0.11.16", features = ["json"] }
|
||||||
rusqlite = { version = "0.28", features = ["sqlcipher"] }
|
rusqlite = { version = "0.29", features = ["sqlcipher"] }
|
||||||
rust-hsluv = "0.1"
|
rust-hsluv = "0.1"
|
||||||
sanitize-filename = "0.4"
|
sanitize-filename = "0.4"
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
@@ -85,10 +83,11 @@ strum_macros = "0.24"
|
|||||||
tagger = "4.3.4"
|
tagger = "4.3.4"
|
||||||
textwrap = "0.16.0"
|
textwrap = "0.16.0"
|
||||||
thiserror = "1"
|
thiserror = "1"
|
||||||
|
tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
|
||||||
tokio-io-timeout = "1.2.0"
|
tokio-io-timeout = "1.2.0"
|
||||||
tokio-stream = { version = "0.1.11", features = ["fs"] }
|
tokio-stream = { version = "0.1.11", features = ["fs"] }
|
||||||
tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
|
tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
|
||||||
tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
|
tokio-util = "0.7.7"
|
||||||
toml = "0.7"
|
toml = "0.7"
|
||||||
trust-dns-resolver = "0.22"
|
trust-dns-resolver = "0.22"
|
||||||
url = "2"
|
url = "2"
|
||||||
@@ -102,7 +101,7 @@ log = "0.4"
|
|||||||
pretty_env_logger = "0.4"
|
pretty_env_logger = "0.4"
|
||||||
proptest = { version = "1", default-features = false, features = ["std"] }
|
proptest = { version = "1", default-features = false, features = ["std"] }
|
||||||
tempfile = "3"
|
tempfile = "3"
|
||||||
testdir = "0.7.2"
|
testdir = "0.7.3"
|
||||||
tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
|
tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "deltachat_ffi"
|
name = "deltachat_ffi"
|
||||||
version = "1.112.1"
|
version = "1.112.5"
|
||||||
description = "Deltachat FFI"
|
description = "Deltachat FFI"
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
|||||||
@@ -2775,6 +2775,12 @@ void dc_backup_provider_wait (dc_backup_provider_t* backup_provider);
|
|||||||
/**
|
/**
|
||||||
* Frees a dc_backup_provider_t object.
|
* Frees a dc_backup_provider_t object.
|
||||||
*
|
*
|
||||||
|
* If the provider has not yet finished, as indicated by
|
||||||
|
* dc_backup_provider_wait() or the #DC_EVENT_IMEX_PROGRESS event with value
|
||||||
|
* of 0 (failed) or 1000 (succeeded), this will also abort any in-progress
|
||||||
|
* transfer. If this aborts the provider a #DC_EVENT_IMEX_PROGRESS event with
|
||||||
|
* value 0 (failed) will be emitted.
|
||||||
|
*
|
||||||
* @memberof dc_backup_provider_t
|
* @memberof dc_backup_provider_t
|
||||||
* @param backup_provider The backup provider object as created by
|
* @param backup_provider The backup provider object as created by
|
||||||
* dc_backup_provider_new().
|
* dc_backup_provider_new().
|
||||||
|
|||||||
@@ -160,7 +160,8 @@ pub unsafe extern "C" fn dc_context_open(
|
|||||||
let ctx = &*context;
|
let ctx = &*context;
|
||||||
let passphrase = to_string_lossy(passphrase);
|
let passphrase = to_string_lossy(passphrase);
|
||||||
block_on(ctx.open(passphrase))
|
block_on(ctx.open(passphrase))
|
||||||
.log_err(ctx, "dc_context_open() failed")
|
.context("dc_context_open() failed")
|
||||||
|
.log_err(ctx)
|
||||||
.map(|b| b as libc::c_int)
|
.map(|b| b as libc::c_int)
|
||||||
.unwrap_or(0)
|
.unwrap_or(0)
|
||||||
}
|
}
|
||||||
@@ -216,16 +217,18 @@ pub unsafe extern "C" fn dc_set_config(
|
|||||||
if key.starts_with("ui.") {
|
if key.starts_with("ui.") {
|
||||||
ctx.set_ui_config(&key, value.as_deref())
|
ctx.set_ui_config(&key, value.as_deref())
|
||||||
.await
|
.await
|
||||||
.with_context(|| format!("Can't set {key} to {value:?}"))
|
.with_context(|| format!("dc_set_config failed: Can't set {key} to {value:?}"))
|
||||||
.log_err(ctx, "dc_set_config() failed")
|
.log_err(ctx)
|
||||||
.is_ok() as libc::c_int
|
.is_ok() as libc::c_int
|
||||||
} else {
|
} else {
|
||||||
match config::Config::from_str(&key) {
|
match config::Config::from_str(&key) {
|
||||||
Ok(key) => ctx
|
Ok(key) => ctx
|
||||||
.set_config(key, value.as_deref())
|
.set_config(key, value.as_deref())
|
||||||
.await
|
.await
|
||||||
.with_context(|| format!("Can't set {key} to {value:?}"))
|
.with_context(|| {
|
||||||
.log_err(ctx, "dc_set_config() failed")
|
format!("dc_set_config() failed: Can't set {key} to {value:?}")
|
||||||
|
})
|
||||||
|
.log_err(ctx)
|
||||||
.is_ok() as libc::c_int,
|
.is_ok() as libc::c_int,
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
warn!(ctx, "dc_set_config(): invalid key");
|
warn!(ctx, "dc_set_config(): invalid key");
|
||||||
@@ -253,7 +256,8 @@ pub unsafe extern "C" fn dc_get_config(
|
|||||||
if key.starts_with("ui.") {
|
if key.starts_with("ui.") {
|
||||||
ctx.get_ui_config(&key)
|
ctx.get_ui_config(&key)
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Can't get ui-config")
|
.context("Can't get ui-config")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.strdup()
|
.strdup()
|
||||||
@@ -262,7 +266,8 @@ pub unsafe extern "C" fn dc_get_config(
|
|||||||
Ok(key) => ctx
|
Ok(key) => ctx
|
||||||
.get_config(key)
|
.get_config(key)
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Can't get config")
|
.context("Can't get config")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.strdup(),
|
.strdup(),
|
||||||
@@ -414,7 +419,8 @@ pub unsafe extern "C" fn dc_get_oauth2_url(
|
|||||||
block_on(async move {
|
block_on(async move {
|
||||||
match oauth2::get_oauth2_url(ctx, &addr, &redirect)
|
match oauth2::get_oauth2_url(ctx, &addr, &redirect)
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "dc_get_oauth2_url failed")
|
.context("dc_get_oauth2_url failed")
|
||||||
|
.log_err(ctx)
|
||||||
{
|
{
|
||||||
Ok(Some(res)) => res.strdup(),
|
Ok(Some(res)) => res.strdup(),
|
||||||
Ok(None) | Err(_) => ptr::null_mut(),
|
Ok(None) | Err(_) => ptr::null_mut(),
|
||||||
@@ -423,7 +429,12 @@ pub unsafe extern "C" fn dc_get_oauth2_url(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn spawn_configure(ctx: Context) {
|
fn spawn_configure(ctx: Context) {
|
||||||
spawn(async move { ctx.configure().await.log_err(&ctx, "Configure failed") });
|
spawn(async move {
|
||||||
|
ctx.configure()
|
||||||
|
.await
|
||||||
|
.context("Configure failed")
|
||||||
|
.log_err(&ctx)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
@@ -448,7 +459,8 @@ pub unsafe extern "C" fn dc_is_configured(context: *mut dc_context_t) -> libc::c
|
|||||||
block_on(async move {
|
block_on(async move {
|
||||||
ctx.is_configured()
|
ctx.is_configured()
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "failed to get configured state")
|
.context("failed to get configured state")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default() as libc::c_int
|
.unwrap_or_default() as libc::c_int
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -790,7 +802,8 @@ pub unsafe extern "C" fn dc_preconfigure_keypair(
|
|||||||
key::store_self_keypair(ctx, &keypair, key::KeyPairUse::Default).await?;
|
key::store_self_keypair(ctx, &keypair, key::KeyPairUse::Default).await?;
|
||||||
Ok::<_, anyhow::Error>(1)
|
Ok::<_, anyhow::Error>(1)
|
||||||
})
|
})
|
||||||
.log_err(ctx, "Failed to save keypair")
|
.context("Failed to save keypair")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or(0)
|
.unwrap_or(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -817,7 +830,8 @@ pub unsafe extern "C" fn dc_get_chatlist(
|
|||||||
block_on(async move {
|
block_on(async move {
|
||||||
match chatlist::Chatlist::try_load(ctx, flags as usize, qs.as_deref(), qi)
|
match chatlist::Chatlist::try_load(ctx, flags as usize, qs.as_deref(), qi)
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Failed to get chatlist")
|
.context("Failed to get chatlist")
|
||||||
|
.log_err(ctx)
|
||||||
{
|
{
|
||||||
Ok(list) => {
|
Ok(list) => {
|
||||||
let ffi_list = ChatlistWrapper { context, list };
|
let ffi_list = ChatlistWrapper { context, list };
|
||||||
@@ -842,7 +856,8 @@ pub unsafe extern "C" fn dc_create_chat_by_contact_id(
|
|||||||
block_on(async move {
|
block_on(async move {
|
||||||
ChatId::create_for_contact(ctx, ContactId::new(contact_id))
|
ChatId::create_for_contact(ctx, ContactId::new(contact_id))
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Failed to create chat from contact_id")
|
.context("Failed to create chat from contact_id")
|
||||||
|
.log_err(ctx)
|
||||||
.map(|id| id.to_u32())
|
.map(|id| id.to_u32())
|
||||||
.unwrap_or(0)
|
.unwrap_or(0)
|
||||||
})
|
})
|
||||||
@@ -862,7 +877,8 @@ pub unsafe extern "C" fn dc_get_chat_id_by_contact_id(
|
|||||||
block_on(async move {
|
block_on(async move {
|
||||||
ChatId::lookup_by_contact(ctx, ContactId::new(contact_id))
|
ChatId::lookup_by_contact(ctx, ContactId::new(contact_id))
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Failed to get chat for contact_id")
|
.context("Failed to get chat for contact_id")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default() // unwraps the Result
|
.unwrap_or_default() // unwraps the Result
|
||||||
.map(|id| id.to_u32())
|
.map(|id| id.to_u32())
|
||||||
.unwrap_or(0) // unwraps the Option
|
.unwrap_or(0) // unwraps the Option
|
||||||
@@ -1004,7 +1020,8 @@ pub unsafe extern "C" fn dc_get_msg_reactions(
|
|||||||
let ctx = &*context;
|
let ctx = &*context;
|
||||||
|
|
||||||
let reactions = if let Ok(reactions) = block_on(get_msg_reactions(ctx, MsgId::new(msg_id)))
|
let reactions = if let Ok(reactions) = block_on(get_msg_reactions(ctx, MsgId::new(msg_id)))
|
||||||
.log_err(ctx, "failed dc_get_msg_reactions() call")
|
.context("failed dc_get_msg_reactions() call")
|
||||||
|
.log_err(ctx)
|
||||||
{
|
{
|
||||||
reactions
|
reactions
|
||||||
} else {
|
} else {
|
||||||
@@ -1032,7 +1049,8 @@ pub unsafe extern "C" fn dc_send_webxdc_status_update(
|
|||||||
&to_string_lossy(json),
|
&to_string_lossy(json),
|
||||||
&to_string_lossy(descr),
|
&to_string_lossy(descr),
|
||||||
))
|
))
|
||||||
.log_err(ctx, "Failed to send webxdc update")
|
.context("Failed to send webxdc update")
|
||||||
|
.log_err(ctx)
|
||||||
.is_ok() as libc::c_int
|
.is_ok() as libc::c_int
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1251,7 +1269,8 @@ pub unsafe extern "C" fn dc_get_fresh_msgs(
|
|||||||
let arr = dc_array_t::from(
|
let arr = dc_array_t::from(
|
||||||
ctx.get_fresh_msgs()
|
ctx.get_fresh_msgs()
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Failed to get fresh messages")
|
.context("Failed to get fresh messages")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.iter()
|
.iter()
|
||||||
.map(|msg_id| msg_id.to_u32())
|
.map(|msg_id| msg_id.to_u32())
|
||||||
@@ -1272,7 +1291,8 @@ pub unsafe extern "C" fn dc_marknoticed_chat(context: *mut dc_context_t, chat_id
|
|||||||
block_on(async move {
|
block_on(async move {
|
||||||
chat::marknoticed_chat(ctx, ChatId::new(chat_id))
|
chat::marknoticed_chat(ctx, ChatId::new(chat_id))
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Failed marknoticed chat")
|
.context("Failed marknoticed chat")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or(())
|
.unwrap_or(())
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -1414,7 +1434,8 @@ pub unsafe extern "C" fn dc_set_chat_visibility(
|
|||||||
ChatId::new(chat_id)
|
ChatId::new(chat_id)
|
||||||
.set_visibility(ctx, visibility)
|
.set_visibility(ctx, visibility)
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Failed setting chat visibility")
|
.context("Failed setting chat visibility")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or(())
|
.unwrap_or(())
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -1431,7 +1452,9 @@ pub unsafe extern "C" fn dc_delete_chat(context: *mut dc_context_t, chat_id: u32
|
|||||||
ChatId::new(chat_id)
|
ChatId::new(chat_id)
|
||||||
.delete(ctx)
|
.delete(ctx)
|
||||||
.await
|
.await
|
||||||
.ok_or_log_msg(ctx, "Failed chat delete");
|
.context("Failed chat delete")
|
||||||
|
.log_err(ctx)
|
||||||
|
.ok();
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1447,7 +1470,9 @@ pub unsafe extern "C" fn dc_block_chat(context: *mut dc_context_t, chat_id: u32)
|
|||||||
ChatId::new(chat_id)
|
ChatId::new(chat_id)
|
||||||
.block(ctx)
|
.block(ctx)
|
||||||
.await
|
.await
|
||||||
.ok_or_log_msg(ctx, "Failed chat block");
|
.context("Failed chat block")
|
||||||
|
.log_err(ctx)
|
||||||
|
.ok();
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1463,7 +1488,9 @@ pub unsafe extern "C" fn dc_accept_chat(context: *mut dc_context_t, chat_id: u32
|
|||||||
ChatId::new(chat_id)
|
ChatId::new(chat_id)
|
||||||
.accept(ctx)
|
.accept(ctx)
|
||||||
.await
|
.await
|
||||||
.ok_or_log_msg(ctx, "Failed chat accept");
|
.context("Failed chat accept")
|
||||||
|
.log_err(ctx)
|
||||||
|
.ok();
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1561,7 +1588,8 @@ pub unsafe extern "C" fn dc_create_group_chat(
|
|||||||
block_on(async move {
|
block_on(async move {
|
||||||
chat::create_group_chat(ctx, protect, &to_string_lossy(name))
|
chat::create_group_chat(ctx, protect, &to_string_lossy(name))
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Failed to create group chat")
|
.context("Failed to create group chat")
|
||||||
|
.log_err(ctx)
|
||||||
.map(|id| id.to_u32())
|
.map(|id| id.to_u32())
|
||||||
.unwrap_or(0)
|
.unwrap_or(0)
|
||||||
})
|
})
|
||||||
@@ -1575,7 +1603,8 @@ pub unsafe extern "C" fn dc_create_broadcast_list(context: *mut dc_context_t) ->
|
|||||||
}
|
}
|
||||||
let ctx = &*context;
|
let ctx = &*context;
|
||||||
block_on(chat::create_broadcast_list(ctx))
|
block_on(chat::create_broadcast_list(ctx))
|
||||||
.log_err(ctx, "Failed to create broadcast list")
|
.context("Failed to create broadcast list")
|
||||||
|
.log_err(ctx)
|
||||||
.map(|id| id.to_u32())
|
.map(|id| id.to_u32())
|
||||||
.unwrap_or(0)
|
.unwrap_or(0)
|
||||||
}
|
}
|
||||||
@@ -1597,7 +1626,8 @@ pub unsafe extern "C" fn dc_is_contact_in_chat(
|
|||||||
ChatId::new(chat_id),
|
ChatId::new(chat_id),
|
||||||
ContactId::new(contact_id),
|
ContactId::new(contact_id),
|
||||||
))
|
))
|
||||||
.log_err(ctx, "is_contact_in_chat failed")
|
.context("is_contact_in_chat failed")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default() as libc::c_int
|
.unwrap_or_default() as libc::c_int
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1618,7 +1648,8 @@ pub unsafe extern "C" fn dc_add_contact_to_chat(
|
|||||||
ChatId::new(chat_id),
|
ChatId::new(chat_id),
|
||||||
ContactId::new(contact_id),
|
ContactId::new(contact_id),
|
||||||
))
|
))
|
||||||
.log_err(ctx, "Failed to add contact")
|
.context("Failed to add contact")
|
||||||
|
.log_err(ctx)
|
||||||
.is_ok() as libc::c_int
|
.is_ok() as libc::c_int
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1639,7 +1670,8 @@ pub unsafe extern "C" fn dc_remove_contact_from_chat(
|
|||||||
ChatId::new(chat_id),
|
ChatId::new(chat_id),
|
||||||
ContactId::new(contact_id),
|
ContactId::new(contact_id),
|
||||||
))
|
))
|
||||||
.log_err(ctx, "Failed to remove contact")
|
.context("Failed to remove contact")
|
||||||
|
.log_err(ctx)
|
||||||
.is_ok() as libc::c_int
|
.is_ok() as libc::c_int
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1758,7 +1790,8 @@ pub unsafe extern "C" fn dc_get_chat_ephemeral_timer(
|
|||||||
// ignored when ephemeral timer value is used to construct
|
// ignored when ephemeral timer value is used to construct
|
||||||
// message headers.
|
// message headers.
|
||||||
block_on(async move { ChatId::new(chat_id).get_ephemeral_timer(ctx).await })
|
block_on(async move { ChatId::new(chat_id).get_ephemeral_timer(ctx).await })
|
||||||
.log_err(ctx, "Failed to get ephemeral timer")
|
.context("Failed to get ephemeral timer")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.to_u32()
|
.to_u32()
|
||||||
}
|
}
|
||||||
@@ -1779,7 +1812,8 @@ pub unsafe extern "C" fn dc_set_chat_ephemeral_timer(
|
|||||||
ChatId::new(chat_id)
|
ChatId::new(chat_id)
|
||||||
.set_ephemeral_timer(ctx, EphemeralTimer::from_u32(timer))
|
.set_ephemeral_timer(ctx, EphemeralTimer::from_u32(timer))
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Failed to set ephemeral timer")
|
.context("Failed to set ephemeral timer")
|
||||||
|
.log_err(ctx)
|
||||||
.is_ok() as libc::c_int
|
.is_ok() as libc::c_int
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -1855,7 +1889,8 @@ pub unsafe extern "C" fn dc_delete_msgs(
|
|||||||
let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
|
let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
|
||||||
|
|
||||||
block_on(message::delete_msgs(ctx, &msg_ids))
|
block_on(message::delete_msgs(ctx, &msg_ids))
|
||||||
.log_err(ctx, "failed dc_delete_msgs() call")
|
.context("failed dc_delete_msgs() call")
|
||||||
|
.log_err(ctx)
|
||||||
.ok();
|
.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1919,7 +1954,8 @@ pub unsafe extern "C" fn dc_markseen_msgs(
|
|||||||
let ctx = &*context;
|
let ctx = &*context;
|
||||||
|
|
||||||
block_on(message::markseen_msgs(ctx, msg_ids))
|
block_on(message::markseen_msgs(ctx, msg_ids))
|
||||||
.log_err(ctx, "failed dc_markseen_msgs() call")
|
.context("failed dc_markseen_msgs() call")
|
||||||
|
.log_err(ctx)
|
||||||
.ok();
|
.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1961,7 +1997,8 @@ pub unsafe extern "C" fn dc_download_full_msg(context: *mut dc_context_t, msg_id
|
|||||||
}
|
}
|
||||||
let ctx = &*context;
|
let ctx = &*context;
|
||||||
block_on(MsgId::new(msg_id).download_full(ctx))
|
block_on(MsgId::new(msg_id).download_full(ctx))
|
||||||
.log_err(ctx, "Failed to download message fully.")
|
.context("Failed to download message fully.")
|
||||||
|
.log_err(ctx)
|
||||||
.ok();
|
.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2009,7 +2046,8 @@ pub unsafe extern "C" fn dc_create_contact(
|
|||||||
let name = to_string_lossy(name);
|
let name = to_string_lossy(name);
|
||||||
|
|
||||||
block_on(Contact::create(ctx, &name, &to_string_lossy(addr)))
|
block_on(Contact::create(ctx, &name, &to_string_lossy(addr)))
|
||||||
.log_err(ctx, "Cannot create contact")
|
.context("Cannot create contact")
|
||||||
|
.log_err(ctx)
|
||||||
.map(|id| id.to_u32())
|
.map(|id| id.to_u32())
|
||||||
.unwrap_or(0)
|
.unwrap_or(0)
|
||||||
}
|
}
|
||||||
@@ -2086,7 +2124,8 @@ pub unsafe extern "C" fn dc_get_blocked_contacts(
|
|||||||
Box::into_raw(Box::new(dc_array_t::from(
|
Box::into_raw(Box::new(dc_array_t::from(
|
||||||
Contact::get_all_blocked(ctx)
|
Contact::get_all_blocked(ctx)
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Can't get blocked contacts")
|
.context("Can't get blocked contacts")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.iter()
|
.iter()
|
||||||
.map(|id| id.to_u32())
|
.map(|id| id.to_u32())
|
||||||
@@ -2111,11 +2150,15 @@ pub unsafe extern "C" fn dc_block_contact(
|
|||||||
if block == 0 {
|
if block == 0 {
|
||||||
Contact::unblock(ctx, contact_id)
|
Contact::unblock(ctx, contact_id)
|
||||||
.await
|
.await
|
||||||
.ok_or_log_msg(ctx, "Can't unblock contact");
|
.context("Can't unblock contact")
|
||||||
|
.log_err(ctx)
|
||||||
|
.ok();
|
||||||
} else {
|
} else {
|
||||||
Contact::block(ctx, contact_id)
|
Contact::block(ctx, contact_id)
|
||||||
.await
|
.await
|
||||||
.ok_or_log_msg(ctx, "Can't block contact");
|
.context("Can't block contact")
|
||||||
|
.log_err(ctx)
|
||||||
|
.ok();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -2188,7 +2231,8 @@ fn spawn_imex(ctx: Context, what: imex::ImexMode, param1: String, passphrase: Op
|
|||||||
spawn(async move {
|
spawn(async move {
|
||||||
imex::imex(&ctx, what, param1.as_ref(), passphrase)
|
imex::imex(&ctx, what, param1.as_ref(), passphrase)
|
||||||
.await
|
.await
|
||||||
.log_err(&ctx, "IMEX failed")
|
.context("IMEX failed")
|
||||||
|
.log_err(&ctx)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2374,7 +2418,8 @@ pub unsafe extern "C" fn dc_join_securejoin(
|
|||||||
securejoin::join_securejoin(ctx, &to_string_lossy(qr))
|
securejoin::join_securejoin(ctx, &to_string_lossy(qr))
|
||||||
.await
|
.await
|
||||||
.map(|chatid| chatid.to_u32())
|
.map(|chatid| chatid.to_u32())
|
||||||
.log_err(ctx, "failed dc_join_securejoin() call")
|
.context("failed dc_join_securejoin() call")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -2396,7 +2441,8 @@ pub unsafe extern "C" fn dc_send_locations_to_chat(
|
|||||||
ChatId::new(chat_id),
|
ChatId::new(chat_id),
|
||||||
seconds as i64,
|
seconds as i64,
|
||||||
))
|
))
|
||||||
.log_err(ctx, "Failed dc_send_locations_to_chat()")
|
.context("Failed dc_send_locations_to_chat()")
|
||||||
|
.log_err(ctx)
|
||||||
.ok();
|
.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2479,7 +2525,8 @@ pub unsafe extern "C" fn dc_delete_all_locations(context: *mut dc_context_t) {
|
|||||||
block_on(async move {
|
block_on(async move {
|
||||||
location::delete_all(ctx)
|
location::delete_all(ctx)
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Failed to delete locations")
|
.context("Failed to delete locations")
|
||||||
|
.log_err(ctx)
|
||||||
.ok()
|
.ok()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -2763,7 +2810,8 @@ pub unsafe extern "C" fn dc_chatlist_get_summary(
|
|||||||
.list
|
.list
|
||||||
.get_summary(ctx, index, maybe_chat)
|
.get_summary(ctx, index, maybe_chat)
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "get_summary failed")
|
.context("get_summary failed")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
Box::into_raw(Box::new(summary.into()))
|
Box::into_raw(Box::new(summary.into()))
|
||||||
})
|
})
|
||||||
@@ -2791,7 +2839,8 @@ pub unsafe extern "C" fn dc_chatlist_get_summary2(
|
|||||||
msg_id,
|
msg_id,
|
||||||
None,
|
None,
|
||||||
))
|
))
|
||||||
.log_err(ctx, "get_summary2 failed")
|
.context("get_summary2 failed")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
Box::into_raw(Box::new(summary.into()))
|
Box::into_raw(Box::new(summary.into()))
|
||||||
}
|
}
|
||||||
@@ -2974,7 +3023,8 @@ pub unsafe extern "C" fn dc_chat_can_send(chat: *mut dc_chat_t) -> libc::c_int {
|
|||||||
let ffi_chat = &*chat;
|
let ffi_chat = &*chat;
|
||||||
let ctx = &*ffi_chat.context;
|
let ctx = &*ffi_chat.context;
|
||||||
block_on(ffi_chat.chat.can_send(ctx))
|
block_on(ffi_chat.chat.can_send(ctx))
|
||||||
.log_err(ctx, "can_send failed")
|
.context("can_send failed")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default() as libc::c_int
|
.unwrap_or_default() as libc::c_int
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3419,7 +3469,8 @@ pub unsafe extern "C" fn dc_msg_get_summary(
|
|||||||
let ctx = &*ffi_msg.context;
|
let ctx = &*ffi_msg.context;
|
||||||
|
|
||||||
let summary = block_on(ffi_msg.message.get_summary(ctx, maybe_chat))
|
let summary = block_on(ffi_msg.message.get_summary(ctx, maybe_chat))
|
||||||
.log_err(ctx, "dc_msg_get_summary failed")
|
.context("dc_msg_get_summary failed")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
Box::into_raw(Box::new(summary.into()))
|
Box::into_raw(Box::new(summary.into()))
|
||||||
}
|
}
|
||||||
@@ -3437,7 +3488,8 @@ pub unsafe extern "C" fn dc_msg_get_summarytext(
|
|||||||
let ctx = &*ffi_msg.context;
|
let ctx = &*ffi_msg.context;
|
||||||
|
|
||||||
let summary = block_on(ffi_msg.message.get_summary(ctx, None))
|
let summary = block_on(ffi_msg.message.get_summary(ctx, None))
|
||||||
.log_err(ctx, "dc_msg_get_summarytext failed")
|
.context("dc_msg_get_summarytext failed")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
match usize::try_from(approx_characters) {
|
match usize::try_from(approx_characters) {
|
||||||
Ok(chars) => summary.truncated_text(chars).strdup(),
|
Ok(chars) => summary.truncated_text(chars).strdup(),
|
||||||
@@ -3704,7 +3756,9 @@ pub unsafe extern "C" fn dc_msg_latefiling_mediasize(
|
|||||||
.message
|
.message
|
||||||
.latefiling_mediasize(ctx, width, height, duration)
|
.latefiling_mediasize(ctx, width, height, duration)
|
||||||
})
|
})
|
||||||
.ok_or_log_msg(ctx, "Cannot set media size");
|
.context("Cannot set media size")
|
||||||
|
.log_err(ctx)
|
||||||
|
.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
@@ -3743,7 +3797,8 @@ pub unsafe extern "C" fn dc_msg_set_quote(msg: *mut dc_msg_t, quote: *const dc_m
|
|||||||
.message
|
.message
|
||||||
.set_quote(&*ffi_msg.context, quote_msg)
|
.set_quote(&*ffi_msg.context, quote_msg)
|
||||||
.await
|
.await
|
||||||
.log_err(&*ffi_msg.context, "failed to set quote")
|
.context("failed to set quote")
|
||||||
|
.log_err(&*ffi_msg.context)
|
||||||
.ok();
|
.ok();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -3774,7 +3829,8 @@ pub unsafe extern "C" fn dc_msg_get_quoted_msg(msg: *const dc_msg_t) -> *mut dc_
|
|||||||
.message
|
.message
|
||||||
.quoted_message(context)
|
.quoted_message(context)
|
||||||
.await
|
.await
|
||||||
.log_err(context, "failed to get quoted message")
|
.context("failed to get quoted message")
|
||||||
|
.log_err(context)
|
||||||
.unwrap_or(None)
|
.unwrap_or(None)
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -3797,7 +3853,8 @@ pub unsafe extern "C" fn dc_msg_get_parent(msg: *const dc_msg_t) -> *mut dc_msg_
|
|||||||
.message
|
.message
|
||||||
.parent(context)
|
.parent(context)
|
||||||
.await
|
.await
|
||||||
.log_err(context, "failed to get parent message")
|
.context("failed to get parent message")
|
||||||
|
.log_err(context)
|
||||||
.unwrap_or(None)
|
.unwrap_or(None)
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -3988,7 +4045,8 @@ pub unsafe extern "C" fn dc_contact_is_verified(contact: *mut dc_contact_t) -> l
|
|||||||
let ctx = &*ffi_contact.context;
|
let ctx = &*ffi_contact.context;
|
||||||
|
|
||||||
block_on(ffi_contact.contact.is_verified(ctx))
|
block_on(ffi_contact.contact.is_verified(ctx))
|
||||||
.log_err(ctx, "is_verified failed")
|
.context("is_verified failed")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default() as libc::c_int
|
.unwrap_or_default() as libc::c_int
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4003,7 +4061,8 @@ pub unsafe extern "C" fn dc_contact_get_verifier_addr(
|
|||||||
let ffi_contact = &*contact;
|
let ffi_contact = &*contact;
|
||||||
let ctx = &*ffi_contact.context;
|
let ctx = &*ffi_contact.context;
|
||||||
block_on(ffi_contact.contact.get_verifier_addr(ctx))
|
block_on(ffi_contact.contact.get_verifier_addr(ctx))
|
||||||
.log_err(ctx, "failed to get verifier for contact")
|
.context("failed to get verifier for contact")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.strdup()
|
.strdup()
|
||||||
}
|
}
|
||||||
@@ -4017,7 +4076,8 @@ pub unsafe extern "C" fn dc_contact_get_verifier_id(contact: *mut dc_contact_t)
|
|||||||
let ffi_contact = &*contact;
|
let ffi_contact = &*contact;
|
||||||
let ctx = &*ffi_contact.context;
|
let ctx = &*ffi_contact.context;
|
||||||
let verifier_contact_id = block_on(ffi_contact.contact.get_verifier_id(ctx))
|
let verifier_contact_id = block_on(ffi_contact.contact.get_verifier_id(ctx))
|
||||||
.log_err(ctx, "failed to get verifier")
|
.context("failed to get verifier")
|
||||||
|
.log_err(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
|
|
||||||
@@ -4169,8 +4229,8 @@ pub unsafe extern "C" fn dc_backup_provider_new(
|
|||||||
provider,
|
provider,
|
||||||
})
|
})
|
||||||
.map(|ffi_provider| Box::into_raw(Box::new(ffi_provider)))
|
.map(|ffi_provider| Box::into_raw(Box::new(ffi_provider)))
|
||||||
.log_err(ctx, "BackupProvider failed")
|
|
||||||
.context("BackupProvider failed")
|
.context("BackupProvider failed")
|
||||||
|
.log_err(ctx)
|
||||||
.set_last_error(ctx)
|
.set_last_error(ctx)
|
||||||
.unwrap_or(ptr::null_mut())
|
.unwrap_or(ptr::null_mut())
|
||||||
}
|
}
|
||||||
@@ -4186,8 +4246,8 @@ pub unsafe extern "C" fn dc_backup_provider_get_qr(
|
|||||||
let ffi_provider = &*provider;
|
let ffi_provider = &*provider;
|
||||||
let ctx = &*ffi_provider.context;
|
let ctx = &*ffi_provider.context;
|
||||||
deltachat::qr::format_backup(&ffi_provider.provider.qr())
|
deltachat::qr::format_backup(&ffi_provider.provider.qr())
|
||||||
.log_err(ctx, "BackupProvider get_qr failed")
|
|
||||||
.context("BackupProvider get_qr failed")
|
.context("BackupProvider get_qr failed")
|
||||||
|
.log_err(ctx)
|
||||||
.set_last_error(ctx)
|
.set_last_error(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.strdup()
|
.strdup()
|
||||||
@@ -4205,8 +4265,8 @@ pub unsafe extern "C" fn dc_backup_provider_get_qr_svg(
|
|||||||
let ctx = &*ffi_provider.context;
|
let ctx = &*ffi_provider.context;
|
||||||
let provider = &ffi_provider.provider;
|
let provider = &ffi_provider.provider;
|
||||||
block_on(generate_backup_qr(ctx, &provider.qr()))
|
block_on(generate_backup_qr(ctx, &provider.qr()))
|
||||||
.log_err(ctx, "BackupProvider get_qr_svg failed")
|
|
||||||
.context("BackupProvider get_qr_svg failed")
|
.context("BackupProvider get_qr_svg failed")
|
||||||
|
.log_err(ctx)
|
||||||
.set_last_error(ctx)
|
.set_last_error(ctx)
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
.strdup()
|
.strdup()
|
||||||
@@ -4222,8 +4282,8 @@ pub unsafe extern "C" fn dc_backup_provider_wait(provider: *mut dc_backup_provid
|
|||||||
let ctx = &*ffi_provider.context;
|
let ctx = &*ffi_provider.context;
|
||||||
let provider = &mut ffi_provider.provider;
|
let provider = &mut ffi_provider.provider;
|
||||||
block_on(provider)
|
block_on(provider)
|
||||||
.log_err(ctx, "Failed to await BackupProvider")
|
|
||||||
.context("Failed to await BackupProvider")
|
.context("Failed to await BackupProvider")
|
||||||
|
.log_err(ctx)
|
||||||
.set_last_error(ctx)
|
.set_last_error(ctx)
|
||||||
.ok();
|
.ok();
|
||||||
}
|
}
|
||||||
@@ -4255,16 +4315,16 @@ pub unsafe extern "C" fn dc_receive_backup(
|
|||||||
// user from deallocating it by calling unref on the object while we are using it.
|
// user from deallocating it by calling unref on the object while we are using it.
|
||||||
fn receive_backup(ctx: Context, qr_text: String) -> libc::c_int {
|
fn receive_backup(ctx: Context, qr_text: String) -> libc::c_int {
|
||||||
let qr = match block_on(qr::check_qr(&ctx, &qr_text))
|
let qr = match block_on(qr::check_qr(&ctx, &qr_text))
|
||||||
.log_err(&ctx, "Invalid QR code")
|
|
||||||
.context("Invalid QR code")
|
.context("Invalid QR code")
|
||||||
|
.log_err(&ctx)
|
||||||
.set_last_error(&ctx)
|
.set_last_error(&ctx)
|
||||||
{
|
{
|
||||||
Ok(qr) => qr,
|
Ok(qr) => qr,
|
||||||
Err(_) => return 0,
|
Err(_) => return 0,
|
||||||
};
|
};
|
||||||
match block_on(imex::get_backup(&ctx, qr))
|
match block_on(imex::get_backup(&ctx, qr))
|
||||||
.log_err(&ctx, "Get backup failed")
|
|
||||||
.context("Get backup failed")
|
.context("Get backup failed")
|
||||||
|
.log_err(&ctx)
|
||||||
.set_last_error(&ctx)
|
.set_last_error(&ctx)
|
||||||
{
|
{
|
||||||
Ok(_) => 1,
|
Ok(_) => 1,
|
||||||
@@ -4316,8 +4376,8 @@ where
|
|||||||
///
|
///
|
||||||
/// ```no_compile
|
/// ```no_compile
|
||||||
/// some_dc_rust_api_call_returning_result()
|
/// some_dc_rust_api_call_returning_result()
|
||||||
/// .log_err(&context, "My API call failed")
|
|
||||||
/// .context("My API call failed")
|
/// .context("My API call failed")
|
||||||
|
/// .log_err(&context)
|
||||||
/// .set_last_error(&context)
|
/// .set_last_error(&context)
|
||||||
/// .unwrap_or_default()
|
/// .unwrap_or_default()
|
||||||
/// ```
|
/// ```
|
||||||
@@ -4404,7 +4464,8 @@ pub unsafe extern "C" fn dc_provider_new_from_email_with_dns(
|
|||||||
let socks5_enabled = block_on(async move {
|
let socks5_enabled = block_on(async move {
|
||||||
ctx.get_config_bool(config::Config::Socks5Enabled)
|
ctx.get_config_bool(config::Config::Socks5Enabled)
|
||||||
.await
|
.await
|
||||||
.log_err(ctx, "Can't get config")
|
.context("Can't get config")
|
||||||
|
.log_err(ctx)
|
||||||
});
|
});
|
||||||
|
|
||||||
match socks5_enabled {
|
match socks5_enabled {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "deltachat-jsonrpc"
|
name = "deltachat-jsonrpc"
|
||||||
version = "1.112.1"
|
version = "1.112.5"
|
||||||
description = "DeltaChat JSON-RPC API"
|
description = "DeltaChat JSON-RPC API"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "deltachat-jsonrpc-server"
|
default-run = "deltachat-jsonrpc-server"
|
||||||
@@ -19,21 +19,21 @@ serde = { version = "1.0", features = ["derive"] }
|
|||||||
tempfile = "3.3.0"
|
tempfile = "3.3.0"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
async-channel = { version = "1.8.0" }
|
async-channel = { version = "1.8.0" }
|
||||||
futures = { version = "0.3.26" }
|
futures = { version = "0.3.28" }
|
||||||
serde_json = "1.0.91"
|
serde_json = "1.0.95"
|
||||||
yerpc = { version = "0.4.3", features = ["anyhow_expose"] }
|
yerpc = { version = "0.4.3", features = ["anyhow_expose"] }
|
||||||
typescript-type-def = { version = "0.5.5", features = ["json_value"] }
|
typescript-type-def = { version = "0.5.5", features = ["json_value"] }
|
||||||
tokio = { version = "1.25.0" }
|
tokio = { version = "1.27.0" }
|
||||||
sanitize-filename = "0.4"
|
sanitize-filename = "0.4"
|
||||||
walkdir = "2.3.2"
|
walkdir = "2.3.3"
|
||||||
base64 = "0.21"
|
base64 = "0.21"
|
||||||
|
|
||||||
# optional dependencies
|
# optional dependencies
|
||||||
axum = { version = "0.6.11", optional = true, features = ["ws"] }
|
axum = { version = "0.6.12", optional = true, features = ["ws"] }
|
||||||
env_logger = { version = "0.10.0", optional = true }
|
env_logger = { version = "0.10.0", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tokio = { version = "1.25.0", features = ["full", "rt-multi-thread"] }
|
tokio = { version = "1.27.0", features = ["full", "rt-multi-thread"] }
|
||||||
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
|||||||
@@ -1082,17 +1082,17 @@ impl CommandApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Search messages containing the given query string.
|
/// Search messages containing the given query string.
|
||||||
/// Searching can be done globally (chat_id=0) or in a specified chat only (chat_id set).
|
/// Searching can be done globally (chat_id=None) or in a specified chat only (chat_id set).
|
||||||
///
|
///
|
||||||
/// Global chat results are typically displayed using dc_msg_get_summary(), chat
|
/// Global search results are typically displayed using dc_msg_get_summary(), chat
|
||||||
/// search results may just hilite the corresponding messages and present a
|
/// search results may just highlight the corresponding messages and present a
|
||||||
/// prev/next button.
|
/// prev/next button.
|
||||||
///
|
///
|
||||||
/// For global search, result is limited to 1000 messages,
|
/// For the global search, the result is limited to 1000 messages,
|
||||||
/// this allows incremental search done fast.
|
/// this allows an incremental search done fast.
|
||||||
/// So, when getting exactly 1000 results, the result may be truncated;
|
/// So, when getting exactly 1000 messages, the result actually may be truncated;
|
||||||
/// the UIs may display sth. as "1000+ messages found" in this case.
|
/// the UIs may display sth. like "1000+ messages found" in this case.
|
||||||
/// Chat search (if a chat_id is set) is not limited.
|
/// The chat search (if chat_id is set) is not limited.
|
||||||
async fn search_messages(
|
async fn search_messages(
|
||||||
&self,
|
&self,
|
||||||
account_id: u32,
|
account_id: u32,
|
||||||
|
|||||||
@@ -55,5 +55,5 @@
|
|||||||
},
|
},
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"types": "dist/deltachat.d.ts",
|
"types": "dist/deltachat.d.ts",
|
||||||
"version": "1.112.1"
|
"version": "1.112.5"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "deltachat-repl"
|
name = "deltachat-repl"
|
||||||
version = "1.112.1"
|
version = "1.112.5"
|
||||||
license = "MPL-2.0"
|
license = "MPL-2.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
@@ -8,10 +8,10 @@ edition = "2021"
|
|||||||
ansi_term = "0.12.1"
|
ansi_term = "0.12.1"
|
||||||
anyhow = "1"
|
anyhow = "1"
|
||||||
deltachat = { path = "..", features = ["internals"]}
|
deltachat = { path = "..", features = ["internals"]}
|
||||||
dirs = "4"
|
dirs = "5"
|
||||||
log = "0.4.16"
|
log = "0.4.16"
|
||||||
pretty_env_logger = "0.4"
|
pretty_env_logger = "0.4"
|
||||||
rusqlite = "0.28"
|
rusqlite = "0.29"
|
||||||
rustyline = "11"
|
rustyline = "11"
|
||||||
tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
|
tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
|
||||||
|
|
||||||
|
|||||||
@@ -563,7 +563,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
|
|||||||
context.maybe_network().await;
|
context.maybe_network().await;
|
||||||
}
|
}
|
||||||
"housekeeping" => {
|
"housekeeping" => {
|
||||||
sql::housekeeping(&context).await.ok_or_log(&context);
|
sql::housekeeping(&context).await.log_err(&context).ok();
|
||||||
}
|
}
|
||||||
"listchats" | "listarchived" | "chats" => {
|
"listchats" | "listarchived" | "chats" => {
|
||||||
let listflags = if arg0 == "listarchived" {
|
let listflags = if arg0 == "listarchived" {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "deltachat-rpc-server"
|
name = "deltachat-rpc-server"
|
||||||
version = "1.112.1"
|
version = "1.112.5"
|
||||||
description = "DeltaChat JSON-RPC server"
|
description = "DeltaChat JSON-RPC server"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
@@ -17,9 +17,9 @@ anyhow = "1"
|
|||||||
env_logger = { version = "0.10.0" }
|
env_logger = { version = "0.10.0" }
|
||||||
futures-lite = "1.12.0"
|
futures-lite = "1.12.0"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
serde_json = "1.0.91"
|
serde_json = "1.0.95"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
tokio = { version = "1.25.0", features = ["io-std"] }
|
tokio = { version = "1.27.0", features = ["io-std"] }
|
||||||
yerpc = { version = "0.4.0", features = ["anyhow_expose"] }
|
yerpc = { version = "0.4.0", features = ["anyhow_expose"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
|||||||
@@ -8,5 +8,5 @@ license = "MPL-2.0"
|
|||||||
proc-macro = true
|
proc-macro = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
syn = "1"
|
syn = "2"
|
||||||
quote = "1"
|
quote = "1"
|
||||||
|
|||||||
50
deny.toml
50
deny.toml
@@ -11,42 +11,50 @@ ignore = [
|
|||||||
# Accept some duplicate versions, ideally we work towards this list
|
# Accept some duplicate versions, ideally we work towards this list
|
||||||
# becoming empty. Adding versions forces us to revisit this at least
|
# becoming empty. Adding versions forces us to revisit this at least
|
||||||
# when upgrading.
|
# when upgrading.
|
||||||
|
# Please keep this list alphabetically sorted.
|
||||||
skip = [
|
skip = [
|
||||||
|
{ name = "base16ct", version = "0.1.1" },
|
||||||
{ name = "base64", version = "<0.21" },
|
{ name = "base64", version = "<0.21" },
|
||||||
|
{ name = "bitflags", version = "1.3.2" },
|
||||||
{ name = "block-buffer", version = "<0.10" },
|
{ name = "block-buffer", version = "<0.10" },
|
||||||
{ name = "darling", version = "<0.14" },
|
{ name = "clap_lex", version = "0.2.4" },
|
||||||
|
{ name = "clap", version = "3.2.23" },
|
||||||
|
{ name = "convert_case", version = "0.4.0" },
|
||||||
|
{ name = "curve25519-dalek", version = "3.2.0" },
|
||||||
{ name = "darling_core", version = "<0.14" },
|
{ name = "darling_core", version = "<0.14" },
|
||||||
{ name = "darling_macro", version = "<0.14" },
|
{ name = "darling_macro", version = "<0.14" },
|
||||||
|
{ name = "darling", version = "<0.14" },
|
||||||
|
{ name = "der", version = "0.6.1" },
|
||||||
{ name = "digest", version = "<0.10" },
|
{ name = "digest", version = "<0.10" },
|
||||||
|
{ name = "ed25519-dalek", version = "1.0.1" },
|
||||||
|
{ name = "ed25519", version = "1.5.3" },
|
||||||
{ name = "env_logger", version = "<0.10" },
|
{ name = "env_logger", version = "<0.10" },
|
||||||
{ name = "getrandom", version = "<0.2" },
|
{ name = "getrandom", version = "<0.2" },
|
||||||
{ name = "hermit-abi", version = "<0.3" },
|
{ name = "hermit-abi", version = "<0.3" },
|
||||||
{ name = "humantime", version = "<2.1" },
|
{ name = "humantime", version = "<2.1" },
|
||||||
{ name = "idna", version = "<0.3" },
|
{ name = "idna", version = "<0.3" },
|
||||||
{ name = "nom", version = "<7.1" },
|
{ name = "libm", version = "0.1.4" },
|
||||||
|
{ name = "pem-rfc7468", version = "0.6.0" },
|
||||||
|
{ name = "pkcs8", version = "0.9.0" },
|
||||||
{ name = "quick-error", version = "<2.0" },
|
{ name = "quick-error", version = "<2.0" },
|
||||||
{ name = "rand", version = "<0.8" },
|
|
||||||
{ name = "rand_chacha", version = "<0.3" },
|
{ name = "rand_chacha", version = "<0.3" },
|
||||||
{ name = "rand_core", version = "<0.6" },
|
{ name = "rand_core", version = "<0.6" },
|
||||||
|
{ name = "rand", version = "<0.8" },
|
||||||
|
{ name = "redox_syscall", version = "0.2.16" },
|
||||||
|
{ name = "sec1", version = "0.3.0" },
|
||||||
{ name = "sha2", version = "<0.10" },
|
{ name = "sha2", version = "<0.10" },
|
||||||
{ name = "time", version = "<0.3" },
|
{ name = "signature", version = "1.6.4" },
|
||||||
{ name = "version_check", version = "<0.9" },
|
|
||||||
{ name = "wasi", version = "<0.11" },
|
|
||||||
{ name = "windows-sys", version = "<0.45" },
|
|
||||||
{ name = "windows_x86_64_msvc", version = "<0.42" },
|
|
||||||
{ name = "windows_x86_64_gnu", version = "<0.42" },
|
|
||||||
{ name = "windows_i686_msvc", version = "<0.42" },
|
|
||||||
{ name = "windows_i686_gnu", version = "<0.42" },
|
|
||||||
{ name = "windows_aarch64_msvc", version = "<0.42" },
|
|
||||||
{ name = "unicode-xid", version = "<0.2.4" },
|
|
||||||
{ name = "syn", version = "<1.0" },
|
|
||||||
{ name = "quote", version = "<1.0" },
|
|
||||||
{ name = "proc-macro2", version = "<1.0" },
|
|
||||||
{ name = "portable-atomic", version = "<1.0" },
|
|
||||||
{ name = "spin", version = "<0.9.6" },
|
{ name = "spin", version = "<0.9.6" },
|
||||||
{ name = "convert_case", version = "0.4.0" },
|
{ name = "spki", version = "0.6.0" },
|
||||||
{ name = "clap_lex", version = "0.2.4" },
|
{ name = "syn", version = "1.0.109" },
|
||||||
{ name = "clap", version = "3.2.23" },
|
{ name = "time", version = "<0.3" },
|
||||||
|
{ name = "wasi", version = "<0.11" },
|
||||||
|
{ name = "windows_aarch64_msvc", version = "<0.42" },
|
||||||
|
{ name = "windows_i686_gnu", version = "<0.42" },
|
||||||
|
{ name = "windows_i686_msvc", version = "<0.42" },
|
||||||
|
{ name = "windows-sys", version = "<0.45" },
|
||||||
|
{ name = "windows_x86_64_gnu", version = "<0.42" },
|
||||||
|
{ name = "windows_x86_64_msvc", version = "<0.42" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@@ -78,7 +86,5 @@ license-files = [
|
|||||||
github = [
|
github = [
|
||||||
"async-email",
|
"async-email",
|
||||||
"deltachat",
|
"deltachat",
|
||||||
"n0-computer",
|
|
||||||
"quinn-rs",
|
"quinn-rs",
|
||||||
"dignifiedquire",
|
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -60,5 +60,5 @@
|
|||||||
"test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
|
"test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
|
||||||
},
|
},
|
||||||
"types": "node/dist/index.d.ts",
|
"types": "node/dist/index.d.ts",
|
||||||
"version": "1.112.1"
|
"version": "1.112.5"
|
||||||
}
|
}
|
||||||
@@ -12,17 +12,17 @@ a low-level Chat/Contact/Message API to user interfaces and bots.
|
|||||||
Installing pre-built packages (Linux-only)
|
Installing pre-built packages (Linux-only)
|
||||||
==========================================
|
==========================================
|
||||||
|
|
||||||
If you have a Linux system you may try to install the ``deltachat`` binary "wheel" packages
|
If you have a Linux system you may install the ``deltachat`` binary "wheel" packages
|
||||||
without any "build-from-source" steps.
|
without any "build-from-source" steps.
|
||||||
Otherwise you need to `compile the Delta Chat bindings yourself`__.
|
Otherwise you need to `compile the Delta Chat bindings yourself`__.
|
||||||
|
|
||||||
__ sourceinstall_
|
__ sourceinstall_
|
||||||
|
|
||||||
We recommend to first `install virtualenv <https://virtualenv.pypa.io/en/stable/installation.html>`_,
|
We recommend to first create a fresh Python virtual environment
|
||||||
then create a fresh Python virtual environment and activate it in your shell::
|
and activate it in your shell::
|
||||||
|
|
||||||
virtualenv env # or: python -m venv
|
python -m venv env
|
||||||
source env/bin/activate
|
source env/bin/activate
|
||||||
|
|
||||||
Afterwards, invoking ``python`` or ``pip install`` only
|
Afterwards, invoking ``python`` or ``pip install`` only
|
||||||
modifies files in your ``env`` directory and leaves
|
modifies files in your ``env`` directory and leaves
|
||||||
@@ -40,16 +40,14 @@ To verify it worked::
|
|||||||
Running tests
|
Running tests
|
||||||
=============
|
=============
|
||||||
|
|
||||||
Recommended way to run tests is using `tox <https://tox.wiki>`_.
|
Recommended way to run tests is using `scripts/run-python-test.sh`
|
||||||
After successful binding installation you can install tox
|
script provided in the core repository.
|
||||||
and run the tests::
|
|
||||||
|
|
||||||
pip install tox
|
This script compiles the library in debug mode and runs the tests using `tox`_.
|
||||||
tox -e py3
|
By default it will run all "offline" tests and skip all functional
|
||||||
|
|
||||||
This will run all "offline" tests and skip all functional
|
|
||||||
end-to-end tests that require accounts on real e-mail servers.
|
end-to-end tests that require accounts on real e-mail servers.
|
||||||
|
|
||||||
|
.. _`tox`: https://tox.wiki
|
||||||
.. _livetests:
|
.. _livetests:
|
||||||
|
|
||||||
Running "live" tests with temporary accounts
|
Running "live" tests with temporary accounts
|
||||||
@@ -61,13 +59,32 @@ Please feel free to contact us through a github issue or by e-mail and we'll sen
|
|||||||
|
|
||||||
export DCC_NEW_TMP_EMAIL=<URL you got from us>
|
export DCC_NEW_TMP_EMAIL=<URL you got from us>
|
||||||
|
|
||||||
With this account-creation setting, pytest runs create ephemeral e-mail accounts on the http://testrun.org server. These accounts exists only for one hour and then are removed completely.
|
With this account-creation setting, pytest runs create ephemeral e-mail accounts on the http://testrun.org server.
|
||||||
One hour is enough to invoke pytest and run all offline and online tests::
|
These accounts are removed automatically as they expire.
|
||||||
|
After setting the variable, either rerun `scripts/run-python-test.sh`
|
||||||
|
or run offline and online tests with `tox` directly::
|
||||||
|
|
||||||
tox -e py3
|
tox -e py
|
||||||
|
|
||||||
Each test run creates new accounts.
|
Each test run creates new accounts.
|
||||||
|
|
||||||
|
Developing the bindings
|
||||||
|
-----------------------
|
||||||
|
|
||||||
|
If you want to develop or debug the bindings,
|
||||||
|
you can create a testing development environment using `tox`::
|
||||||
|
|
||||||
|
tox -c python --devenv env
|
||||||
|
. env/bin/activate
|
||||||
|
|
||||||
|
Inside this environment the bindings are installed
|
||||||
|
in editable mode (as if installed with `python -m pip install -e`)
|
||||||
|
together with the testing dependencies like `pytest` and its plugins.
|
||||||
|
|
||||||
|
You can then edit the source code in the development tree
|
||||||
|
and quickly run `pytest` manually without waiting for `tox`
|
||||||
|
to recreating the virtual environment each time.
|
||||||
|
|
||||||
.. _sourceinstall:
|
.. _sourceinstall:
|
||||||
|
|
||||||
Installing bindings from source
|
Installing bindings from source
|
||||||
@@ -89,20 +106,34 @@ To install the Delta Chat Python bindings make sure you have Python3 installed.
|
|||||||
E.g. on Debian-based systems `apt install python3 python3-pip
|
E.g. on Debian-based systems `apt install python3 python3-pip
|
||||||
python3-venv` should give you a usable python installation.
|
python3-venv` should give you a usable python installation.
|
||||||
|
|
||||||
Ensure you are in the deltachat-core-rust/python directory, create the
|
First, build the core library::
|
||||||
virtual environment with dependencies using tox
|
|
||||||
and activate it in your shell::
|
|
||||||
|
|
||||||
cd python
|
cargo build --release -p deltachat_ffi --features jsonrpc
|
||||||
tox --devenv env
|
|
||||||
|
`jsonrpc` feature is required even if not used by the bindings
|
||||||
|
because `deltachat.h` includes JSON-RPC functions unconditionally.
|
||||||
|
|
||||||
|
Create the virtual environment and activate it:
|
||||||
|
|
||||||
|
python -m venv env
|
||||||
source env/bin/activate
|
source env/bin/activate
|
||||||
|
|
||||||
You should now be able to build the python bindings using the supplied script::
|
Build and install the bindings:
|
||||||
|
|
||||||
python3 install_python_bindings.py
|
export DCC_RS_DEV="$PWD"
|
||||||
|
export DCC_RS_TARGET=release
|
||||||
|
python -m pip install python
|
||||||
|
|
||||||
The core compilation and bindings building might take a while,
|
`DCC_RS_DEV` environment variable specifies the location of
|
||||||
depending on the speed of your machine.
|
the core development tree. If this variable is not set,
|
||||||
|
`libdeltachat` library and `deltachat.h` header are expected
|
||||||
|
to be installed system-wide.
|
||||||
|
|
||||||
|
When `DCC_RS_DEV` is set, `DCC_RS_TARGET` specifies
|
||||||
|
the build profile name to look up the artifacts
|
||||||
|
in the target directory.
|
||||||
|
In this case setting it can be skipped because
|
||||||
|
`DCC_RS_TARGET=release` is the default.
|
||||||
|
|
||||||
Building manylinux based wheels
|
Building manylinux based wheels
|
||||||
===============================
|
===============================
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ def test_echo_quit_plugin(acfactory, lp):
|
|||||||
lp.sec("creating a temp account to contact the bot")
|
lp.sec("creating a temp account to contact the bot")
|
||||||
(ac1,) = acfactory.get_online_accounts(1)
|
(ac1,) = acfactory.get_online_accounts(1)
|
||||||
|
|
||||||
|
botproc.await_resync()
|
||||||
|
|
||||||
lp.sec("sending a message to the bot")
|
lp.sec("sending a message to the bot")
|
||||||
bot_contact = ac1.create_contact(botproc.addr)
|
bot_contact = ac1.create_contact(botproc.addr)
|
||||||
bot_chat = bot_contact.create_chat()
|
bot_chat = bot_contact.create_chat()
|
||||||
@@ -40,7 +42,7 @@ def test_echo_quit_plugin(acfactory, lp):
|
|||||||
|
|
||||||
def test_group_tracking_plugin(acfactory, lp):
|
def test_group_tracking_plugin(acfactory, lp):
|
||||||
lp.sec("creating one group-tracking bot and two temp accounts")
|
lp.sec("creating one group-tracking bot and two temp accounts")
|
||||||
botproc = acfactory.run_bot_process(group_tracking, ffi=False)
|
botproc = acfactory.run_bot_process(group_tracking)
|
||||||
|
|
||||||
ac1, ac2 = acfactory.get_online_accounts(2)
|
ac1, ac2 = acfactory.get_online_accounts(2)
|
||||||
|
|
||||||
@@ -52,6 +54,8 @@ def test_group_tracking_plugin(acfactory, lp):
|
|||||||
ac1.add_account_plugin(FFIEventLogger(ac1))
|
ac1.add_account_plugin(FFIEventLogger(ac1))
|
||||||
ac2.add_account_plugin(FFIEventLogger(ac2))
|
ac2.add_account_plugin(FFIEventLogger(ac2))
|
||||||
|
|
||||||
|
botproc.await_resync()
|
||||||
|
|
||||||
lp.sec("creating bot test group with bot")
|
lp.sec("creating bot test group with bot")
|
||||||
bot_contact = ac1.create_contact(botproc.addr)
|
bot_contact = ac1.create_contact(botproc.addr)
|
||||||
ch = ac1.create_group_chat("bot test group")
|
ch = ac1.create_group_chat("bot test group")
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
"""
|
|
||||||
setup a python binding development in-place install with cargo debug symbols.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
target = os.environ.get("DCC_RS_TARGET")
|
|
||||||
if target is None:
|
|
||||||
os.environ["DCC_RS_TARGET"] = target = "debug"
|
|
||||||
if "DCC_RS_DEV" not in os.environ:
|
|
||||||
dn = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
||||||
os.environ["DCC_RS_DEV"] = dn
|
|
||||||
|
|
||||||
cmd = ["cargo", "build", "-p", "deltachat_ffi", "--features", "jsonrpc"]
|
|
||||||
|
|
||||||
if target == "release":
|
|
||||||
os.environ["CARGO_PROFILE_RELEASE_LTO"] = "on"
|
|
||||||
cmd.append("--release")
|
|
||||||
|
|
||||||
print("running:", " ".join(cmd))
|
|
||||||
subprocess.check_call(cmd)
|
|
||||||
subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib src/deltachat/*.dll", shell=True)
|
|
||||||
|
|
||||||
if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild":
|
|
||||||
subprocess.check_call([sys.executable, "-m", "pip", "install", "-e", "."])
|
|
||||||
@@ -676,6 +676,13 @@ class BotProcess:
|
|||||||
print("+++IGN:", line)
|
print("+++IGN:", line)
|
||||||
ignored.append(line)
|
ignored.append(line)
|
||||||
|
|
||||||
|
def await_resync(self):
|
||||||
|
self.fnmatch_lines(
|
||||||
|
"""
|
||||||
|
*Resync: collected * message IDs in folder INBOX*
|
||||||
|
""",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
def tmp_db_path(tmpdir):
|
def tmp_db_path(tmpdir):
|
||||||
|
|||||||
@@ -567,7 +567,8 @@ def test_moved_markseen(acfactory):
|
|||||||
|
|
||||||
with ac2.direct_imap.idle() as idle2:
|
with ac2.direct_imap.idle() as idle2:
|
||||||
ac2.start_io()
|
ac2.start_io()
|
||||||
msg = ac2._evtracker.wait_next_incoming_message()
|
ev = ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG|DC_EVENT_MSGS_CHANGED")
|
||||||
|
msg = ac2.get_message_by_id(ev.data2)
|
||||||
|
|
||||||
# Accept the contact request.
|
# Accept the contact request.
|
||||||
msg.chat.accept()
|
msg.chat.accept()
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ deps =
|
|||||||
pygments
|
pygments
|
||||||
restructuredtext_lint
|
restructuredtext_lint
|
||||||
commands =
|
commands =
|
||||||
black --quiet --check --diff setup.py install_python_bindings.py src/deltachat examples/ tests/
|
black --quiet --check --diff setup.py src/deltachat examples/ tests/
|
||||||
ruff src/deltachat tests/ examples/
|
ruff src/deltachat tests/ examples/
|
||||||
rst-lint --encoding 'utf-8' README.rst
|
rst-lint --encoding 'utf-8' README.rst
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export DCC_RS_DEV=`pwd`
|
|||||||
|
|
||||||
cd python
|
cd python
|
||||||
|
|
||||||
python install_python_bindings.py onlybuild
|
cargo build -p deltachat_ffi --features jsonrpc
|
||||||
|
|
||||||
# remove and inhibit writing PYC files
|
# remove and inhibit writing PYC files
|
||||||
rm -rf tests/__pycache__
|
rm -rf tests/__pycache__
|
||||||
@@ -22,4 +22,4 @@ export PYTHONDONTWRITEBYTECODE=1
|
|||||||
# run python tests (tox invokes pytest to run tests in python/tests)
|
# run python tests (tox invokes pytest to run tests in python/tests)
|
||||||
#TOX_PARALLEL_NO_SPINNER=1 tox -e lint,doc
|
#TOX_PARALLEL_NO_SPINNER=1 tox -e lint,doc
|
||||||
tox -e lint
|
tox -e lint
|
||||||
tox -e doc,py3
|
tox -e doc,py
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ unset DCC_NEW_TMP_EMAIL
|
|||||||
# E.g. musllinux_1_1 does not have PyPy interpreters as of 2022-07-10
|
# E.g. musllinux_1_1 does not have PyPy interpreters as of 2022-07-10
|
||||||
tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,pypy37,pypy38,pypy39 --skip-missing-interpreters true
|
tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,pypy37,pypy38,pypy39 --skip-missing-interpreters true
|
||||||
|
|
||||||
auditwheel repair "$TOXWORKDIR/wheelhouse/deltachat*" -w "$TOXWORKDIR/wheelhouse"
|
auditwheel repair "$TOXWORKDIR"/wheelhouse/deltachat* -w "$TOXWORKDIR/wheelhouse"
|
||||||
|
|
||||||
|
|
||||||
echo -----------------------
|
echo -----------------------
|
||||||
|
|||||||
@@ -56,7 +56,8 @@ def update_package_json(relpath, newversion):
|
|||||||
json_data = json.loads(f.read())
|
json_data = json.loads(f.read())
|
||||||
json_data["version"] = newversion
|
json_data["version"] = newversion
|
||||||
with open(p, "w") as f:
|
with open(p, "w") as f:
|
||||||
f.write(json.dumps(json_data, sort_keys=True, indent=2))
|
json.dump(json_data, f, sort_keys=True, indent=2)
|
||||||
|
f.write("\n")
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ impl<'a> BlobObject<'a> {
|
|||||||
if attempt >= MAX_ATTEMPT {
|
if attempt >= MAX_ATTEMPT {
|
||||||
return Err(err).context("failed to create file");
|
return Err(err).context("failed to create file");
|
||||||
} else if attempt == 1 && !dir.exists() {
|
} else if attempt == 1 && !dir.exists() {
|
||||||
fs::create_dir_all(dir).await.ok_or_log(context);
|
fs::create_dir_all(dir).await.log_err(context).ok();
|
||||||
} else {
|
} else {
|
||||||
name = format!("{}-{}{}", stem, rand::random::<u32>(), ext);
|
name = format!("{}-{}{}", stem, rand::random::<u32>(), ext);
|
||||||
}
|
}
|
||||||
|
|||||||
38
src/chat.rs
38
src/chat.rs
@@ -35,8 +35,9 @@ use crate::scheduler::InterruptInfo;
|
|||||||
use crate::smtp::send_msg_to_smtp;
|
use crate::smtp::send_msg_to_smtp;
|
||||||
use crate::stock_str;
|
use crate::stock_str;
|
||||||
use crate::tools::{
|
use crate::tools::{
|
||||||
create_id, create_outgoing_rfc724_mid, create_smeared_timestamp, create_smeared_timestamps,
|
buf_compress, create_id, create_outgoing_rfc724_mid, create_smeared_timestamp,
|
||||||
get_abs_path, gm2local_offset, improve_single_line_input, time, IsNoneOrEmpty,
|
create_smeared_timestamps, get_abs_path, gm2local_offset, improve_single_line_input, time,
|
||||||
|
IsNoneOrEmpty,
|
||||||
};
|
};
|
||||||
use crate::webxdc::WEBXDC_SUFFIX;
|
use crate::webxdc::WEBXDC_SUFFIX;
|
||||||
use crate::{location, sql};
|
use crate::{location, sql};
|
||||||
@@ -1580,7 +1581,12 @@ impl Chat {
|
|||||||
} else {
|
} else {
|
||||||
msg.param.get(Param::SendHtml).map(|s| s.to_string())
|
msg.param.get(Param::SendHtml).map(|s| s.to_string())
|
||||||
};
|
};
|
||||||
html.map(|html| new_html_mimepart(html).build().as_string())
|
match html {
|
||||||
|
Some(html) => Some(tokio::task::block_in_place(move || {
|
||||||
|
buf_compress(new_html_mimepart(html).build().as_string().as_bytes())
|
||||||
|
})?),
|
||||||
|
None => None,
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
@@ -1594,7 +1600,8 @@ impl Chat {
|
|||||||
SET rfc724_mid=?, chat_id=?, from_id=?, to_id=?, timestamp=?, type=?,
|
SET rfc724_mid=?, chat_id=?, from_id=?, to_id=?, timestamp=?, type=?,
|
||||||
state=?, txt=?, subject=?, param=?,
|
state=?, txt=?, subject=?, param=?,
|
||||||
hidden=?, mime_in_reply_to=?, mime_references=?, mime_modified=?,
|
hidden=?, mime_in_reply_to=?, mime_references=?, mime_modified=?,
|
||||||
mime_headers=?, location_id=?, ephemeral_timer=?, ephemeral_timestamp=?
|
mime_headers=?, mime_compressed=1, location_id=?, ephemeral_timer=?,
|
||||||
|
ephemeral_timestamp=?
|
||||||
WHERE id=?;",
|
WHERE id=?;",
|
||||||
paramsv![
|
paramsv![
|
||||||
new_rfc724_mid,
|
new_rfc724_mid,
|
||||||
@@ -1640,10 +1647,11 @@ impl Chat {
|
|||||||
mime_references,
|
mime_references,
|
||||||
mime_modified,
|
mime_modified,
|
||||||
mime_headers,
|
mime_headers,
|
||||||
|
mime_compressed,
|
||||||
location_id,
|
location_id,
|
||||||
ephemeral_timer,
|
ephemeral_timer,
|
||||||
ephemeral_timestamp)
|
ephemeral_timestamp)
|
||||||
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);",
|
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,1,?,?,?);",
|
||||||
paramsv![
|
paramsv![
|
||||||
new_rfc724_mid,
|
new_rfc724_mid,
|
||||||
self.id,
|
self.id,
|
||||||
@@ -2727,12 +2735,14 @@ pub async fn get_chat_media(
|
|||||||
"SELECT id
|
"SELECT id
|
||||||
FROM msgs
|
FROM msgs
|
||||||
WHERE (1=? OR chat_id=?)
|
WHERE (1=? OR chat_id=?)
|
||||||
|
AND chat_id != ?
|
||||||
AND (type=? OR type=? OR type=?)
|
AND (type=? OR type=? OR type=?)
|
||||||
AND hidden=0
|
AND hidden=0
|
||||||
ORDER BY timestamp, id;",
|
ORDER BY timestamp, id;",
|
||||||
paramsv![
|
paramsv![
|
||||||
chat_id.is_none(),
|
chat_id.is_none(),
|
||||||
chat_id.unwrap_or_else(|| ChatId::new(0)),
|
chat_id.unwrap_or_else(|| ChatId::new(0)),
|
||||||
|
DC_CHAT_ID_TRASH,
|
||||||
msg_type,
|
msg_type,
|
||||||
if msg_type2 != Viewtype::Unknown {
|
if msg_type2 != Viewtype::Unknown {
|
||||||
msg_type2
|
msg_type2
|
||||||
@@ -3795,6 +3805,7 @@ mod tests {
|
|||||||
use crate::chatlist::{get_archived_cnt, Chatlist};
|
use crate::chatlist::{get_archived_cnt, Chatlist};
|
||||||
use crate::constants::{DC_GCL_ARCHIVED_ONLY, DC_GCL_NO_SPECIALS};
|
use crate::constants::{DC_GCL_ARCHIVED_ONLY, DC_GCL_NO_SPECIALS};
|
||||||
use crate::contact::{Contact, ContactAddress};
|
use crate::contact::{Contact, ContactAddress};
|
||||||
|
use crate::message::delete_msgs;
|
||||||
use crate::receive_imf::receive_imf;
|
use crate::receive_imf::receive_imf;
|
||||||
use crate::test_utils::TestContext;
|
use crate::test_utils::TestContext;
|
||||||
|
|
||||||
@@ -5977,7 +5988,7 @@ mod tests {
|
|||||||
include_bytes!("../test-data/image/avatar64x64.png"),
|
include_bytes!("../test-data/image/avatar64x64.png"),
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
send_media(
|
let second_image_msg_id = send_media(
|
||||||
&t,
|
&t,
|
||||||
chat_id2,
|
chat_id2,
|
||||||
Viewtype::Image,
|
Viewtype::Image,
|
||||||
@@ -6079,6 +6090,21 @@ mod tests {
|
|||||||
4
|
4
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Delete an image.
|
||||||
|
delete_msgs(&t, &[second_image_msg_id]).await?;
|
||||||
|
assert_eq!(
|
||||||
|
get_chat_media(
|
||||||
|
&t,
|
||||||
|
None,
|
||||||
|
Viewtype::Image,
|
||||||
|
Viewtype::Sticker,
|
||||||
|
Viewtype::Webxdc,
|
||||||
|
)
|
||||||
|
.await?
|
||||||
|
.len(),
|
||||||
|
3
|
||||||
|
);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -154,7 +154,9 @@ async fn on_configure_completed(
|
|||||||
Some(stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await);
|
Some(stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await);
|
||||||
chat::add_device_msg(context, None, Some(&mut msg))
|
chat::add_device_msg(context, None, Some(&mut msg))
|
||||||
.await
|
.await
|
||||||
.ok_or_log_msg(context, "Cannot add AEAP explanation");
|
.context("Cannot add AEAP explanation")
|
||||||
|
.log_err(context)
|
||||||
|
.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -575,7 +575,8 @@ pub(crate) async fn ephemeral_loop(context: &Context, interrupt_receiver: Receiv
|
|||||||
|
|
||||||
delete_expired_messages(context, time())
|
delete_expired_messages(context, time())
|
||||||
.await
|
.await
|
||||||
.ok_or_log(context);
|
.log_err(context)
|
||||||
|
.ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
26
src/imap.rs
26
src/imap.rs
@@ -14,7 +14,7 @@ use std::{
|
|||||||
use anyhow::{bail, format_err, Context as _, Result};
|
use anyhow::{bail, format_err, Context as _, Result};
|
||||||
use async_channel::Receiver;
|
use async_channel::Receiver;
|
||||||
use async_imap::types::{Fetch, Flag, Name, NameAttribute, UnsolicitedResponse};
|
use async_imap::types::{Fetch, Flag, Name, NameAttribute, UnsolicitedResponse};
|
||||||
use futures::StreamExt;
|
use futures::{StreamExt, TryStreamExt};
|
||||||
use num_traits::FromPrimitive;
|
use num_traits::FromPrimitive;
|
||||||
|
|
||||||
use crate::chat::{self, ChatId, ChatIdBlocked};
|
use crate::chat::{self, ChatId, ChatIdBlocked};
|
||||||
@@ -516,8 +516,7 @@ impl Imap {
|
|||||||
.uid_fetch("1:*", RFC724MID_UID)
|
.uid_fetch("1:*", RFC724MID_UID)
|
||||||
.await
|
.await
|
||||||
.with_context(|| format!("can't resync folder {folder}"))?;
|
.with_context(|| format!("can't resync folder {folder}"))?;
|
||||||
while let Some(fetch) = list.next().await {
|
while let Some(fetch) = list.try_next().await? {
|
||||||
let fetch = fetch?;
|
|
||||||
let headers = match get_fetch_headers(&fetch) {
|
let headers = match get_fetch_headers(&fetch) {
|
||||||
Ok(headers) => headers,
|
Ok(headers) => headers,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
@@ -660,7 +659,7 @@ impl Imap {
|
|||||||
.context("Error fetching UID")?;
|
.context("Error fetching UID")?;
|
||||||
|
|
||||||
let mut new_last_seen_uid = None;
|
let mut new_last_seen_uid = None;
|
||||||
while let Some(fetch) = list.next().await.transpose()? {
|
while let Some(fetch) = list.try_next().await? {
|
||||||
if fetch.message == mailbox.exists && fetch.uid.is_some() {
|
if fetch.message == mailbox.exists && fetch.uid.is_some() {
|
||||||
new_last_seen_uid = fetch.uid;
|
new_last_seen_uid = fetch.uid;
|
||||||
}
|
}
|
||||||
@@ -1198,8 +1197,11 @@ impl Imap {
|
|||||||
.await
|
.await
|
||||||
.context("failed to fetch flags")?;
|
.context("failed to fetch flags")?;
|
||||||
|
|
||||||
while let Some(fetch) = list.next().await {
|
while let Some(fetch) = list
|
||||||
let fetch = fetch.context("failed to get FETCH result")?;
|
.try_next()
|
||||||
|
.await
|
||||||
|
.context("failed to get FETCH result")?
|
||||||
|
{
|
||||||
let uid = if let Some(uid) = fetch.uid {
|
let uid = if let Some(uid) = fetch.uid {
|
||||||
uid
|
uid
|
||||||
} else {
|
} else {
|
||||||
@@ -1258,8 +1260,7 @@ impl Imap {
|
|||||||
.await
|
.await
|
||||||
.context("IMAP Could not fetch")?;
|
.context("IMAP Could not fetch")?;
|
||||||
|
|
||||||
while let Some(fetch) = list.next().await {
|
while let Some(msg) = list.try_next().await? {
|
||||||
let msg = fetch?;
|
|
||||||
match get_fetch_headers(&msg) {
|
match get_fetch_headers(&msg) {
|
||||||
Ok(headers) => {
|
Ok(headers) => {
|
||||||
if let Some(from) = mimeparser::get_from(&headers) {
|
if let Some(from) = mimeparser::get_from(&headers) {
|
||||||
@@ -1294,8 +1295,7 @@ impl Imap {
|
|||||||
.context("IMAP could not fetch")?;
|
.context("IMAP could not fetch")?;
|
||||||
|
|
||||||
let mut msgs = BTreeMap::new();
|
let mut msgs = BTreeMap::new();
|
||||||
while let Some(fetch) = list.next().await {
|
while let Some(msg) = list.try_next().await? {
|
||||||
let msg = fetch?;
|
|
||||||
if let Some(msg_uid) = msg.uid {
|
if let Some(msg_uid) = msg.uid {
|
||||||
// If the mailbox is not empty, results always include
|
// If the mailbox is not empty, results always include
|
||||||
// at least one UID, even if last_seen_uid+1 is past
|
// at least one UID, even if last_seen_uid+1 is past
|
||||||
@@ -1332,8 +1332,7 @@ impl Imap {
|
|||||||
.context("IMAP Could not fetch")?;
|
.context("IMAP Could not fetch")?;
|
||||||
|
|
||||||
let mut msgs = BTreeMap::new();
|
let mut msgs = BTreeMap::new();
|
||||||
while let Some(fetch) = list.next().await {
|
while let Some(msg) = list.try_next().await? {
|
||||||
let msg = fetch?;
|
|
||||||
if let Some(msg_uid) = msg.uid {
|
if let Some(msg_uid) = msg.uid {
|
||||||
msgs.insert((msg.internal_date(), msg_uid), msg);
|
msgs.insert((msg.internal_date(), msg_uid), msg);
|
||||||
}
|
}
|
||||||
@@ -1680,8 +1679,7 @@ impl Imap {
|
|||||||
let mut delimiter_is_default = true;
|
let mut delimiter_is_default = true;
|
||||||
let mut folder_configs = BTreeMap::new();
|
let mut folder_configs = BTreeMap::new();
|
||||||
|
|
||||||
while let Some(folder) = folders.next().await {
|
while let Some(folder) = folders.try_next().await? {
|
||||||
let folder = folder?;
|
|
||||||
info!(context, "Scanning folder: {:?}", folder);
|
info!(context, "Scanning folder: {:?}", folder);
|
||||||
|
|
||||||
// Update the delimiter iff there is a different one, but only once.
|
// Update the delimiter iff there is a different one, but only once.
|
||||||
|
|||||||
@@ -70,7 +70,9 @@ impl Imap {
|
|||||||
loop {
|
loop {
|
||||||
self.fetch_move_delete(context, folder.name(), folder_meaning)
|
self.fetch_move_delete(context, folder.name(), folder_meaning)
|
||||||
.await
|
.await
|
||||||
.ok_or_log_msg(context, "Can't fetch new msgs in scanned folder");
|
.context("Can't fetch new msgs in scanned folder")
|
||||||
|
.log_err(context)
|
||||||
|
.ok();
|
||||||
|
|
||||||
let session = self.session.as_mut().context("no session")?;
|
let session = self.session.as_mut().context("no session")?;
|
||||||
// If the server sent an unsocicited EXISTS during the fetch, we need to fetch again
|
// If the server sent an unsocicited EXISTS during the fetch, we need to fetch again
|
||||||
@@ -105,7 +107,11 @@ impl Imap {
|
|||||||
let list = session
|
let list = session
|
||||||
.list(Some(""), Some("*"))
|
.list(Some(""), Some("*"))
|
||||||
.await?
|
.await?
|
||||||
.filter_map(|f| async { f.ok_or_log_msg(context, "list_folders() can't get folder") });
|
.filter_map(|f| async {
|
||||||
|
f.context("list_folders() can't get folder")
|
||||||
|
.log_err(context)
|
||||||
|
.ok()
|
||||||
|
});
|
||||||
Ok(list.collect().await)
|
Ok(list.collect().await)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ pub async fn imex(
|
|||||||
let ongoing_guard = context.alloc_ongoing().await?;
|
let ongoing_guard = context.alloc_ongoing().await?;
|
||||||
|
|
||||||
let res = {
|
let res = {
|
||||||
let _guard = context.scheduler.pause(context.clone()).await;
|
let _guard = context.scheduler.pause(context.clone()).await?;
|
||||||
imex_inner(context, what, path, passphrase)
|
imex_inner(context, what, path, passphrase)
|
||||||
.race(async {
|
.race(async {
|
||||||
ongoing_guard.await;
|
ongoing_guard.await;
|
||||||
@@ -396,8 +396,7 @@ async fn imex_inner(
|
|||||||
export_backup(context, path, passphrase.unwrap_or_default()).await
|
export_backup(context, path, passphrase.unwrap_or_default()).await
|
||||||
}
|
}
|
||||||
ImexMode::ImportBackup => {
|
ImexMode::ImportBackup => {
|
||||||
import_backup(context, path, passphrase.unwrap_or_default()).await?;
|
import_backup(context, path, passphrase.unwrap_or_default()).await
|
||||||
context.sql.run_migrations(context).await
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -473,6 +472,7 @@ async fn import_backup(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
context.sql.run_migrations(context).await?;
|
||||||
delete_and_reset_all_device_msgs(context).await?;
|
delete_and_reset_all_device_msgs(context).await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -758,7 +758,7 @@ async fn export_database(context: &Context, dest: &Path, passphrase: String) ->
|
|||||||
.with_context(|| format!("path {} is not valid unicode", dest.display()))?;
|
.with_context(|| format!("path {} is not valid unicode", dest.display()))?;
|
||||||
|
|
||||||
context.sql.set_raw_config_int("backup_time", now).await?;
|
context.sql.set_raw_config_int("backup_time", now).await?;
|
||||||
sql::housekeeping(context).await.ok_or_log(context);
|
sql::housekeeping(context).await.log_err(context).ok();
|
||||||
context
|
context
|
||||||
.sql
|
.sql
|
||||||
.call_write(|conn| {
|
.call_write(|conn| {
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
//! getter can not connect to an impersonated provider and the provider does not offer the
|
//! getter can not connect to an impersonated provider and the provider does not offer the
|
||||||
//! download to an impersonated getter.
|
//! download to an impersonated getter.
|
||||||
|
|
||||||
use std::cmp::Ordering;
|
|
||||||
use std::future::Future;
|
use std::future::Future;
|
||||||
use std::net::Ipv4Addr;
|
use std::net::Ipv4Addr;
|
||||||
use std::ops::Deref;
|
use std::ops::Deref;
|
||||||
@@ -32,7 +31,8 @@ use std::task::Poll;
|
|||||||
|
|
||||||
use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
|
use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
|
||||||
use futures_lite::StreamExt;
|
use futures_lite::StreamExt;
|
||||||
use iroh::get::{DataStream, Options};
|
use iroh::blobs::Collection;
|
||||||
|
use iroh::get::DataStream;
|
||||||
use iroh::progress::ProgressEmitter;
|
use iroh::progress::ProgressEmitter;
|
||||||
use iroh::protocol::AuthToken;
|
use iroh::protocol::AuthToken;
|
||||||
use iroh::provider::{DataSource, Event, Provider, Ticket};
|
use iroh::provider::{DataSource, Event, Provider, Ticket};
|
||||||
@@ -43,6 +43,7 @@ use tokio::sync::broadcast::error::RecvError;
|
|||||||
use tokio::sync::{broadcast, Mutex};
|
use tokio::sync::{broadcast, Mutex};
|
||||||
use tokio::task::{JoinHandle, JoinSet};
|
use tokio::task::{JoinHandle, JoinSet};
|
||||||
use tokio_stream::wrappers::ReadDirStream;
|
use tokio_stream::wrappers::ReadDirStream;
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
use crate::blob::BlobDirContents;
|
use crate::blob::BlobDirContents;
|
||||||
use crate::chat::delete_and_reset_all_device_msgs;
|
use crate::chat::delete_and_reset_all_device_msgs;
|
||||||
@@ -52,6 +53,8 @@ use crate::{e2ee, EventType};
|
|||||||
|
|
||||||
use super::{export_database, DBFILE_BACKUP_NAME};
|
use super::{export_database, DBFILE_BACKUP_NAME};
|
||||||
|
|
||||||
|
const MAX_CONCURRENT_DIALS: u8 = 16;
|
||||||
|
|
||||||
/// Provide or send a backup of this device.
|
/// Provide or send a backup of this device.
|
||||||
///
|
///
|
||||||
/// This creates a backup of the current device and starts a service which offers another
|
/// This creates a backup of the current device and starts a service which offers another
|
||||||
@@ -71,6 +74,8 @@ pub struct BackupProvider {
|
|||||||
handle: JoinHandle<Result<()>>,
|
handle: JoinHandle<Result<()>>,
|
||||||
/// The ticket to retrieve the backup collection.
|
/// The ticket to retrieve the backup collection.
|
||||||
ticket: Ticket,
|
ticket: Ticket,
|
||||||
|
/// Guard to cancel the provider on drop.
|
||||||
|
_drop_guard: tokio_util::sync::DropGuard,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl BackupProvider {
|
impl BackupProvider {
|
||||||
@@ -115,10 +120,12 @@ impl BackupProvider {
|
|||||||
},
|
},
|
||||||
_ = &mut ongoing_guard => Err(format_err!("cancelled")),
|
_ = &mut ongoing_guard => Err(format_err!("cancelled")),
|
||||||
}?;
|
}?;
|
||||||
|
let drop_token = CancellationToken::new();
|
||||||
let handle = {
|
let handle = {
|
||||||
let context = context.clone();
|
let context = context.clone();
|
||||||
|
let drop_token = drop_token.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
let res = Self::watch_provider(&context, provider, ongoing_guard).await;
|
let res = Self::watch_provider(&context, provider, ongoing_guard, drop_token).await;
|
||||||
|
|
||||||
// Explicit drop to move the guards into this future
|
// Explicit drop to move the guards into this future
|
||||||
drop(paused_guard);
|
drop(paused_guard);
|
||||||
@@ -126,7 +133,11 @@ impl BackupProvider {
|
|||||||
res
|
res
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
Ok(Self { handle, ticket })
|
Ok(Self {
|
||||||
|
handle,
|
||||||
|
ticket,
|
||||||
|
_drop_guard: drop_token.drop_guard(),
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Creates the provider task.
|
/// Creates the provider task.
|
||||||
@@ -162,7 +173,7 @@ impl BackupProvider {
|
|||||||
.spawn()?;
|
.spawn()?;
|
||||||
context.emit_event(SendProgress::ProviderListening.into());
|
context.emit_event(SendProgress::ProviderListening.into());
|
||||||
info!(context, "Waiting for remote to connect");
|
info!(context, "Waiting for remote to connect");
|
||||||
let ticket = provider.ticket(hash);
|
let ticket = provider.ticket(hash)?;
|
||||||
Ok((provider, ticket))
|
Ok((provider, ticket))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,6 +191,7 @@ impl BackupProvider {
|
|||||||
context: &Context,
|
context: &Context,
|
||||||
mut provider: Provider,
|
mut provider: Provider,
|
||||||
mut cancel_token: OngoingGuard,
|
mut cancel_token: OngoingGuard,
|
||||||
|
drop_token: CancellationToken,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let mut events = provider.subscribe();
|
let mut events = provider.subscribe();
|
||||||
let mut total_size = 0;
|
let mut total_size = 0;
|
||||||
@@ -240,8 +252,12 @@ impl BackupProvider {
|
|||||||
},
|
},
|
||||||
_ = &mut cancel_token => {
|
_ = &mut cancel_token => {
|
||||||
provider.shutdown();
|
provider.shutdown();
|
||||||
break Err(anyhow!("BackupSender cancelled"));
|
break Err(anyhow!("BackupProvider cancelled"));
|
||||||
},
|
},
|
||||||
|
_ = drop_token.cancelled() => {
|
||||||
|
provider.shutdown();
|
||||||
|
break Err(anyhow!("BackupProvider dropped"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
match &res {
|
match &res {
|
||||||
@@ -361,7 +377,7 @@ pub async fn get_backup(context: &Context, qr: Qr) -> Result<()> {
|
|||||||
!context.is_configured().await?,
|
!context.is_configured().await?,
|
||||||
"Cannot import backups to accounts in use."
|
"Cannot import backups to accounts in use."
|
||||||
);
|
);
|
||||||
let _guard = context.scheduler.pause(context.clone()).await;
|
let _guard = context.scheduler.pause(context.clone()).await?;
|
||||||
|
|
||||||
// Acquire global "ongoing" mutex.
|
// Acquire global "ongoing" mutex.
|
||||||
let mut cancel_token = context.alloc_ongoing().await?;
|
let mut cancel_token = context.alloc_ongoing().await?;
|
||||||
@@ -373,122 +389,72 @@ pub async fn get_backup(context: &Context, qr: Qr) -> Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
|
async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
|
||||||
let mut ticket = match qr {
|
let ticket = match qr {
|
||||||
Qr::Backup { ticket } => ticket,
|
Qr::Backup { ticket } => ticket,
|
||||||
_ => bail!("QR code for backup must be of type DCBACKUP"),
|
_ => bail!("QR code for backup must be of type DCBACKUP"),
|
||||||
};
|
};
|
||||||
if ticket.addrs.is_empty() {
|
|
||||||
bail!("ticket is missing addresses to dial");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Crude sorting, most local wifi's are in the 192.168.0.0/24 range so this will try
|
match transfer_from_provider(context, &ticket).await {
|
||||||
// them first.
|
Ok(()) => {
|
||||||
ticket.addrs.sort_by(|a, b| {
|
context.sql.run_migrations(context).await?;
|
||||||
let a = a.to_string();
|
delete_and_reset_all_device_msgs(context).await?;
|
||||||
let b = b.to_string();
|
context.emit_event(ReceiveProgress::Completed.into());
|
||||||
if a.starts_with("192.168.") && !b.starts_with("192.168.") {
|
Ok(())
|
||||||
Ordering::Less
|
|
||||||
} else if b.starts_with("192.168.") && !a.starts_with("192.168.") {
|
|
||||||
Ordering::Greater
|
|
||||||
} else {
|
|
||||||
Ordering::Equal
|
|
||||||
}
|
}
|
||||||
});
|
Err(err) => {
|
||||||
for addr in &ticket.addrs {
|
// Clean up any blobs we already wrote.
|
||||||
let opts = Options {
|
let readdir = fs::read_dir(context.get_blobdir()).await?;
|
||||||
addr: *addr,
|
let mut readdir = ReadDirStream::new(readdir);
|
||||||
peer_id: Some(ticket.peer),
|
while let Some(dirent) = readdir.next().await {
|
||||||
keylog: false,
|
if let Ok(dirent) = dirent {
|
||||||
};
|
fs::remove_file(dirent.path()).await.ok();
|
||||||
info!(context, "attempting to contact {}", addr);
|
|
||||||
match transfer_from_provider(context, &ticket, opts).await {
|
|
||||||
Ok(_) => {
|
|
||||||
delete_and_reset_all_device_msgs(context).await?;
|
|
||||||
context.emit_event(ReceiveProgress::Completed.into());
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
Err(TransferError::ConnectionError(err)) => {
|
|
||||||
warn!(context, "Connection error: {err:#}.");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
Err(TransferError::Other(err)) => {
|
|
||||||
// Clean up any blobs we already wrote.
|
|
||||||
let readdir = fs::read_dir(context.get_blobdir()).await?;
|
|
||||||
let mut readdir = ReadDirStream::new(readdir);
|
|
||||||
while let Some(dirent) = readdir.next().await {
|
|
||||||
if let Ok(dirent) = dirent {
|
|
||||||
fs::remove_file(dirent.path()).await.ok();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
context.emit_event(ReceiveProgress::Failed.into());
|
|
||||||
return Err(err);
|
|
||||||
}
|
}
|
||||||
|
context.emit_event(ReceiveProgress::Failed.into());
|
||||||
|
Err(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(anyhow!("failed to contact provider"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Error during a single transfer attempt.
|
async fn transfer_from_provider(context: &Context, ticket: &Ticket) -> Result<()> {
|
||||||
///
|
|
||||||
/// Mostly exists to distinguish between `ConnectionError` and any other errors.
|
|
||||||
#[derive(Debug, thiserror::Error)]
|
|
||||||
enum TransferError {
|
|
||||||
#[error("connection error")]
|
|
||||||
ConnectionError(#[source] anyhow::Error),
|
|
||||||
#[error("other")]
|
|
||||||
Other(#[source] anyhow::Error),
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn transfer_from_provider(
|
|
||||||
context: &Context,
|
|
||||||
ticket: &Ticket,
|
|
||||||
opts: Options,
|
|
||||||
) -> Result<(), TransferError> {
|
|
||||||
let progress = ProgressEmitter::new(0, ReceiveProgress::max_blob_progress());
|
let progress = ProgressEmitter::new(0, ReceiveProgress::max_blob_progress());
|
||||||
spawn_progress_proxy(context.clone(), progress.subscribe());
|
spawn_progress_proxy(context.clone(), progress.subscribe());
|
||||||
let mut connected = false;
|
|
||||||
let on_connected = || {
|
let on_connected = || {
|
||||||
context.emit_event(ReceiveProgress::Connected.into());
|
context.emit_event(ReceiveProgress::Connected.into());
|
||||||
connected = true;
|
async { Ok(()) }
|
||||||
|
};
|
||||||
|
let on_collection = |collection: &Collection| {
|
||||||
|
context.emit_event(ReceiveProgress::CollectionReceived.into());
|
||||||
|
progress.set_total(collection.total_blobs_size());
|
||||||
async { Ok(()) }
|
async { Ok(()) }
|
||||||
};
|
};
|
||||||
let jobs = Mutex::new(JoinSet::default());
|
let jobs = Mutex::new(JoinSet::default());
|
||||||
let on_blob =
|
let on_blob =
|
||||||
|hash, reader, name| on_blob(context, &progress, &jobs, ticket, hash, reader, name);
|
|hash, reader, name| on_blob(context, &progress, &jobs, ticket, hash, reader, name);
|
||||||
let res = iroh::get::run(
|
|
||||||
ticket.hash,
|
// Perform the transfer.
|
||||||
ticket.token,
|
let keylog = false; // Do not enable rustls SSLKEYLOGFILE env var functionality
|
||||||
opts,
|
let stats = iroh::get::run_ticket(
|
||||||
|
ticket,
|
||||||
|
keylog,
|
||||||
|
MAX_CONCURRENT_DIALS,
|
||||||
on_connected,
|
on_connected,
|
||||||
|collection| {
|
on_collection,
|
||||||
context.emit_event(ReceiveProgress::CollectionReceived.into());
|
|
||||||
progress.set_total(collection.total_blobs_size());
|
|
||||||
async { Ok(()) }
|
|
||||||
},
|
|
||||||
on_blob,
|
on_blob,
|
||||||
)
|
)
|
||||||
.await;
|
.await?;
|
||||||
|
|
||||||
let mut jobs = jobs.lock().await;
|
let mut jobs = jobs.lock().await;
|
||||||
while let Some(job) = jobs.join_next().await {
|
while let Some(job) = jobs.join_next().await {
|
||||||
job.context("job failed").map_err(TransferError::Other)?;
|
job.context("job failed")?;
|
||||||
}
|
}
|
||||||
|
|
||||||
drop(progress);
|
drop(progress);
|
||||||
match res {
|
info!(
|
||||||
Ok(stats) => {
|
context,
|
||||||
info!(
|
"Backup transfer finished, transfer rate was {} Mbps.",
|
||||||
context,
|
stats.mbits()
|
||||||
"Backup transfer finished, transfer rate is {} Mbps.",
|
);
|
||||||
stats.mbits()
|
Ok(())
|
||||||
);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
Err(err) => match connected {
|
|
||||||
true => Err(TransferError::Other(err)),
|
|
||||||
false => Err(TransferError::ConnectionError(err)),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get callback when a blob is received from the provider.
|
/// Get callback when a blob is received from the provider.
|
||||||
@@ -530,7 +496,7 @@ async fn on_blob(
|
|||||||
|
|
||||||
if name.starts_with("db/") {
|
if name.starts_with("db/") {
|
||||||
let context = context.clone();
|
let context = context.clone();
|
||||||
let token = ticket.token.to_string();
|
let token = ticket.token().to_string();
|
||||||
jobs.lock().await.spawn(async move {
|
jobs.lock().await.spawn(async move {
|
||||||
if let Err(err) = context.sql.import(&path, token).await {
|
if let Err(err) = context.sql.import(&path, token).await {
|
||||||
error!(context, "cannot import database: {:#?}", err);
|
error!(context, "cannot import database: {:#?}", err);
|
||||||
@@ -692,4 +658,16 @@ mod tests {
|
|||||||
assert_eq!(out, EventType::ImexProgress(progress));
|
assert_eq!(out, EventType::ImexProgress(progress));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||||
|
async fn test_drop_provider() {
|
||||||
|
let mut tcm = TestContextManager::new();
|
||||||
|
let ctx = tcm.alice().await;
|
||||||
|
|
||||||
|
let provider = BackupProvider::prepare(&ctx).await.unwrap();
|
||||||
|
drop(provider);
|
||||||
|
ctx.evtracker
|
||||||
|
.get_matching(|ev| matches!(ev, EventType::ImexProgress(0)))
|
||||||
|
.await;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ use std::time::Duration;
|
|||||||
|
|
||||||
use anyhow::{ensure, Context as _, Result};
|
use anyhow::{ensure, Context as _, Result};
|
||||||
use async_channel::Receiver;
|
use async_channel::Receiver;
|
||||||
use bitflags::bitflags;
|
|
||||||
use quick_xml::events::{BytesEnd, BytesStart, BytesText};
|
use quick_xml::events::{BytesEnd, BytesStart, BytesText};
|
||||||
use tokio::time::timeout;
|
use tokio::time::timeout;
|
||||||
|
|
||||||
@@ -78,16 +77,15 @@ pub struct Kml {
|
|||||||
pub curr: Location,
|
pub curr: Location,
|
||||||
}
|
}
|
||||||
|
|
||||||
bitflags! {
|
#[derive(Default, Debug, Clone, PartialEq, Eq)]
|
||||||
#[derive(Default)]
|
enum KmlTag {
|
||||||
struct KmlTag: i32 {
|
#[default]
|
||||||
const UNDEFINED = 0x00;
|
Undefined,
|
||||||
const PLACEMARK = 0x01;
|
Placemark,
|
||||||
const TIMESTAMP = 0x02;
|
PlacemarkTimestamp,
|
||||||
const WHEN = 0x04;
|
PlacemarkTimestampWhen,
|
||||||
const POINT = 0x08;
|
PlacemarkPoint,
|
||||||
const COORDINATES = 0x10;
|
PlacemarkPointCoordinates,
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Kml {
|
impl Kml {
|
||||||
@@ -128,12 +126,14 @@ impl Kml {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn text_cb(&mut self, event: &BytesText) {
|
fn text_cb(&mut self, event: &BytesText) {
|
||||||
if self.tag.contains(KmlTag::WHEN) || self.tag.contains(KmlTag::COORDINATES) {
|
if self.tag == KmlTag::PlacemarkTimestampWhen
|
||||||
|
|| self.tag == KmlTag::PlacemarkPointCoordinates
|
||||||
|
{
|
||||||
let val = event.unescape().unwrap_or_default();
|
let val = event.unescape().unwrap_or_default();
|
||||||
|
|
||||||
let val = val.replace(['\n', '\r', '\t', ' '], "");
|
let val = val.replace(['\n', '\r', '\t', ' '], "");
|
||||||
|
|
||||||
if self.tag.contains(KmlTag::WHEN) && val.len() >= 19 {
|
if self.tag == KmlTag::PlacemarkTimestampWhen && val.len() >= 19 {
|
||||||
// YYYY-MM-DDTHH:MM:SSZ
|
// YYYY-MM-DDTHH:MM:SSZ
|
||||||
// 0 4 7 10 13 16 19
|
// 0 4 7 10 13 16 19
|
||||||
match chrono::NaiveDateTime::parse_from_str(&val, "%Y-%m-%dT%H:%M:%SZ") {
|
match chrono::NaiveDateTime::parse_from_str(&val, "%Y-%m-%dT%H:%M:%SZ") {
|
||||||
@@ -147,7 +147,7 @@ impl Kml {
|
|||||||
self.curr.timestamp = time();
|
self.curr.timestamp = time();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if self.tag.contains(KmlTag::COORDINATES) {
|
} else if self.tag == KmlTag::PlacemarkPointCoordinates {
|
||||||
let parts = val.splitn(2, ',').collect::<Vec<_>>();
|
let parts = val.splitn(2, ',').collect::<Vec<_>>();
|
||||||
if let [longitude, latitude] = &parts[..] {
|
if let [longitude, latitude] = &parts[..] {
|
||||||
self.curr.longitude = longitude.parse().unwrap_or_default();
|
self.curr.longitude = longitude.parse().unwrap_or_default();
|
||||||
@@ -162,17 +162,41 @@ impl Kml {
|
|||||||
.trim()
|
.trim()
|
||||||
.to_lowercase();
|
.to_lowercase();
|
||||||
|
|
||||||
if tag == "placemark" {
|
match self.tag {
|
||||||
if self.tag.contains(KmlTag::PLACEMARK)
|
KmlTag::PlacemarkTimestampWhen => {
|
||||||
&& 0 != self.curr.timestamp
|
if tag == "when" {
|
||||||
&& 0. != self.curr.latitude
|
self.tag = KmlTag::PlacemarkTimestamp
|
||||||
&& 0. != self.curr.longitude
|
}
|
||||||
{
|
|
||||||
self.locations
|
|
||||||
.push(std::mem::replace(&mut self.curr, Location::new()));
|
|
||||||
}
|
}
|
||||||
self.tag = KmlTag::UNDEFINED;
|
KmlTag::PlacemarkTimestamp => {
|
||||||
};
|
if tag == "timestamp" {
|
||||||
|
self.tag = KmlTag::Placemark
|
||||||
|
}
|
||||||
|
}
|
||||||
|
KmlTag::PlacemarkPointCoordinates => {
|
||||||
|
if tag == "coordinates" {
|
||||||
|
self.tag = KmlTag::PlacemarkPoint
|
||||||
|
}
|
||||||
|
}
|
||||||
|
KmlTag::PlacemarkPoint => {
|
||||||
|
if tag == "point" {
|
||||||
|
self.tag = KmlTag::Placemark
|
||||||
|
}
|
||||||
|
}
|
||||||
|
KmlTag::Placemark => {
|
||||||
|
if tag == "placemark" {
|
||||||
|
if 0 != self.curr.timestamp
|
||||||
|
&& 0. != self.curr.latitude
|
||||||
|
&& 0. != self.curr.longitude
|
||||||
|
{
|
||||||
|
self.locations
|
||||||
|
.push(std::mem::replace(&mut self.curr, Location::new()));
|
||||||
|
}
|
||||||
|
self.tag = KmlTag::Undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
KmlTag::Undefined => {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn starttag_cb<B: std::io::BufRead>(
|
fn starttag_cb<B: std::io::BufRead>(
|
||||||
@@ -196,19 +220,19 @@ impl Kml {
|
|||||||
.map(|a| a.into_owned());
|
.map(|a| a.into_owned());
|
||||||
}
|
}
|
||||||
} else if tag == "placemark" {
|
} else if tag == "placemark" {
|
||||||
self.tag = KmlTag::PLACEMARK;
|
self.tag = KmlTag::Placemark;
|
||||||
self.curr.timestamp = 0;
|
self.curr.timestamp = 0;
|
||||||
self.curr.latitude = 0.0;
|
self.curr.latitude = 0.0;
|
||||||
self.curr.longitude = 0.0;
|
self.curr.longitude = 0.0;
|
||||||
self.curr.accuracy = 0.0
|
self.curr.accuracy = 0.0
|
||||||
} else if tag == "timestamp" && self.tag.contains(KmlTag::PLACEMARK) {
|
} else if tag == "timestamp" && self.tag == KmlTag::Placemark {
|
||||||
self.tag = KmlTag::PLACEMARK | KmlTag::TIMESTAMP
|
self.tag = KmlTag::PlacemarkTimestamp;
|
||||||
} else if tag == "when" && self.tag.contains(KmlTag::TIMESTAMP) {
|
} else if tag == "when" && self.tag == KmlTag::PlacemarkTimestamp {
|
||||||
self.tag = KmlTag::PLACEMARK | KmlTag::TIMESTAMP | KmlTag::WHEN
|
self.tag = KmlTag::PlacemarkTimestampWhen;
|
||||||
} else if tag == "point" && self.tag.contains(KmlTag::PLACEMARK) {
|
} else if tag == "point" && self.tag == KmlTag::Placemark {
|
||||||
self.tag = KmlTag::PLACEMARK | KmlTag::POINT
|
self.tag = KmlTag::PlacemarkPoint;
|
||||||
} else if tag == "coordinates" && self.tag.contains(KmlTag::POINT) {
|
} else if tag == "coordinates" && self.tag == KmlTag::PlacemarkPoint {
|
||||||
self.tag = KmlTag::PLACEMARK | KmlTag::POINT | KmlTag::COORDINATES;
|
self.tag = KmlTag::PlacemarkPointCoordinates;
|
||||||
if let Some(acc) = event.attributes().find(|attr| {
|
if let Some(acc) = event.attributes().find(|attr| {
|
||||||
attr.as_ref()
|
attr.as_ref()
|
||||||
.map(|a| {
|
.map(|a| {
|
||||||
|
|||||||
59
src/log.rs
59
src/log.rs
@@ -65,9 +65,6 @@ pub trait LogExt<T, E>
|
|||||||
where
|
where
|
||||||
Self: std::marker::Sized,
|
Self: std::marker::Sized,
|
||||||
{
|
{
|
||||||
#[track_caller]
|
|
||||||
fn log_err_inner(self, context: &Context, msg: Option<&str>) -> Result<T, E>;
|
|
||||||
|
|
||||||
/// Emits a warning if the receiver contains an Err value.
|
/// Emits a warning if the receiver contains an Err value.
|
||||||
///
|
///
|
||||||
/// Thanks to the [track_caller](https://blog.rust-lang.org/2020/08/27/Rust-1.46.0.html#track_caller)
|
/// Thanks to the [track_caller](https://blog.rust-lang.org/2020/08/27/Rust-1.46.0.html#track_caller)
|
||||||
@@ -79,70 +76,20 @@ where
|
|||||||
/// like warn!(), since the file!() and line!() macros don't work with track_caller)
|
/// like warn!(), since the file!() and line!() macros don't work with track_caller)
|
||||||
/// See <https://github.com/rust-lang/rust/issues/78840> for progress on this.
|
/// See <https://github.com/rust-lang/rust/issues/78840> for progress on this.
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
fn log_err(self, context: &Context, msg: &str) -> Result<T, E> {
|
fn log_err(self, context: &Context) -> Result<T, E>;
|
||||||
self.log_err_inner(context, Some(msg))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Emits a warning if the receiver contains an Err value and returns an [`Option<T>`].
|
|
||||||
///
|
|
||||||
/// Example:
|
|
||||||
/// ```text
|
|
||||||
/// if let Err(e) = do_something() {
|
|
||||||
/// warn!(context, "{:#}", e);
|
|
||||||
/// }
|
|
||||||
/// ```
|
|
||||||
/// is equivalent to:
|
|
||||||
/// ```text
|
|
||||||
/// do_something().ok_or_log(context);
|
|
||||||
/// ```
|
|
||||||
///
|
|
||||||
/// For a note on the `track_caller` feature, see the doc comment on `log_err()`.
|
|
||||||
#[track_caller]
|
|
||||||
fn ok_or_log(self, context: &Context) -> Option<T> {
|
|
||||||
self.log_err_inner(context, None).ok()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Like `ok_or_log()`, but you can pass an extra message that is prepended in the log.
|
|
||||||
///
|
|
||||||
/// Example:
|
|
||||||
/// ```text
|
|
||||||
/// if let Err(e) = do_something() {
|
|
||||||
/// warn!(context, "Something went wrong: {:#}", e);
|
|
||||||
/// }
|
|
||||||
/// ```
|
|
||||||
/// is equivalent to:
|
|
||||||
/// ```text
|
|
||||||
/// do_something().ok_or_log_msg(context, "Something went wrong");
|
|
||||||
/// ```
|
|
||||||
/// and is also equivalent to:
|
|
||||||
/// ```text
|
|
||||||
/// use anyhow::Context as _;
|
|
||||||
/// do_something().context("Something went wrong").ok_or_log(context);
|
|
||||||
/// ```
|
|
||||||
///
|
|
||||||
/// For a note on the `track_caller` feature, see the doc comment on `log_err()`.
|
|
||||||
#[track_caller]
|
|
||||||
fn ok_or_log_msg(self, context: &Context, msg: &'static str) -> Option<T> {
|
|
||||||
self.log_err_inner(context, Some(msg)).ok()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<T, E: std::fmt::Display> LogExt<T, E> for Result<T, E> {
|
impl<T, E: std::fmt::Display> LogExt<T, E> for Result<T, E> {
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
fn log_err_inner(self, context: &Context, msg: Option<&str>) -> Result<T, E> {
|
fn log_err(self, context: &Context) -> Result<T, E> {
|
||||||
if let Err(e) = &self {
|
if let Err(e) = &self {
|
||||||
let location = std::panic::Location::caller();
|
let location = std::panic::Location::caller();
|
||||||
|
|
||||||
let separator = if msg.is_none() { "" } else { ": " };
|
|
||||||
let msg = msg.unwrap_or_default();
|
|
||||||
|
|
||||||
// We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
|
// We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
|
||||||
let full = format!(
|
let full = format!(
|
||||||
"{file}:{line}: {msg}{separator}{e:#}",
|
"{file}:{line}: {e:#}",
|
||||||
file = location.file(),
|
file = location.file(),
|
||||||
line = location.line(),
|
line = location.line(),
|
||||||
msg = msg,
|
|
||||||
separator = separator,
|
|
||||||
e = e
|
e = e
|
||||||
);
|
);
|
||||||
// We can't use the warn!() macro here as the file!() and line!() macros
|
// We can't use the warn!() macro here as the file!() and line!() macros
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ use std::path::{Path, PathBuf};
|
|||||||
|
|
||||||
use anyhow::{ensure, format_err, Context as _, Result};
|
use anyhow::{ensure, format_err, Context as _, Result};
|
||||||
use deltachat_derive::{FromSql, ToSql};
|
use deltachat_derive::{FromSql, ToSql};
|
||||||
use rusqlite::types::ValueRef;
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::chat::{self, Chat, ChatId};
|
use crate::chat::{self, Chat, ChatId};
|
||||||
@@ -29,8 +28,8 @@ use crate::sql;
|
|||||||
use crate::stock_str;
|
use crate::stock_str;
|
||||||
use crate::summary::Summary;
|
use crate::summary::Summary;
|
||||||
use crate::tools::{
|
use crate::tools::{
|
||||||
create_smeared_timestamp, get_filebytes, get_filemeta, gm2local_offset, read_file, time,
|
buf_compress, buf_decompress, create_smeared_timestamp, get_filebytes, get_filemeta,
|
||||||
timestamp_to_str, truncate,
|
gm2local_offset, read_file, time, timestamp_to_str, truncate,
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Message ID, including reserved IDs.
|
/// Message ID, including reserved IDs.
|
||||||
@@ -1350,21 +1349,52 @@ pub(crate) fn guess_msgtype_from_suffix(path: &Path) -> Option<(Viewtype, &str)>
|
|||||||
/// e.g. because of save_mime_headers is not set
|
/// e.g. because of save_mime_headers is not set
|
||||||
/// or the message is not incoming.
|
/// or the message is not incoming.
|
||||||
pub async fn get_mime_headers(context: &Context, msg_id: MsgId) -> Result<Vec<u8>> {
|
pub async fn get_mime_headers(context: &Context, msg_id: MsgId) -> Result<Vec<u8>> {
|
||||||
let headers = context
|
let (headers, compressed) = context
|
||||||
.sql
|
.sql
|
||||||
.query_row(
|
.query_row(
|
||||||
"SELECT mime_headers FROM msgs WHERE id=?;",
|
"SELECT mime_headers, mime_compressed FROM msgs WHERE id=?",
|
||||||
paramsv![msg_id],
|
paramsv![msg_id],
|
||||||
|row| {
|
|row| {
|
||||||
row.get(0).or_else(|err| match row.get_ref(0)? {
|
let headers = sql::row_get_vec(row, 0)?;
|
||||||
ValueRef::Null => Ok(Vec::new()),
|
let compressed: bool = row.get(1)?;
|
||||||
ValueRef::Text(text) => Ok(text.to_vec()),
|
Ok((headers, compressed))
|
||||||
ValueRef::Blob(blob) => Ok(blob.to_vec()),
|
|
||||||
ValueRef::Integer(_) | ValueRef::Real(_) => Err(err),
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
if compressed {
|
||||||
|
return buf_decompress(&headers);
|
||||||
|
}
|
||||||
|
|
||||||
|
let headers2 = headers.clone();
|
||||||
|
let compressed = match tokio::task::block_in_place(move || buf_compress(&headers2)) {
|
||||||
|
Err(e) => {
|
||||||
|
warn!(context, "get_mime_headers: buf_compress() failed: {}", e);
|
||||||
|
return Ok(headers);
|
||||||
|
}
|
||||||
|
Ok(o) => o,
|
||||||
|
};
|
||||||
|
let update = |conn: &mut rusqlite::Connection| {
|
||||||
|
match conn.execute(
|
||||||
|
"\
|
||||||
|
UPDATE msgs SET mime_headers=?, mime_compressed=1 \
|
||||||
|
WHERE id=? AND mime_headers!='' AND mime_compressed=0",
|
||||||
|
params![compressed, msg_id],
|
||||||
|
) {
|
||||||
|
Ok(rows_updated) => ensure!(rows_updated <= 1),
|
||||||
|
Err(e) => {
|
||||||
|
warn!(context, "get_mime_headers: UPDATE failed: {}", e);
|
||||||
|
return Err(e.into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
};
|
||||||
|
if let Err(e) = context.sql.call_write(update).await {
|
||||||
|
warn!(
|
||||||
|
context,
|
||||||
|
"get_mime_headers: failed to update mime_headers: {}", e
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(headers)
|
Ok(headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1413,8 +1443,6 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
|
|||||||
context.emit_msgs_changed_without_ids();
|
context.emit_msgs_changed_without_ids();
|
||||||
|
|
||||||
// Run housekeeping to delete unused blobs.
|
// Run housekeeping to delete unused blobs.
|
||||||
// We need to use set_raw_config() here since with set_config() it
|
|
||||||
// wouldn't compile ("recursion in an `async fn`")
|
|
||||||
context.set_config(Config::LastHousekeeping, None).await?;
|
context.set_config(Config::LastHousekeeping, None).await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,16 +27,13 @@ use crate::simplify::escape_message_footer_marks;
|
|||||||
use crate::stock_str;
|
use crate::stock_str;
|
||||||
use crate::tools::IsNoneOrEmpty;
|
use crate::tools::IsNoneOrEmpty;
|
||||||
use crate::tools::{
|
use crate::tools::{
|
||||||
create_outgoing_rfc724_mid, create_smeared_timestamp, get_filebytes, remove_subject_prefix,
|
create_outgoing_rfc724_mid, create_smeared_timestamp, remove_subject_prefix, time,
|
||||||
time,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// attachments of 25 mb brutto should work on the majority of providers
|
// attachments of 25 mb brutto should work on the majority of providers
|
||||||
// (brutto examples: web.de=50, 1&1=40, t-online.de=32, gmail=25, posteo=50, yahoo=25, all-inkl=100).
|
// (brutto examples: web.de=50, 1&1=40, t-online.de=32, gmail=25, posteo=50, yahoo=25, all-inkl=100).
|
||||||
// as an upper limit, we double the size; the core won't send messages larger than this
|
|
||||||
// to get the netto sizes, we subtract 1 mb header-overhead and the base64-overhead.
|
// to get the netto sizes, we subtract 1 mb header-overhead and the base64-overhead.
|
||||||
pub const RECOMMENDED_FILE_SIZE: u64 = 24 * 1024 * 1024 / 4 * 3;
|
pub const RECOMMENDED_FILE_SIZE: u64 = 24 * 1024 * 1024 / 4 * 3;
|
||||||
const UPPER_LIMIT_FILE_SIZE: u64 = 49 * 1024 * 1024 / 4 * 3;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub enum Loaded {
|
pub enum Loaded {
|
||||||
@@ -1211,15 +1208,8 @@ impl<'a> MimeFactory<'a> {
|
|||||||
|
|
||||||
// add attachment part
|
// add attachment part
|
||||||
if self.msg.viewtype.has_file() {
|
if self.msg.viewtype.has_file() {
|
||||||
if !is_file_size_okay(context, self.msg).await? {
|
let (file_part, _) = build_body_file(context, self.msg, "").await?;
|
||||||
bail!(
|
parts.push(file_part);
|
||||||
"Message exceeds the recommended {} MB.",
|
|
||||||
RECOMMENDED_FILE_SIZE / 1_000_000,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
let (file_part, _) = build_body_file(context, self.msg, "").await?;
|
|
||||||
parts.push(file_part);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(meta_part) = meta_part {
|
if let Some(meta_part) = meta_part {
|
||||||
@@ -1483,16 +1473,6 @@ fn recipients_contain_addr(recipients: &[(String, String)], addr: &str) -> bool
|
|||||||
.any(|(_, cur)| cur.to_lowercase() == addr_lc)
|
.any(|(_, cur)| cur.to_lowercase() == addr_lc)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn is_file_size_okay(context: &Context, msg: &Message) -> Result<bool> {
|
|
||||||
match msg.param.get_path(Param::File, context)? {
|
|
||||||
Some(path) => {
|
|
||||||
let bytes = get_filebytes(context, &path).await?;
|
|
||||||
Ok(bytes <= UPPER_LIMIT_FILE_SIZE)
|
|
||||||
}
|
|
||||||
None => Ok(false),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn render_rfc724_mid(rfc724_mid: &str) -> String {
|
fn render_rfc724_mid(rfc724_mid: &str) -> String {
|
||||||
let rfc724_mid = rfc724_mid.trim().to_string();
|
let rfc724_mid = rfc724_mid.trim().to_string();
|
||||||
|
|
||||||
|
|||||||
@@ -1283,7 +1283,7 @@ impl MimeMessage {
|
|||||||
if !key.details.users.iter().any(|user| {
|
if !key.details.users.iter().any(|user| {
|
||||||
user.id
|
user.id
|
||||||
.id()
|
.id()
|
||||||
.ends_with(&(String::from("<") + &peerstate.addr + ">"))
|
.ends_with((String::from("<") + &peerstate.addr + ">").as_bytes())
|
||||||
}) {
|
}) {
|
||||||
return Ok(false);
|
return Ok(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ use pgp::composed::{
|
|||||||
Deserializable, KeyType as PgpKeyType, Message, SecretKeyParamsBuilder, SignedPublicKey,
|
Deserializable, KeyType as PgpKeyType, Message, SecretKeyParamsBuilder, SignedPublicKey,
|
||||||
SignedPublicSubKey, SignedSecretKey, StandaloneSignature, SubkeyParamsBuilder,
|
SignedPublicSubKey, SignedSecretKey, StandaloneSignature, SubkeyParamsBuilder,
|
||||||
};
|
};
|
||||||
use pgp::crypto::{HashAlgorithm, SymmetricKeyAlgorithm};
|
use pgp::crypto::hash::HashAlgorithm;
|
||||||
|
use pgp::crypto::sym::SymmetricKeyAlgorithm;
|
||||||
use pgp::types::{
|
use pgp::types::{
|
||||||
CompressionAlgorithm, KeyTrait, Mpi, PublicKeyTrait, SecretKeyTrait, StringToKey,
|
CompressionAlgorithm, KeyTrait, Mpi, PublicKeyTrait, SecretKeyTrait, StringToKey,
|
||||||
};
|
};
|
||||||
@@ -50,7 +51,7 @@ impl<'a> KeyTrait for SignedPublicKeyOrSubkey<'a> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn algorithm(&self) -> pgp::crypto::PublicKeyAlgorithm {
|
fn algorithm(&self) -> pgp::crypto::public_key::PublicKeyAlgorithm {
|
||||||
match self {
|
match self {
|
||||||
Self::Key(k) => k.algorithm(),
|
Self::Key(k) => k.algorithm(),
|
||||||
Self::Subkey(k) => k.algorithm(),
|
Self::Subkey(k) => k.algorithm(),
|
||||||
@@ -297,7 +298,7 @@ pub fn pk_decrypt(
|
|||||||
|
|
||||||
let skeys: Vec<&SignedSecretKey> = private_keys_for_decryption.keys().iter().collect();
|
let skeys: Vec<&SignedSecretKey> = private_keys_for_decryption.keys().iter().collect();
|
||||||
|
|
||||||
let (decryptor, _) = msg.decrypt(|| "".into(), || "".into(), &skeys[..])?;
|
let (decryptor, _) = msg.decrypt(|| "".into(), &skeys[..])?;
|
||||||
let msgs = decryptor.collect::<pgp::errors::Result<Vec<_>>>()?;
|
let msgs = decryptor.collect::<pgp::errors::Result<Vec<_>>>()?;
|
||||||
|
|
||||||
if let Some(msg) = msgs.into_iter().next() {
|
if let Some(msg) = msgs.into_iter().next() {
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ use crate::reaction::{set_msg_reaction, Reaction};
|
|||||||
use crate::securejoin::{self, handle_securejoin_handshake, observe_securejoin_on_other_device};
|
use crate::securejoin::{self, handle_securejoin_handshake, observe_securejoin_on_other_device};
|
||||||
use crate::sql;
|
use crate::sql;
|
||||||
use crate::stock_str;
|
use crate::stock_str;
|
||||||
use crate::tools::{extract_grpid_from_rfc724_mid, smeared_time};
|
use crate::tools::{buf_compress, extract_grpid_from_rfc724_mid, smeared_time};
|
||||||
use crate::{contact, imap};
|
use crate::{contact, imap};
|
||||||
|
|
||||||
/// This is the struct that is returned after receiving one email (aka MIME message).
|
/// This is the struct that is returned after receiving one email (aka MIME message).
|
||||||
@@ -691,7 +691,8 @@ async fn add_parts(
|
|||||||
} else if allow_creation {
|
} else if allow_creation {
|
||||||
if let Ok(chat) = ChatIdBlocked::get_for_contact(context, from_id, create_blocked)
|
if let Ok(chat) = ChatIdBlocked::get_for_contact(context, from_id, create_blocked)
|
||||||
.await
|
.await
|
||||||
.log_err(context, "Failed to get (new) chat for contact")
|
.context("Failed to get (new) chat for contact")
|
||||||
|
.log_err(context)
|
||||||
{
|
{
|
||||||
chat_id = Some(chat.id);
|
chat_id = Some(chat.id);
|
||||||
chat_id_blocked = chat.blocked;
|
chat_id_blocked = chat.blocked;
|
||||||
@@ -843,7 +844,8 @@ async fn add_parts(
|
|||||||
// maybe an Autocrypt Setup Message
|
// maybe an Autocrypt Setup Message
|
||||||
if let Ok(chat) = ChatIdBlocked::get_for_contact(context, ContactId::SELF, Blocked::Not)
|
if let Ok(chat) = ChatIdBlocked::get_for_contact(context, ContactId::SELF, Blocked::Not)
|
||||||
.await
|
.await
|
||||||
.log_err(context, "Failed to get (new) chat for contact")
|
.context("Failed to get (new) chat for contact")
|
||||||
|
.log_err(context)
|
||||||
{
|
{
|
||||||
chat_id = Some(chat.id);
|
chat_id = Some(chat.id);
|
||||||
chat_id_blocked = chat.blocked;
|
chat_id_blocked = chat.blocked;
|
||||||
@@ -1063,11 +1065,12 @@ async fn add_parts(
|
|||||||
let mut save_mime_modified = mime_parser.is_mime_modified;
|
let mut save_mime_modified = mime_parser.is_mime_modified;
|
||||||
|
|
||||||
let mime_headers = if save_mime_headers || save_mime_modified {
|
let mime_headers = if save_mime_headers || save_mime_modified {
|
||||||
if mime_parser.was_encrypted() && !mime_parser.decoded_data.is_empty() {
|
let headers = if mime_parser.was_encrypted() && !mime_parser.decoded_data.is_empty() {
|
||||||
mime_parser.decoded_data.clone()
|
mime_parser.decoded_data.clone()
|
||||||
} else {
|
} else {
|
||||||
imf_raw.to_vec()
|
imf_raw.to_vec()
|
||||||
}
|
};
|
||||||
|
tokio::task::block_in_place(move || buf_compress(&headers))?
|
||||||
} else {
|
} else {
|
||||||
Vec::new()
|
Vec::new()
|
||||||
};
|
};
|
||||||
@@ -1150,7 +1153,7 @@ INSERT INTO msgs
|
|||||||
from_id, to_id, timestamp, timestamp_sent,
|
from_id, to_id, timestamp, timestamp_sent,
|
||||||
timestamp_rcvd, type, state, msgrmsg,
|
timestamp_rcvd, type, state, msgrmsg,
|
||||||
txt, subject, txt_raw, param,
|
txt, subject, txt_raw, param,
|
||||||
bytes, mime_headers, mime_in_reply_to,
|
bytes, mime_headers, mime_compressed, mime_in_reply_to,
|
||||||
mime_references, mime_modified, error, ephemeral_timer,
|
mime_references, mime_modified, error, ephemeral_timer,
|
||||||
ephemeral_timestamp, download_state, hop_info
|
ephemeral_timestamp, download_state, hop_info
|
||||||
)
|
)
|
||||||
@@ -1159,7 +1162,7 @@ INSERT INTO msgs
|
|||||||
?, ?, ?, ?,
|
?, ?, ?, ?,
|
||||||
?, ?, ?, ?,
|
?, ?, ?, ?,
|
||||||
?, ?, ?, ?,
|
?, ?, ?, ?,
|
||||||
?, ?, ?, ?,
|
?, ?, ?, ?, 1,
|
||||||
?, ?, ?, ?,
|
?, ?, ?, ?,
|
||||||
?, ?, ?, ?
|
?, ?, ?, ?
|
||||||
)
|
)
|
||||||
@@ -1168,7 +1171,8 @@ SET rfc724_mid=excluded.rfc724_mid, chat_id=excluded.chat_id,
|
|||||||
from_id=excluded.from_id, to_id=excluded.to_id, timestamp=excluded.timestamp, timestamp_sent=excluded.timestamp_sent,
|
from_id=excluded.from_id, to_id=excluded.to_id, timestamp=excluded.timestamp, timestamp_sent=excluded.timestamp_sent,
|
||||||
timestamp_rcvd=excluded.timestamp_rcvd, type=excluded.type, state=excluded.state, msgrmsg=excluded.msgrmsg,
|
timestamp_rcvd=excluded.timestamp_rcvd, type=excluded.type, state=excluded.state, msgrmsg=excluded.msgrmsg,
|
||||||
txt=excluded.txt, subject=excluded.subject, txt_raw=excluded.txt_raw, param=excluded.param,
|
txt=excluded.txt, subject=excluded.subject, txt_raw=excluded.txt_raw, param=excluded.param,
|
||||||
bytes=excluded.bytes, mime_headers=excluded.mime_headers, mime_in_reply_to=excluded.mime_in_reply_to,
|
bytes=excluded.bytes, mime_headers=excluded.mime_headers,
|
||||||
|
mime_compressed=excluded.mime_compressed, mime_in_reply_to=excluded.mime_in_reply_to,
|
||||||
mime_references=excluded.mime_references, mime_modified=excluded.mime_modified, error=excluded.error, ephemeral_timer=excluded.ephemeral_timer,
|
mime_references=excluded.mime_references, mime_modified=excluded.mime_modified, error=excluded.error, ephemeral_timer=excluded.ephemeral_timer,
|
||||||
ephemeral_timestamp=excluded.ephemeral_timestamp, download_state=excluded.download_state, hop_info=excluded.hop_info
|
ephemeral_timestamp=excluded.ephemeral_timestamp, download_state=excluded.download_state, hop_info=excluded.hop_info
|
||||||
"#)?;
|
"#)?;
|
||||||
|
|||||||
149
src/scheduler.rs
149
src/scheduler.rs
@@ -1,7 +1,8 @@
|
|||||||
use std::iter::{self, once};
|
use std::iter::{self, once};
|
||||||
|
use std::num::NonZeroUsize;
|
||||||
use std::sync::atomic::Ordering;
|
use std::sync::atomic::Ordering;
|
||||||
|
|
||||||
use anyhow::{bail, Context as _, Result};
|
use anyhow::{bail, Context as _, Error, Result};
|
||||||
use async_channel::{self as channel, Receiver, Sender};
|
use async_channel::{self as channel, Receiver, Sender};
|
||||||
use futures::future::try_join_all;
|
use futures::future::try_join_all;
|
||||||
use futures_lite::FutureExt;
|
use futures_lite::FutureExt;
|
||||||
@@ -43,15 +44,18 @@ impl SchedulerState {
|
|||||||
/// Whether the scheduler is currently running.
|
/// Whether the scheduler is currently running.
|
||||||
pub(crate) async fn is_running(&self) -> bool {
|
pub(crate) async fn is_running(&self) -> bool {
|
||||||
let inner = self.inner.read().await;
|
let inner = self.inner.read().await;
|
||||||
inner.scheduler.is_some()
|
matches!(*inner, InnerSchedulerState::Started(_))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Starts the scheduler if it is not yet started.
|
/// Starts the scheduler if it is not yet started.
|
||||||
pub(crate) async fn start(&self, context: Context) {
|
pub(crate) async fn start(&self, context: Context) {
|
||||||
let mut inner = self.inner.write().await;
|
let mut inner = self.inner.write().await;
|
||||||
inner.started = true;
|
match *inner {
|
||||||
if inner.scheduler.is_none() && !inner.paused {
|
InnerSchedulerState::Started(_) => (),
|
||||||
Self::do_start(inner, context).await;
|
InnerSchedulerState::Stopped => Self::do_start(inner, context).await,
|
||||||
|
InnerSchedulerState::Paused {
|
||||||
|
ref mut started, ..
|
||||||
|
} => *started = true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,7 +64,7 @@ impl SchedulerState {
|
|||||||
info!(context, "starting IO");
|
info!(context, "starting IO");
|
||||||
let ctx = context.clone();
|
let ctx = context.clone();
|
||||||
match Scheduler::start(context).await {
|
match Scheduler::start(context).await {
|
||||||
Ok(scheduler) => inner.scheduler = Some(scheduler),
|
Ok(scheduler) => *inner = InnerSchedulerState::Started(scheduler),
|
||||||
Err(err) => error!(&ctx, "Failed to start IO: {:#}", err),
|
Err(err) => error!(&ctx, "Failed to start IO: {:#}", err),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -68,12 +72,23 @@ impl SchedulerState {
|
|||||||
/// Stops the scheduler if it is currently running.
|
/// Stops the scheduler if it is currently running.
|
||||||
pub(crate) async fn stop(&self, context: &Context) {
|
pub(crate) async fn stop(&self, context: &Context) {
|
||||||
let mut inner = self.inner.write().await;
|
let mut inner = self.inner.write().await;
|
||||||
inner.started = false;
|
match *inner {
|
||||||
Self::do_stop(inner, context).await;
|
InnerSchedulerState::Started(_) => {
|
||||||
|
Self::do_stop(inner, context, InnerSchedulerState::Stopped).await
|
||||||
|
}
|
||||||
|
InnerSchedulerState::Stopped => (),
|
||||||
|
InnerSchedulerState::Paused {
|
||||||
|
ref mut started, ..
|
||||||
|
} => *started = false,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Stops the scheduler if it is currently running.
|
/// Stops the scheduler if it is currently running.
|
||||||
async fn do_stop(mut inner: RwLockWriteGuard<'_, InnerSchedulerState>, context: &Context) {
|
async fn do_stop(
|
||||||
|
mut inner: RwLockWriteGuard<'_, InnerSchedulerState>,
|
||||||
|
context: &Context,
|
||||||
|
new_state: InnerSchedulerState,
|
||||||
|
) {
|
||||||
// Sending an event wakes up event pollers (get_next_event)
|
// Sending an event wakes up event pollers (get_next_event)
|
||||||
// so the caller of stop_io() can arrange for proper termination.
|
// so the caller of stop_io() can arrange for proper termination.
|
||||||
// For this, the caller needs to instruct the event poller
|
// For this, the caller needs to instruct the event poller
|
||||||
@@ -83,8 +98,10 @@ impl SchedulerState {
|
|||||||
if let Some(debug_logging) = context.debug_logging.read().await.as_ref() {
|
if let Some(debug_logging) = context.debug_logging.read().await.as_ref() {
|
||||||
debug_logging.loop_handle.abort();
|
debug_logging.loop_handle.abort();
|
||||||
}
|
}
|
||||||
if let Some(scheduler) = inner.scheduler.take() {
|
let prev_state = std::mem::replace(&mut *inner, new_state);
|
||||||
scheduler.stop(context).await;
|
match prev_state {
|
||||||
|
InnerSchedulerState::Started(scheduler) => scheduler.stop(context).await,
|
||||||
|
InnerSchedulerState::Stopped | InnerSchedulerState::Paused { .. } => (),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,22 +113,63 @@ impl SchedulerState {
|
|||||||
/// If in the meantime [`SchedulerState::start`] or [`SchedulerState::stop`] is called
|
/// If in the meantime [`SchedulerState::start`] or [`SchedulerState::stop`] is called
|
||||||
/// resume will do the right thing and restore the scheduler to the state requested by
|
/// resume will do the right thing and restore the scheduler to the state requested by
|
||||||
/// the last call.
|
/// the last call.
|
||||||
pub(crate) async fn pause<'a>(&'_ self, context: Context) -> IoPausedGuard {
|
pub(crate) async fn pause<'a>(&'_ self, context: Context) -> Result<IoPausedGuard> {
|
||||||
{
|
{
|
||||||
let mut inner = self.inner.write().await;
|
let mut inner = self.inner.write().await;
|
||||||
inner.paused = true;
|
match *inner {
|
||||||
Self::do_stop(inner, &context).await;
|
InnerSchedulerState::Started(_) => {
|
||||||
|
let new_state = InnerSchedulerState::Paused {
|
||||||
|
started: true,
|
||||||
|
pause_guards_count: NonZeroUsize::new(1).unwrap(),
|
||||||
|
};
|
||||||
|
Self::do_stop(inner, &context, new_state).await;
|
||||||
|
}
|
||||||
|
InnerSchedulerState::Stopped => {
|
||||||
|
*inner = InnerSchedulerState::Paused {
|
||||||
|
started: false,
|
||||||
|
pause_guards_count: NonZeroUsize::new(1).unwrap(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
InnerSchedulerState::Paused {
|
||||||
|
ref mut pause_guards_count,
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
*pause_guards_count = pause_guards_count
|
||||||
|
.checked_add(1)
|
||||||
|
.ok_or_else(|| Error::msg("Too many pause guards active"))?
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let (tx, rx) = oneshot::channel();
|
let (tx, rx) = oneshot::channel();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
rx.await.ok();
|
rx.await.ok();
|
||||||
let mut inner = context.scheduler.inner.write().await;
|
let mut inner = context.scheduler.inner.write().await;
|
||||||
inner.paused = false;
|
match *inner {
|
||||||
if inner.started && inner.scheduler.is_none() {
|
InnerSchedulerState::Started(_) => {
|
||||||
SchedulerState::do_start(inner, context.clone()).await;
|
warn!(&context, "IoPausedGuard resume: started instead of paused");
|
||||||
|
}
|
||||||
|
InnerSchedulerState::Stopped => {
|
||||||
|
warn!(&context, "IoPausedGuard resume: stopped instead of paused");
|
||||||
|
}
|
||||||
|
InnerSchedulerState::Paused {
|
||||||
|
ref started,
|
||||||
|
ref mut pause_guards_count,
|
||||||
|
} => {
|
||||||
|
if *pause_guards_count == NonZeroUsize::new(1).unwrap() {
|
||||||
|
match *started {
|
||||||
|
true => SchedulerState::do_start(inner, context.clone()).await,
|
||||||
|
false => *inner = InnerSchedulerState::Stopped,
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
let new_count = pause_guards_count.get() - 1;
|
||||||
|
// SAFETY: Value was >=2 before due to if condition
|
||||||
|
*pause_guards_count = NonZeroUsize::new(new_count).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
IoPausedGuard { sender: Some(tx) }
|
Ok(IoPausedGuard { sender: Some(tx) })
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Restarts the scheduler, only if it is running.
|
/// Restarts the scheduler, only if it is running.
|
||||||
@@ -126,8 +184,8 @@ impl SchedulerState {
|
|||||||
/// Indicate that the network likely has come back.
|
/// Indicate that the network likely has come back.
|
||||||
pub(crate) async fn maybe_network(&self) {
|
pub(crate) async fn maybe_network(&self) {
|
||||||
let inner = self.inner.read().await;
|
let inner = self.inner.read().await;
|
||||||
let (inbox, oboxes) = match inner.scheduler {
|
let (inbox, oboxes) = match *inner {
|
||||||
Some(ref scheduler) => {
|
InnerSchedulerState::Started(ref scheduler) => {
|
||||||
scheduler.maybe_network();
|
scheduler.maybe_network();
|
||||||
let inbox = scheduler.inbox.conn_state.state.connectivity.clone();
|
let inbox = scheduler.inbox.conn_state.state.connectivity.clone();
|
||||||
let oboxes = scheduler
|
let oboxes = scheduler
|
||||||
@@ -137,7 +195,7 @@ impl SchedulerState {
|
|||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
(inbox, oboxes)
|
(inbox, oboxes)
|
||||||
}
|
}
|
||||||
None => return,
|
_ => return,
|
||||||
};
|
};
|
||||||
drop(inner);
|
drop(inner);
|
||||||
connectivity::idle_interrupted(inbox, oboxes).await;
|
connectivity::idle_interrupted(inbox, oboxes).await;
|
||||||
@@ -146,15 +204,15 @@ impl SchedulerState {
|
|||||||
/// Indicate that the network likely is lost.
|
/// Indicate that the network likely is lost.
|
||||||
pub(crate) async fn maybe_network_lost(&self, context: &Context) {
|
pub(crate) async fn maybe_network_lost(&self, context: &Context) {
|
||||||
let inner = self.inner.read().await;
|
let inner = self.inner.read().await;
|
||||||
let stores = match inner.scheduler {
|
let stores = match *inner {
|
||||||
Some(ref scheduler) => {
|
InnerSchedulerState::Started(ref scheduler) => {
|
||||||
scheduler.maybe_network_lost();
|
scheduler.maybe_network_lost();
|
||||||
scheduler
|
scheduler
|
||||||
.boxes()
|
.boxes()
|
||||||
.map(|b| b.conn_state.state.connectivity.clone())
|
.map(|b| b.conn_state.state.connectivity.clone())
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
None => return,
|
_ => return,
|
||||||
};
|
};
|
||||||
drop(inner);
|
drop(inner);
|
||||||
connectivity::maybe_network_lost(context, stores).await;
|
connectivity::maybe_network_lost(context, stores).await;
|
||||||
@@ -162,45 +220,49 @@ impl SchedulerState {
|
|||||||
|
|
||||||
pub(crate) async fn interrupt_inbox(&self, info: InterruptInfo) {
|
pub(crate) async fn interrupt_inbox(&self, info: InterruptInfo) {
|
||||||
let inner = self.inner.read().await;
|
let inner = self.inner.read().await;
|
||||||
if let Some(ref scheduler) = inner.scheduler {
|
if let InnerSchedulerState::Started(ref scheduler) = *inner {
|
||||||
scheduler.interrupt_inbox(info);
|
scheduler.interrupt_inbox(info);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn interrupt_smtp(&self, info: InterruptInfo) {
|
pub(crate) async fn interrupt_smtp(&self, info: InterruptInfo) {
|
||||||
let inner = self.inner.read().await;
|
let inner = self.inner.read().await;
|
||||||
if let Some(ref scheduler) = inner.scheduler {
|
if let InnerSchedulerState::Started(ref scheduler) = *inner {
|
||||||
scheduler.interrupt_smtp(info);
|
scheduler.interrupt_smtp(info);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn interrupt_ephemeral_task(&self) {
|
pub(crate) async fn interrupt_ephemeral_task(&self) {
|
||||||
let inner = self.inner.read().await;
|
let inner = self.inner.read().await;
|
||||||
if let Some(ref scheduler) = inner.scheduler {
|
if let InnerSchedulerState::Started(ref scheduler) = *inner {
|
||||||
scheduler.interrupt_ephemeral_task();
|
scheduler.interrupt_ephemeral_task();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn interrupt_location(&self) {
|
pub(crate) async fn interrupt_location(&self) {
|
||||||
let inner = self.inner.read().await;
|
let inner = self.inner.read().await;
|
||||||
if let Some(ref scheduler) = inner.scheduler {
|
if let InnerSchedulerState::Started(ref scheduler) = *inner {
|
||||||
scheduler.interrupt_location();
|
scheduler.interrupt_location();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn interrupt_recently_seen(&self, contact_id: ContactId, timestamp: i64) {
|
pub(crate) async fn interrupt_recently_seen(&self, contact_id: ContactId, timestamp: i64) {
|
||||||
let inner = self.inner.read().await;
|
let inner = self.inner.read().await;
|
||||||
if let Some(ref scheduler) = inner.scheduler {
|
if let InnerSchedulerState::Started(ref scheduler) = *inner {
|
||||||
scheduler.interrupt_recently_seen(contact_id, timestamp);
|
scheduler.interrupt_recently_seen(contact_id, timestamp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Default)]
|
#[derive(Debug, Default)]
|
||||||
struct InnerSchedulerState {
|
enum InnerSchedulerState {
|
||||||
scheduler: Option<Scheduler>,
|
Started(Scheduler),
|
||||||
started: bool,
|
#[default]
|
||||||
paused: bool,
|
Stopped,
|
||||||
|
Paused {
|
||||||
|
started: bool,
|
||||||
|
pause_guards_count: NonZeroUsize,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Guard to make sure the IO Scheduler is resumed.
|
/// Guard to make sure the IO Scheduler is resumed.
|
||||||
@@ -301,7 +363,7 @@ async fn inbox_loop(ctx: Context, started: Sender<()>, inbox_handlers: ImapConne
|
|||||||
let next_housekeeping_time =
|
let next_housekeeping_time =
|
||||||
last_housekeeping_time.saturating_add(60 * 60 * 24);
|
last_housekeeping_time.saturating_add(60 * 60 * 24);
|
||||||
if next_housekeeping_time <= time() {
|
if next_housekeeping_time <= time() {
|
||||||
sql::housekeeping(&ctx).await.ok_or_log(&ctx);
|
sql::housekeeping(&ctx).await.log_err(&ctx).ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
@@ -410,7 +472,8 @@ async fn fetch_idle(
|
|||||||
.store_seen_flags_on_imap(ctx)
|
.store_seen_flags_on_imap(ctx)
|
||||||
.await
|
.await
|
||||||
.context("store_seen_flags_on_imap")
|
.context("store_seen_flags_on_imap")
|
||||||
.ok_or_log(ctx);
|
.log_err(ctx)
|
||||||
|
.ok();
|
||||||
} else {
|
} else {
|
||||||
warn!(ctx, "No session even though we just prepared it");
|
warn!(ctx, "No session even though we just prepared it");
|
||||||
}
|
}
|
||||||
@@ -434,7 +497,8 @@ async fn fetch_idle(
|
|||||||
delete_expired_imap_messages(ctx)
|
delete_expired_imap_messages(ctx)
|
||||||
.await
|
.await
|
||||||
.context("delete_expired_imap_messages")
|
.context("delete_expired_imap_messages")
|
||||||
.ok_or_log(ctx);
|
.log_err(ctx)
|
||||||
|
.ok();
|
||||||
|
|
||||||
// Scan additional folders only after finishing fetching the watched folder.
|
// Scan additional folders only after finishing fetching the watched folder.
|
||||||
//
|
//
|
||||||
@@ -474,7 +538,8 @@ async fn fetch_idle(
|
|||||||
.sync_seen_flags(ctx, &watch_folder)
|
.sync_seen_flags(ctx, &watch_folder)
|
||||||
.await
|
.await
|
||||||
.context("sync_seen_flags")
|
.context("sync_seen_flags")
|
||||||
.ok_or_log(ctx);
|
.log_err(ctx)
|
||||||
|
.ok();
|
||||||
|
|
||||||
connection.connectivity.set_connected(ctx).await;
|
connection.connectivity.set_connected(ctx).await;
|
||||||
|
|
||||||
@@ -770,20 +835,22 @@ impl Scheduler {
|
|||||||
pub(crate) async fn stop(self, context: &Context) {
|
pub(crate) async fn stop(self, context: &Context) {
|
||||||
// Send stop signals to tasks so they can shutdown cleanly.
|
// Send stop signals to tasks so they can shutdown cleanly.
|
||||||
for b in self.boxes() {
|
for b in self.boxes() {
|
||||||
b.conn_state.stop().await.ok_or_log(context);
|
b.conn_state.stop().await.log_err(context).ok();
|
||||||
}
|
}
|
||||||
self.smtp.stop().await.ok_or_log(context);
|
self.smtp.stop().await.log_err(context).ok();
|
||||||
|
|
||||||
// Actually shutdown tasks.
|
// Actually shutdown tasks.
|
||||||
let timeout_duration = std::time::Duration::from_secs(30);
|
let timeout_duration = std::time::Duration::from_secs(30);
|
||||||
for b in once(self.inbox).chain(self.oboxes.into_iter()) {
|
for b in once(self.inbox).chain(self.oboxes.into_iter()) {
|
||||||
tokio::time::timeout(timeout_duration, b.handle)
|
tokio::time::timeout(timeout_duration, b.handle)
|
||||||
.await
|
.await
|
||||||
.ok_or_log(context);
|
.log_err(context)
|
||||||
|
.ok();
|
||||||
}
|
}
|
||||||
tokio::time::timeout(timeout_duration, self.smtp_handle)
|
tokio::time::timeout(timeout_duration, self.smtp_handle)
|
||||||
.await
|
.await
|
||||||
.ok_or_log(context);
|
.log_err(context)
|
||||||
|
.ok();
|
||||||
self.ephemeral_handle.abort();
|
self.ephemeral_handle.abort();
|
||||||
self.location_handle.abort();
|
self.location_handle.abort();
|
||||||
self.recently_seen_loop.abort();
|
self.recently_seen_loop.abort();
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ use crate::tools::time;
|
|||||||
use crate::{context::Context, log::LogExt};
|
use crate::{context::Context, log::LogExt};
|
||||||
use crate::{stock_str, tools};
|
use crate::{stock_str, tools};
|
||||||
|
|
||||||
|
use super::InnerSchedulerState;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, EnumProperty, PartialOrd, Ord)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, EnumProperty, PartialOrd, Ord)]
|
||||||
pub enum Connectivity {
|
pub enum Connectivity {
|
||||||
NotConnected = 1000,
|
NotConnected = 1000,
|
||||||
@@ -226,12 +228,12 @@ impl Context {
|
|||||||
/// If the connectivity changes, a DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
|
/// If the connectivity changes, a DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
|
||||||
pub async fn get_connectivity(&self) -> Connectivity {
|
pub async fn get_connectivity(&self) -> Connectivity {
|
||||||
let lock = self.scheduler.inner.read().await;
|
let lock = self.scheduler.inner.read().await;
|
||||||
let stores: Vec<_> = match lock.scheduler {
|
let stores: Vec<_> = match *lock {
|
||||||
Some(ref sched) => sched
|
InnerSchedulerState::Started(ref sched) => sched
|
||||||
.boxes()
|
.boxes()
|
||||||
.map(|b| b.conn_state.state.connectivity.clone())
|
.map(|b| b.conn_state.state.connectivity.clone())
|
||||||
.collect(),
|
.collect(),
|
||||||
None => return Connectivity::NotConnected,
|
_ => return Connectivity::NotConnected,
|
||||||
};
|
};
|
||||||
drop(lock);
|
drop(lock);
|
||||||
|
|
||||||
@@ -309,15 +311,15 @@ impl Context {
|
|||||||
// =============================================================================================
|
// =============================================================================================
|
||||||
|
|
||||||
let lock = self.scheduler.inner.read().await;
|
let lock = self.scheduler.inner.read().await;
|
||||||
let (folders_states, smtp) = match lock.scheduler {
|
let (folders_states, smtp) = match *lock {
|
||||||
Some(ref sched) => (
|
InnerSchedulerState::Started(ref sched) => (
|
||||||
sched
|
sched
|
||||||
.boxes()
|
.boxes()
|
||||||
.map(|b| (b.meaning, b.conn_state.state.connectivity.clone()))
|
.map(|b| (b.meaning, b.conn_state.state.connectivity.clone()))
|
||||||
.collect::<Vec<_>>(),
|
.collect::<Vec<_>>(),
|
||||||
sched.smtp.state.connectivity.clone(),
|
sched.smtp.state.connectivity.clone(),
|
||||||
),
|
),
|
||||||
None => {
|
_ => {
|
||||||
return Err(anyhow!("Not started"));
|
return Err(anyhow!("Not started"));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -337,7 +339,7 @@ impl Context {
|
|||||||
let mut folder_added = false;
|
let mut folder_added = false;
|
||||||
|
|
||||||
if let Some(config) = folder.to_config().filter(|c| watched_folders.contains(c)) {
|
if let Some(config) = folder.to_config().filter(|c| watched_folders.contains(c)) {
|
||||||
let f = self.get_config(config).await.ok_or_log(self).flatten();
|
let f = self.get_config(config).await.log_err(self).ok().flatten();
|
||||||
|
|
||||||
if let Some(foldername) = f {
|
if let Some(foldername) = f {
|
||||||
let detailed = &state.get_detailed().await;
|
let detailed = &state.get_detailed().await;
|
||||||
@@ -396,64 +398,72 @@ impl Context {
|
|||||||
if let Some(quota) = &*quota {
|
if let Some(quota) = &*quota {
|
||||||
match "a.recent {
|
match "a.recent {
|
||||||
Ok(quota) => {
|
Ok(quota) => {
|
||||||
let roots_cnt = quota.len();
|
if !quota.is_empty() {
|
||||||
for (root_name, resources) in quota {
|
for (root_name, resources) in quota {
|
||||||
use async_imap::types::QuotaResourceName::*;
|
use async_imap::types::QuotaResourceName::*;
|
||||||
for resource in resources {
|
for resource in resources {
|
||||||
ret += "<li>";
|
ret += "<li>";
|
||||||
|
|
||||||
// root name is empty eg. for gmail and redundant eg. for riseup.
|
// root name is empty eg. for gmail and redundant eg. for riseup.
|
||||||
// therefore, use it only if there are really several roots.
|
// therefore, use it only if there are really several roots.
|
||||||
if roots_cnt > 1 && !root_name.is_empty() {
|
if quota.len() > 1 && !root_name.is_empty() {
|
||||||
ret +=
|
ret += &format!(
|
||||||
&format!("<b>{}:</b> ", &*escaper::encode_minimal(root_name));
|
"<b>{}:</b> ",
|
||||||
} else {
|
&*escaper::encode_minimal(root_name)
|
||||||
info!(self, "connectivity: root name hidden: \"{}\"", root_name);
|
);
|
||||||
|
} else {
|
||||||
|
info!(
|
||||||
|
self,
|
||||||
|
"connectivity: root name hidden: \"{}\"", root_name
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
let messages = stock_str::messages(self).await;
|
||||||
|
let part_of_total_used = stock_str::part_of_total_used(
|
||||||
|
self,
|
||||||
|
&resource.usage.to_string(),
|
||||||
|
&resource.limit.to_string(),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
ret += &match &resource.name {
|
||||||
|
Atom(resource_name) => {
|
||||||
|
format!(
|
||||||
|
"<b>{}:</b> {}",
|
||||||
|
&*escaper::encode_minimal(resource_name),
|
||||||
|
part_of_total_used
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Message => {
|
||||||
|
format!("<b>{part_of_total_used}:</b> {messages}")
|
||||||
|
}
|
||||||
|
Storage => {
|
||||||
|
// do not use a special title needed for "Storage":
|
||||||
|
// - it is usually shown directly under the "Storage" headline
|
||||||
|
// - by the units "1 MB of 10 MB used" there is some difference to eg. "Messages: 1 of 10 used"
|
||||||
|
// - the string is not longer than the other strings that way (minus title, plus units) -
|
||||||
|
// additional linebreaks on small displays are unlikely therefore
|
||||||
|
// - most times, this is the only item anyway
|
||||||
|
let usage = &format_size(resource.usage * 1024, BINARY);
|
||||||
|
let limit = &format_size(resource.limit * 1024, BINARY);
|
||||||
|
stock_str::part_of_total_used(self, usage, limit).await
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let percent = resource.get_usage_percentage();
|
||||||
|
let color = if percent >= QUOTA_ERROR_THRESHOLD_PERCENTAGE {
|
||||||
|
"red"
|
||||||
|
} else if percent >= QUOTA_WARN_THRESHOLD_PERCENTAGE {
|
||||||
|
"yellow"
|
||||||
|
} else {
|
||||||
|
"green"
|
||||||
|
};
|
||||||
|
ret += &format!("<div class=\"bar\"><div class=\"progress {color}\" style=\"width: {percent}%\">{percent}%</div></div>");
|
||||||
|
|
||||||
|
ret += "</li>";
|
||||||
}
|
}
|
||||||
|
|
||||||
let messages = stock_str::messages(self).await;
|
|
||||||
let part_of_total_used = stock_str::part_of_total_used(
|
|
||||||
self,
|
|
||||||
&resource.usage.to_string(),
|
|
||||||
&resource.limit.to_string(),
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
ret += &match &resource.name {
|
|
||||||
Atom(resource_name) => {
|
|
||||||
format!(
|
|
||||||
"<b>{}:</b> {}",
|
|
||||||
&*escaper::encode_minimal(resource_name),
|
|
||||||
part_of_total_used
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Message => {
|
|
||||||
format!("<b>{part_of_total_used}:</b> {messages}")
|
|
||||||
}
|
|
||||||
Storage => {
|
|
||||||
// do not use a special title needed for "Storage":
|
|
||||||
// - it is usually shown directly under the "Storage" headline
|
|
||||||
// - by the units "1 MB of 10 MB used" there is some difference to eg. "Messages: 1 of 10 used"
|
|
||||||
// - the string is not longer than the other strings that way (minus title, plus units) -
|
|
||||||
// additional linebreaks on small displays are unlikely therefore
|
|
||||||
// - most times, this is the only item anyway
|
|
||||||
let usage = &format_size(resource.usage * 1024, BINARY);
|
|
||||||
let limit = &format_size(resource.limit * 1024, BINARY);
|
|
||||||
stock_str::part_of_total_used(self, usage, limit).await
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let percent = resource.get_usage_percentage();
|
|
||||||
let color = if percent >= QUOTA_ERROR_THRESHOLD_PERCENTAGE {
|
|
||||||
"red"
|
|
||||||
} else if percent >= QUOTA_WARN_THRESHOLD_PERCENTAGE {
|
|
||||||
"yellow"
|
|
||||||
} else {
|
|
||||||
"green"
|
|
||||||
};
|
|
||||||
ret += &format!("<div class=\"bar\"><div class=\"progress {color}\" style=\"width: {percent}%\">{percent}%</div></div>");
|
|
||||||
|
|
||||||
ret += "</li>";
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
ret += format!("<li>Warning: {domain} claims to support quota but gives no information</li>").as_str();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -480,14 +490,14 @@ impl Context {
|
|||||||
/// Returns true if all background work is done.
|
/// Returns true if all background work is done.
|
||||||
pub async fn all_work_done(&self) -> bool {
|
pub async fn all_work_done(&self) -> bool {
|
||||||
let lock = self.scheduler.inner.read().await;
|
let lock = self.scheduler.inner.read().await;
|
||||||
let stores: Vec<_> = match lock.scheduler {
|
let stores: Vec<_> = match *lock {
|
||||||
Some(ref sched) => sched
|
InnerSchedulerState::Started(ref sched) => sched
|
||||||
.boxes()
|
.boxes()
|
||||||
.map(|b| &b.conn_state.state)
|
.map(|b| &b.conn_state.state)
|
||||||
.chain(once(&sched.smtp.state))
|
.chain(once(&sched.smtp.state))
|
||||||
.map(|state| state.connectivity.clone())
|
.map(|state| state.connectivity.clone())
|
||||||
.collect(),
|
.collect(),
|
||||||
None => return false,
|
_ => return false,
|
||||||
};
|
};
|
||||||
drop(lock);
|
drop(lock);
|
||||||
|
|
||||||
|
|||||||
48
src/sql.rs
48
src/sql.rs
@@ -5,7 +5,7 @@ use std::convert::TryFrom;
|
|||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
use anyhow::{bail, Context as _, Result};
|
use anyhow::{bail, Context as _, Result};
|
||||||
use rusqlite::{self, config::DbConfig, Connection, OpenFlags};
|
use rusqlite::{self, config::DbConfig, types::ValueRef, Connection, OpenFlags, Row};
|
||||||
use tokio::sync::{Mutex, MutexGuard, RwLock};
|
use tokio::sync::{Mutex, MutexGuard, RwLock};
|
||||||
|
|
||||||
use crate::blob::BlobObject;
|
use crate::blob::BlobObject;
|
||||||
@@ -57,7 +57,7 @@ pub struct Sql {
|
|||||||
/// Database file path
|
/// Database file path
|
||||||
pub(crate) dbfile: PathBuf,
|
pub(crate) dbfile: PathBuf,
|
||||||
|
|
||||||
/// Write transaction mutex.
|
/// Write transactions mutex.
|
||||||
///
|
///
|
||||||
/// See [`Self::write_lock`].
|
/// See [`Self::write_lock`].
|
||||||
write_mtx: Mutex<()>,
|
write_mtx: Mutex<()>,
|
||||||
@@ -696,6 +696,15 @@ fn new_connection(path: &Path, passphrase: &str) -> Result<Connection> {
|
|||||||
|
|
||||||
/// Cleanup the account to restore some storage and optimize the database.
|
/// Cleanup the account to restore some storage and optimize the database.
|
||||||
pub async fn housekeeping(context: &Context) -> Result<()> {
|
pub async fn housekeeping(context: &Context) -> Result<()> {
|
||||||
|
// Setting `Config::LastHousekeeping` at the beginning avoids endless loops when things do not
|
||||||
|
// work out for whatever reason or are interrupted by the OS.
|
||||||
|
if let Err(e) = context
|
||||||
|
.set_config(Config::LastHousekeeping, Some(&time().to_string()))
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
warn!(context, "Can't set config: {e:#}.");
|
||||||
|
}
|
||||||
|
|
||||||
if let Err(err) = remove_unused_files(context).await {
|
if let Err(err) = remove_unused_files(context).await {
|
||||||
warn!(
|
warn!(
|
||||||
context,
|
context,
|
||||||
@@ -743,13 +752,6 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Err(e) = context
|
|
||||||
.set_config(Config::LastHousekeeping, Some(&time().to_string()))
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
warn!(context, "Can't set config: {e:#}.");
|
|
||||||
}
|
|
||||||
|
|
||||||
context
|
context
|
||||||
.sql
|
.sql
|
||||||
.execute(
|
.execute(
|
||||||
@@ -757,12 +759,24 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
|
|||||||
(),
|
(),
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.ok_or_log_msg(context, "failed to remove old MDNs");
|
.context("failed to remove old MDNs")
|
||||||
|
.log_err(context)
|
||||||
|
.ok();
|
||||||
|
|
||||||
info!(context, "Housekeeping done.");
|
info!(context, "Housekeeping done.");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Get the value of a column `idx` of the `row` as `Vec<u8>`.
|
||||||
|
pub fn row_get_vec(row: &Row, idx: usize) -> rusqlite::Result<Vec<u8>> {
|
||||||
|
row.get(idx).or_else(|err| match row.get_ref(idx)? {
|
||||||
|
ValueRef::Null => Ok(Vec::new()),
|
||||||
|
ValueRef::Text(text) => Ok(text.to_vec()),
|
||||||
|
ValueRef::Blob(blob) => Ok(blob.to_vec()),
|
||||||
|
ValueRef::Integer(_) | ValueRef::Real(_) => Err(err),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// Enumerates used files in the blobdir and removes unused ones.
|
/// Enumerates used files in the blobdir and removes unused ones.
|
||||||
pub async fn remove_unused_files(context: &Context) -> Result<()> {
|
pub async fn remove_unused_files(context: &Context) -> Result<()> {
|
||||||
let mut files_in_use = HashSet::new();
|
let mut files_in_use = HashSet::new();
|
||||||
@@ -895,12 +909,14 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
warn!(
|
if !p.ends_with(BLOBS_BACKUP_NAME) {
|
||||||
context,
|
warn!(
|
||||||
"Housekeeping: Cannot read dir {}: {:#}.",
|
context,
|
||||||
p.display(),
|
"Housekeeping: Cannot read dir {}: {:#}.",
|
||||||
err
|
p.display(),
|
||||||
);
|
err
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -704,6 +704,13 @@ CREATE INDEX smtp_messageid ON imap(rfc724_mid);
|
|||||||
// Reverted above, as it requires to load the whole DB in memory.
|
// Reverted above, as it requires to load the whole DB in memory.
|
||||||
sql.set_db_version(99).await?;
|
sql.set_db_version(99).await?;
|
||||||
}
|
}
|
||||||
|
if dbversion < 100 {
|
||||||
|
sql.execute_migration(
|
||||||
|
"ALTER TABLE msgs ADD COLUMN mime_compressed INTEGER NOT NULL DEFAULT 0",
|
||||||
|
100,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
let new_version = sql
|
let new_version = sql
|
||||||
.get_raw_config_int(VERSION_CFG)
|
.get_raw_config_int(VERSION_CFG)
|
||||||
@@ -735,14 +742,18 @@ impl Sql {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn execute_migration(&self, query: &'static str, version: i32) -> Result<()> {
|
// Sets db `version` in the `transaction`.
|
||||||
self.transaction(move |transaction| {
|
fn set_db_version_trans(transaction: &mut rusqlite::Transaction, version: i32) -> Result<()> {
|
||||||
// set raw config inside the transaction
|
transaction.execute(
|
||||||
transaction.execute(
|
"UPDATE config SET value=? WHERE keyname=?;",
|
||||||
"UPDATE config SET value=? WHERE keyname=?;",
|
params![format!("{version}"), VERSION_CFG],
|
||||||
paramsv![format!("{version}"), VERSION_CFG],
|
)?;
|
||||||
)?;
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn execute_migration(&self, query: &str, version: i32) -> Result<()> {
|
||||||
|
self.transaction(move |transaction| {
|
||||||
|
Self::set_db_version_trans(transaction, version)?;
|
||||||
transaction.execute_batch(query)?;
|
transaction.execute_batch(query)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
39
src/tools.rs
39
src/tools.rs
@@ -5,7 +5,8 @@
|
|||||||
|
|
||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::io::Cursor;
|
use std::io::{Cursor, Write};
|
||||||
|
use std::mem;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use std::str::from_utf8;
|
use std::str::from_utf8;
|
||||||
use std::time::{Duration, SystemTime};
|
use std::time::{Duration, SystemTime};
|
||||||
@@ -654,6 +655,42 @@ pub(crate) fn single_value<T>(collection: impl IntoIterator<Item = T>) -> Option
|
|||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Compressor/decompressor buffer size.
|
||||||
|
const BROTLI_BUFSZ: usize = 4096;
|
||||||
|
|
||||||
|
/// Compresses `buf` to `Vec` using `brotli`.
|
||||||
|
/// Note that it handles an empty `buf` as a special value that remains empty after compression,
|
||||||
|
/// otherwise brotli would add its metadata to it which is not nice because this function is used
|
||||||
|
/// for compression of strings stored in the db and empty strings are common there. This approach is
|
||||||
|
/// not strictly correct because nowhere in the brotli documentation is said that an empty buffer
|
||||||
|
/// can't be a result of compression of some input, but i think this will never break.
|
||||||
|
pub(crate) fn buf_compress(buf: &[u8]) -> Result<Vec<u8>> {
|
||||||
|
if buf.is_empty() {
|
||||||
|
return Ok(Vec::new());
|
||||||
|
}
|
||||||
|
// level 4 is 2x faster than level 6 (and 54x faster than 10, for comparison).
|
||||||
|
// with the adaptiveness, we aim to not slow down processing
|
||||||
|
// single large files too much, esp. on low-budget devices.
|
||||||
|
// in tests (see #4129), this makes a difference, without compressing much worse.
|
||||||
|
let q: u32 = if buf.len() > 1_000_000 { 4 } else { 6 };
|
||||||
|
let lgwin: u32 = 22; // log2(LZ77 window size), it's the default for brotli CLI tool.
|
||||||
|
let mut compressor = brotli::CompressorWriter::new(Vec::new(), BROTLI_BUFSZ, q, lgwin);
|
||||||
|
compressor.write_all(buf)?;
|
||||||
|
Ok(compressor.into_inner())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Decompresses `buf` to `Vec` using `brotli`.
|
||||||
|
/// See `buf_compress()` for why we don't pass an empty buffer to brotli decompressor.
|
||||||
|
pub(crate) fn buf_decompress(buf: &[u8]) -> Result<Vec<u8>> {
|
||||||
|
if buf.is_empty() {
|
||||||
|
return Ok(Vec::new());
|
||||||
|
}
|
||||||
|
let mut decompressor = brotli::DecompressorWriter::new(Vec::new(), BROTLI_BUFSZ);
|
||||||
|
decompressor.write_all(buf)?;
|
||||||
|
decompressor.flush()?;
|
||||||
|
Ok(mem::take(decompressor.get_mut()))
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
#![allow(clippy::indexing_slicing)]
|
#![allow(clippy::indexing_slicing)]
|
||||||
|
|||||||
Reference in New Issue
Block a user