leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

settings dialog works now and reloads the session properly

Browse source
This commit is contained in:
Igor Katson 2023-12-06 23:18:06 +00:00
parent e4543e1ba2
commit 9cbe16b387
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
13 changed files with 123 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/dht/src/persistence.rs
View file

@ -1,7 +1,7 @@
// TODO: this now stores only the routing table, but we also need AT LEAST the same socket address...
use futures::Future;
use librqbit_core::directories::get_configuration_directory;
use librqbit_core::spawn_utils::spawn;
use serde::{Deserialize, Serialize};
use std::fs::OpenOptions;
use std::io::{BufReader, BufWriter};
@ -10,7 +10,7 @@ use std::path::{Path, PathBuf};
use std::time::Duration;
use anyhow::Context;
use tracing::{debug, error, error_span, info, trace, warn};
use tracing::{debug, error, info, trace, warn};
use crate::peer_store::PeerStore;
use crate::routing_table::RoutingTable;
@ -74,7 +74,13 @@ impl PersistentDht {
Ok(path)
}
pub async fn create(config: Option<PersistentDhtConfig>) -> anyhow::Result<Dht> {
pub async fn create(
config: Option<PersistentDhtConfig>,
) -> anyhow::Result<(
Dht,
impl Future<Output = anyhow::Result<()>> + Send + Sync + 'static,
impl Future<Output = anyhow::Result<()>> + Send + Sync + 'static,
)> {
let mut config = config.unwrap_or_default();
let config_filename = match config.config_filename.take() {
Some(config_filename) => config_filename,
@ -125,9 +131,9 @@ impl PersistentDht {
peer_store,
..Default::default()
};
let dht = DhtState::with_config(dht_config).await?;
let (dht, run_worker) = DhtState::with_config(dht_config).await?;
spawn(error_span!("dht_persistence"), {
let run_persistence = {
let dht = dht.clone();
let dump_interval = config
.dump_interval
@ -150,7 +156,8 @@ impl PersistentDht {
}
}
}
});
Ok(dht)
};
Ok((dht, run_worker, run_persistence))
}
}