Skip to content

fix(integrations/webdav): Fix read file API changes #4462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xuanwo merged 2 commits into from
Apr 10, 2024
Merged

fix(integrations/webdav): Fix read file API changes #4462

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
780d14a
fix(integrations/webdav): Fix read file API changes
Xuanwo Apr 10, 2024
18883ac
Fix format
Xuanwo Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions integrations/dav-server/src/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use std::fmt;
use std::io::SeekFrom;

use bytes::Bytes;
use bytes::{Bytes, BytesMut};
use dav_server::fs::DavFile;
use dav_server::fs::DavMetaData;
use dav_server::fs::FsFuture;
Expand All @@ -34,6 +34,7 @@ pub struct WebdavFile {
op: Operator,
path: String,
state: WebdavFileState,
pos: u64,
}

struct WebdavFileState {
Expand All @@ -53,19 +54,23 @@ impl WebdavFile {
op,
path,
state: WebdavFileState { reader, writer },
pos: 0,
}
}
}

impl DavFile for WebdavFile {
fn read_bytes(&mut self, count: usize) -> FsFuture<Bytes> {
async move {
self.state
let mut buf = BytesMut::with_capacity(count);
let n = self
.state
.reader
.read(count)
.read(&mut buf, self.pos, count)
.await
.map(Bytes::from)
.map_err(convert_error)
.map_err(convert_error)?;
self.pos += n as u64;
Ok(buf.split().freeze())
}
.boxed()
}
Expand Down