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

Merge pull request #201 from ikatson/fix-delete-torrent

Browse source 
Fix a bug in torrent deletion
This commit is contained in:
Igor Katson 2024-08-19 19:31:26 +01:00 • committed by GitHub
commit 6127a4aeda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/librqbit/src/session.rs
View file

@ -1179,7 +1179,9 @@ impl Session {
if let Some(p) = self.persistence.as_ref() { if let Some(p) = self.persistence.as_ref() {
if let Err(e) = p.delete(id).await { if let Err(e) = p.delete(id).await {
error!(error=?e, "error deleting torrent from database"); error!(error=?e, "error deleting torrent from persistence database");
} else {
debug!(?id, "deleted torrent from persistence database")
} }
} }

17
crates/librqbit/src/session_persistence/json.rs
View file

@ -11,7 +11,7 @@ use itertools::Itertools;
use librqbit_core::Id20; use librqbit_core::Id20;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tracing::{trace, warn}; use tracing::{debug, trace, warn};
use super::{SerializedTorrent, SessionPersistenceStore}; use super::{SerializedTorrent, SessionPersistenceStore};
@ -74,13 +74,17 @@ impl JsonSessionPersistenceStore {
.open(&tmp_filename) .open(&tmp_filename)
.await .await
.with_context(|| format!("error opening {:?}", tmp_filename))?; .with_context(|| format!("error opening {:?}", tmp_filename))?;
trace!(?tmp_filename, "opened temp file");
let mut buf = Vec::new(); let mut buf = Vec::new();
serde_json::to_writer(&mut buf, &*self.db_content.read().await) serde_json::to_writer(&mut buf, &*self.db_content.read().await)
.context("error serializing")?; .context("error serializing")?;
trace!(?tmp_filename, "serialized DB as JSON");
tmp.write_all(&buf) tmp.write_all(&buf)
.await .await
.with_context(|| format!("error writing {tmp_filename:?}"))?; .with_context(|| format!("error writing {tmp_filename:?}"))?;
trace!(?tmp_filename, "wrote to temp file");
tokio::fs::rename(&tmp_filename, &self.db_filename) tokio::fs::rename(&tmp_filename, &self.db_filename)
.await .await
@ -164,12 +168,21 @@ impl SessionPersistenceStore for JsonSessionPersistenceStore {
} }
async fn delete(&self, id: TorrentId) -> anyhow::Result<()> { async fn delete(&self, id: TorrentId) -> anyhow::Result<()> {
if let Some(t) = self.db_content.write().await.torrents.remove(&id) { debug!(?id, "attempting to delete");
// BIG NOTE: DO NOT inline this variable. Otherwise Rust doesn't drop the lock and it deadlocks
// when calling flush - because let bindings prolong the duration.
let removed = self.db_content.write().await.torrents.remove(&id);
if let Some(t) = removed {
debug!(?id, "deleted from in-memory db, flushing");
self.flush().await?; self.flush().await?;
let tf = self.torrent_bytes_filename(&t.info_hash); let tf = self.torrent_bytes_filename(&t.info_hash);
if let Err(e) = tokio::fs::remove_file(&tf).await { if let Err(e) = tokio::fs::remove_file(&tf).await {
warn!(error=?e, filename=?tf, "error removing torrent file"); warn!(error=?e, filename=?tf, "error removing torrent file");
} else {
debug!(filename=?tf, "removed");
} }
} else {
bail!("error deleting: didn't find torrent id={id}")
} }
Ok(()) Ok(())