api3/admin/datastore/catar.rs: implement download

src/api3/admin/datastore/catar.rs

@@ -1,6 +1,7 @@
 use failure::*;
 
 use crate::tools;
+use crate::tools::wrapped_reader_stream::*;
 use crate::backup::datastore::*;
 use crate::backup::archive_index::*;
 //use crate::server::rest::*;
@@ -106,7 +107,7 @@ pub fn api_method_upload_catar() -> ApiAsyncMethod {
     )
 }
 
-fn download_catar(parts: Parts, req_body: Body, param: Value, _info: &ApiAsyncMethod) -> Result<BoxFut, Error> {
+fn download_catar(_parts: Parts, _req_body: Body, param: Value, _info: &ApiAsyncMethod) -> Result<BoxFut, Error> {
 
     let store = tools::required_string_param(&param, "store")?;
     let archive_name = tools::required_string_param(&param, "archive_name")?;
@@ -128,8 +129,15 @@ fn download_catar(parts: Parts, req_body: Body, param: Value, _info: &ApiAsyncMe
     path.push(full_archive_name);
 
     let index = datastore.open_archive_reader(path)?;
+    let reader = BufferedArchiveReader::new(index);
+    let stream = WrappedReaderStream::new(reader);
 
-    bail!("not implemeneted");
+    // fixme: set size, content type?
+    let response = http::Response::builder()
+        .status(200)
+        .body(Body::wrap_stream(stream))?;
+
+    Ok(Box::new(future::ok(response)))
 }
 
 pub fn api_method_download_catar() -> ApiAsyncMethod {

src/backup/archive_index.rs

@@ -32,6 +32,9 @@ pub struct ArchiveIndexReader {
     ctime: u64,
 }
 
+// fixme: ???!!!
+unsafe impl Send for ArchiveIndexReader {}
+
 impl Drop for ArchiveIndexReader {
 
     fn drop(&mut self) {
@@ -188,8 +191,8 @@ impl ArchiveIndexReader {
     }
 }
 
-pub struct BufferedArchiveReader<'a> {
-    index: &'a ArchiveIndexReader,
+pub struct BufferedArchiveReader {
+    index: ArchiveIndexReader,
     archive_size: u64,
     read_buffer: Vec<u8>,
     buffered_chunk_idx: usize,
@@ -197,9 +200,9 @@ pub struct BufferedArchiveReader<'a> {
     read_offset: u64,
 }
 
-impl <'a>  BufferedArchiveReader<'a> {
+impl BufferedArchiveReader {
 
-    pub fn new(index: &'a ArchiveIndexReader) -> Self {
+    pub fn new(index: ArchiveIndexReader) -> Self {
 
         let archive_size = index.chunk_end(index.index_entries - 1);
         Self {
@@ -216,7 +219,7 @@ impl <'a>  BufferedArchiveReader<'a> {
 
     fn buffer_chunk(&mut self, idx: usize) -> Result<(), Error> {
 
-        let index = self.index;
+        let index = &self.index;
         let end = index.chunk_end(idx);
         let digest = index.chunk_digest(idx);
         index.store.read_chunk(digest, &mut self.read_buffer)?;
@@ -228,14 +231,14 @@ impl <'a>  BufferedArchiveReader<'a> {
     }
 }
 
-impl <'a> crate::tools::BufferedReader for  BufferedArchiveReader<'a> {
+impl crate::tools::BufferedReader for  BufferedArchiveReader {
 
     fn buffered_read(&mut self, offset: u64) -> Result<&[u8], Error> {
 
         if offset == self.archive_size { return Ok(&self.read_buffer[0..0]); }
 
         let buffer_len = self.read_buffer.len();
-        let index = self.index;
+        let index = &self.index;
 
         // optimization for sequential read
         if buffer_len > 0 &&
@@ -267,7 +270,7 @@ impl <'a> crate::tools::BufferedReader for  BufferedArchiveReader<'a> {
 
 }
 
-impl <'a> std::io::Read for  BufferedArchiveReader<'a> {
+impl std::io::Read for  BufferedArchiveReader {
 
     fn read(&mut self, buf: &mut [u8]) -> Result<usize, std::io::Error> {
 
@@ -289,7 +292,7 @@ impl <'a> std::io::Read for  BufferedArchiveReader<'a> {
     }
 }
 
-impl <'a> std::io::Seek for  BufferedArchiveReader<'a> {
+impl std::io::Seek for  BufferedArchiveReader {
 
     fn seek(&mut self, pos: std::io::SeekFrom) -> Result<u64, std::io::Error> {