more using HashContext instead of TaskContext

Author: rklaehn

src/store/fs.rs

@@ -298,7 +298,7 @@ impl HashContext {
             .get_or_create(|| async {
                 let res = self.db().get(hash).await.map_err(io::Error::other)?;
                 let res = match res {
-                    Some(state) => open_bao_file(&hash, state, &self.global).await,
+                    Some(state) => open_bao_file(state, self).await,
                     None => Err(io::Error::new(io::ErrorKind::NotFound, "hash not found")),
                 };
                 Ok((res?, ()))
@@ -318,7 +318,7 @@ impl HashContext {
             .get_or_create(|| async {
                 let res = self.db().get(hash).await.map_err(io::Error::other)?;
                 let res = match res {
-                    Some(state) => open_bao_file(&hash, state, &self.global).await,
+                    Some(state) => open_bao_file(state, self).await,
                     None => Ok(BaoFileHandle::new_partial_mem()),
                 };
                 Ok((res?, ()))
@@ -331,12 +331,9 @@ impl HashContext {
     }
 }
 
-async fn open_bao_file(
-    hash: &Hash,
-    state: EntryState<Bytes>,
-    ctx: &TaskContext,
-) -> io::Result<BaoFileHandle> {
-    let options = &ctx.options;
+async fn open_bao_file(state: EntryState<Bytes>, ctx: &HashContext) -> io::Result<BaoFileHandle> {
+    let hash = &ctx.id;
+    let options = &ctx.global.options;
     Ok(match state {
         EntryState::Complete {
             data_location,
@@ -368,7 +365,7 @@ async fn open_bao_file(
             };
             BaoFileHandle::new_complete(data, outboard)
         }
-        EntryState::Partial { .. } => BaoFileHandle::new_partial_file(*hash, ctx).await?,
+        EntryState::Partial { .. } => BaoFileHandle::new_partial_file(ctx).await?,
     })
 }
 

src/store/fs/bao_file.rs

@@ -31,7 +31,7 @@ use super::{
 use crate::{
     api::blobs::Bitfield,
     store::{
-        fs::{meta::raw_outboard_size, HashContext, TaskContext},
+        fs::{meta::raw_outboard_size, HashContext},
         util::{
             read_checksummed_and_truncate, write_checksummed, FixedSize, MemOrFile,
             PartialMemStorage, DD,
@@ -577,14 +577,15 @@ impl BaoFileHandle {
     }
 
     /// Create a new bao file handle with a partial file.
-    pub(super) async fn new_partial_file(hash: Hash, ctx: &TaskContext) -> io::Result<Self> {
-        let options = ctx.options.clone();
-        let storage = PartialFileStorage::load(&hash, &options.path)?;
+    pub(super) async fn new_partial_file(ctx: &HashContext) -> io::Result<Self> {
+        let hash = &ctx.id;
+        let options = ctx.global.options.clone();
+        let storage = PartialFileStorage::load(hash, &options.path)?;
         let storage = if storage.bitfield.is_complete() {
             let size = storage.bitfield.size;
             let (storage, entry_state) = storage.into_complete(size, &options)?;
             debug!("File was reconstructed as complete");
-            ctx.db.set(hash, entry_state).await?;
+            ctx.global.db.set(*hash, entry_state).await?;
             storage.into()
         } else {
             storage.into()