fix: calculate interested pieces by range (dragonflyoss#251)

Signed-off-by: Gaius <[email protected]>
e-ngo · Feb 5, 2024 · b422d8e · b422d8e
1 parent b8db169
commit b422d8e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/src/proxy/mod.rs b/src/proxy/mod.rs
@@ -380,6 +380,9 @@ async fn proxy_http_by_dfdaemon(
         }
 
         info!("copy finished");
+        if let Err(err) = writer.flush().await {
+            error!("writer flush error: {}", err);
+        }
     });
 
     Ok(response)
@@ -483,7 +486,7 @@ fn make_response_headers(
             format!(
                 "bytes {}-{}/{}",
                 range.start,
-                range.start + range.length - 1,
+                range.start + range.length,
                 download_task_started_response.content_length
             ),
         );

diff --git a/src/task/piece.rs b/src/task/piece.rs
@@ -123,24 +123,22 @@ impl Piece {
                 }
 
                 // If offset is greater than range.start + range.length, break the loop.
-                if offset < range.start + range.length {
+                if offset >= range.start + range.length {
                     break;
                 }
 
-                if offset > range.start {
-                    pieces.push(metadata::Piece {
-                        number: number as u32,
-                        offset,
-                        length: piece_length,
-                        digest: "".to_string(),
-                        parent_id: None,
-                        uploading_count: 0,
-                        uploaded_count: 0,
-                        updated_at: Utc::now().naive_utc(),
-                        created_at: Utc::now().naive_utc(),
-                        finished_at: None,
-                    });
-                }
+                pieces.push(metadata::Piece {
+                    number: number as u32,
+                    offset,
+                    length: piece_length,
+                    digest: "".to_string(),
+                    parent_id: None,
+                    uploading_count: 0,
+                    uploaded_count: 0,
+                    updated_at: Utc::now().naive_utc(),
+                    created_at: Utc::now().naive_utc(),
+                    finished_at: None,
+                });
 
                 offset = (number + 1) * piece_length;
                 number += 1;