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

End-to-end unit test (#90)

Browse source 
* First implementation of create_torrent_file

* Test harness for e2e preparing

* Saving

* Continuing test harness

* Continuing test harness

* Continuing test harness

* All servers are running

* Full e2e harness done

* Test e2e harness working fine

* Remove lints

* injecting faults

* The e2e test runs continuously

* e2e test

* Add a test for create_torrent

* Nothing

* Nothing, just tweaking the numberes

* Update tokio, remove custom tempfile shim
This commit is contained in:
Igor Katson 2024-03-05 09:18:22 +00:00 • committed by GitHub
parent 5d6ecb8065
commit 2778d46bb3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 634 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/librqbit_core/src/lengths.rs
View file

@ -38,7 +38,7 @@ pub struct Lengths {
piece_length: u32,
last_piece_id: u32,
last_piece_length: u32,
chunks_per_piece: u32,
max_chunks_per_piece: u32,
}
#[derive(Clone, Copy, PartialEq, Eq, Hash)]
@ -84,7 +84,7 @@ impl Lengths {
}
if chunk_length > piece_length {
anyhow::bail!(
"chunk length {} should be smaller than or equal to piece length {}",
"chunk length {} should be >= piece length {}",
chunk_length,
piece_length
);
@ -97,7 +97,7 @@ impl Lengths {
chunk_length,
piece_length,
total_length,
chunks_per_piece: ceil_div_u64(piece_length as u64, chunk_length as u64) as u32,
max_chunks_per_piece: ceil_div_u64(piece_length as u64, chunk_length as u64) as u32,
last_piece_id: total_pieces - 1,
last_piece_length: last_element_size_u64(total_length, piece_length as u64) as u32,
})
@ -123,8 +123,8 @@ impl Lengths {
pub const fn default_chunk_length(&self) -> u32 {
self.chunk_length
}
pub const fn default_chunks_per_piece(&self) -> u32 {
self.chunks_per_piece
pub const fn default_max_chunks_per_piece(&self) -> u32 {
self.max_chunks_per_piece
}
pub const fn total_chunks(&self) -> u32 {
ceil_div_u64(self.total_length, self.chunk_length as u64) as u32
@ -161,7 +161,7 @@ impl Lengths {
pub fn iter_chunk_infos(&self, index: ValidPieceIndex) -> impl Iterator<Item = ChunkInfo> {
let mut remaining = self.piece_length(index);
let chunk_size = self.chunk_length;
let absolute_offset = index.0 * self.chunks_per_piece;
let absolute_offset = index.0 * self.max_chunks_per_piece;
(0u32..).scan(0, move |offset, idx| {
if remaining == 0 {
return None;
@ -195,7 +195,7 @@ impl Lengths {
if expected_chunk_size != chunk_size {
return None;
}
let absolute_index = self.chunks_per_piece * piece_index.get() + index;
let absolute_index = self.max_chunks_per_piece * piece_index.get() + index;
Some(ChunkInfo {
piece_index,
chunk_index: index,
@ -214,7 +214,7 @@ impl Lengths {
self.chunk_info_from_received_data(self.validate_piece_index(index)?, begin, block_len)
}
pub const fn chunk_range(&self, index: ValidPieceIndex) -> std::ops::Range<usize> {
let start = index.0 * self.chunks_per_piece;
let start = index.0 * self.max_chunks_per_piece;
let end = start + self.chunks_per_piece(index);
start as usize..end as usize
}
@ -222,7 +222,7 @@ impl Lengths {
if index.0 == self.last_piece_id {
return (self.last_piece_length + self.chunk_length - 1) / self.chunk_length;
}
self.chunks_per_piece
self.max_chunks_per_piece
}
pub const fn chunk_offset_in_piece(
&self,

17
crates/librqbit_core/src/torrent_metainfo.rs
View file

@ -27,20 +27,27 @@ pub fn torrent_from_bytes<'de, ByteBuf: Deserialize<'de>>(
}
/// A parsed .torrent file.
#[derive(Deserialize, Debug, Clone)]
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct TorrentMetaV1<BufType> {
pub announce: BufType,
#[serde(rename = "announce-list", default = "Vec::new")]
#[serde(
rename = "announce-list",
default = "Vec::new",
skip_serializing_if = "Vec::is_empty"
)]
pub announce_list: Vec<Vec<BufType>>,
pub info: TorrentMetaV1Info<BufType>,
#[serde(skip_serializing_if = "Option::is_none")]
pub comment: Option<BufType>,
#[serde(rename = "created by")]
#[serde(rename = "created by", skip_serializing_if = "Option::is_none")]
pub created_by: Option<BufType>,
#[serde(skip_serializing_if = "Option::is_none")]
pub encoding: Option<BufType>,
#[serde(skip_serializing_if = "Option::is_none")]
pub publisher: Option<BufType>,
#[serde(rename = "publisher-url")]
#[serde(rename = "publisher-url", skip_serializing_if = "Option::is_none")]
pub publisher_url: Option<BufType>,
#[serde(rename = "creation date")]
#[serde(rename = "creation date", skip_serializing_if = "Option::is_none")]
pub creation_date: Option<usize>,
#[serde(skip)]