2/n Add pause/start actions

crates/librqbit/src/http_api.rs

@@ -4,12 +4,11 @@ use axum::extract::{Path, Query, State};
 use axum::response::IntoResponse;
 use axum::routing::{get, post};
 use buffers::ByteString;
-use dht::{Dht, DhtStats};
+use dht::DhtStats;
 use http::StatusCode;
 use itertools::Itertools;
 use librqbit_core::id20::Id20;
 use librqbit_core::torrent_metainfo::TorrentMetaV1Info;
-use parking_lot::RwLock;
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 use std::sync::Arc;
@@ -367,8 +366,6 @@ impl ApiInternal {
     fn api_torrent_list(&self) -> TorrentListResponse {
         let items = self.session.with_torrents(|torrents| {
             torrents
-                .iter()
-                .enumerate()
                 .map(|(id, mgr)| TorrentListResponseItem {
                     id,
                     info_hash: mgr.info().info_hash.as_string(),
@@ -488,16 +485,9 @@ impl ApiInternal {
         })
     }
 
-    fn api_dump_haves(&self, _idx: usize) -> Result<String> {
-        Err(anyhow::anyhow!("not implemented").into())
-        // let mgr = self.mgr_handle(idx)?;
-        // Ok(format!(
-        //     "{:?}",
-        //     mgr.live().conetext()
-        //         .lock_read("api_dump_haves")
-        //         .chunks
-        //         .get_have_pieces(),
-        // ))
+    fn api_dump_haves(&self, idx: usize) -> Result<String> {
+        let mgr = self.mgr_handle(idx)?;
+        Ok(mgr.with_chunk_tracker(|chunks| format!("{:?}", chunks.get_have_pieces()))?)
     }
 }
 

crates/librqbit/src/session.rs

@@ -201,8 +201,11 @@ impl Session {
         self.dht.as_ref()
     }
 
-    pub fn with_torrents<R>(&self, callback: impl Fn(&[ManagedTorrentHandle]) -> R) -> R {
-        callback(&self.locked.read().torrents)
+    pub fn with_torrents<R>(
+        &self,
+        callback: impl Fn(&mut dyn Iterator<Item = (TorrentId, &ManagedTorrentHandle)>) -> R,
+    ) -> R {
+        callback(&mut self.locked.read().torrents.iter().enumerate())
     }
 
     pub async fn add_torrent(

crates/librqbit/src/torrent_state/mod.rs

@@ -23,6 +23,7 @@ use tokio_stream::StreamExt;
 use tracing::trace_span;
 use url::Url;
 
+use crate::chunk_tracker::ChunkTracker;
 use crate::spawn_utils::spawn;
 use crate::spawn_utils::BlockingSpawner;
 
@@ -98,6 +99,15 @@ impl ManagedTorrent {
         f(&self.locked.read().state)
     }
 
+    pub fn with_chunk_tracker<R>(&self, f: impl FnOnce(&ChunkTracker) -> R) -> anyhow::Result<R> {
+        let g = self.locked.read();
+        match &g.state {
+            ManagedTorrentState::Paused(p) => Ok(f(&p.chunk_tracker)),
+            ManagedTorrentState::Live(l) => Ok(f(&l.lock_read("chunk_tracker").chunks)),
+            _ => bail!("no chunk tracker, torrent neither paused nor live"),
+        }
+    }
+
     pub fn live(&self) -> Option<Arc<TorrentStateLive>> {
         let g = self.locked.read();
         match &g.state {