Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-27 02:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use released version of sendme^Wiroh

Browse Source 
This switches to a released version.  It has been renamed from sendme
to iroh.
This commit is contained in:
Floris Bruynooghe
2023-02-22 16:05:24 +01:00
parent 1b39be8a42
commit fc64c33368
4 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/imex/transfer.rs
View File

@@ -30,11 +30,11 @@ use std::task::Poll;
use anyhow::{anyhow, bail, ensure, format_err, Context as _, Result};
use async_channel::Receiver;
use futures_lite::StreamExt;
use sendme::get::{DataStream, Options};
use sendme::progress::ProgressEmitter;
use sendme::protocol::AuthToken;
use sendme::provider::{DataSource, Event, Provider, Ticket};
use sendme::Hash;
use iroh::get::{DataStream, Options};
use iroh::progress::ProgressEmitter;
use iroh::protocol::AuthToken;
use iroh::provider::{DataSource, Event, Provider, Ticket};
use iroh::Hash;
use tokio::fs::{self, File};
use tokio::io::{self, AsyncWriteExt, BufWriter};
use tokio::sync::broadcast;
@@ -156,7 +156,7 @@ impl BackupProvider {
}
// Start listening.
let (db, hash) = sendme::provider::create_collection(files).await?;
let (db, hash) = iroh::provider::create_collection(files).await?;
context.emit_event(SendProgress::CollectionCreated.into());
let provider = Provider::builder(db).auth_token(token).spawn()?;
context.emit_event(SendProgress::ProviderListening.into());
@@ -328,6 +328,7 @@ async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
let opts = Options {
addr: ticket.addr,
peer_id: Some(ticket.peer),
keylog: false,
};
let progress = ProgressEmitter::new(0, ReceiveProgress::max_blob_progress());
spawn_progress_proxy(context.clone(), progress.subscribe());
@@ -336,7 +337,7 @@ async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {
async { Ok(()) }
};
let on_blob = |hash, reader, name| on_blob(context, &progress, &ticket, hash, reader, name);
let res = sendme::get::run(
let res = iroh::get::run(
ticket.hash,
ticket.token,
opts,

4
src/qr.rs
View File

@@ -114,7 +114,7 @@ pub enum Qr {
/// information to connect to and authenticate a backup provider.
///
/// The format is somewhat opaque, but `sendme` can deserialise this.
ticket: sendme::provider::Ticket,
ticket: iroh::provider::Ticket,
},
/// Ask the user if they want to use the given service for video chats.
@@ -509,7 +509,7 @@ fn decode_backup(qr: &str) -> Result<Qr> {
let payload = qr
.strip_prefix(DCBACKUP_SCHEME)
.ok_or(anyhow!("invalid DCBACKUP scheme"))?;
let ticket: sendme::provider::Ticket = payload.parse().context("invalid DCBACKUP payload")?;
let ticket: iroh::provider::Ticket = payload.parse().context("invalid DCBACKUP payload")?;
Ok(Qr::Backup { ticket })
}