edward/mangadex-home-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix double write bug

Browse source
This commit is contained in:
Edward Shen 2021-07-14 19:11:46 -04:00
parent 9209b822a9
commit b1797dafd2
Signed by: edward
GPG key ID: 19182661E818369F
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/cache/fs.rs vendored
View file

@ -158,10 +158,11 @@ impl<R: AsyncRead> AsyncRead for EncryptedReader<R> {
cx: &mut Context<'_>, cx: &mut Context<'_>,
buf: &mut ReadBuf<'_>, buf: &mut ReadBuf<'_>,
) -> Poll<std::io::Result<()>> { ) -> Poll<std::io::Result<()>> {
let mut pinned = self.as_mut();
let previously_read = buf.filled().len(); let previously_read = buf.filled().len();
let res = self.as_mut().file.as_mut().poll_read(cx, buf); let res = pinned.file.as_mut().poll_read(cx, buf);
let bytes_modified = buf.filled().len() - previously_read; let bytes_modified = buf.filled().len() - previously_read;
self.keystream.apply_keystream( pinned.keystream.apply_keystream(
&mut buf.filled_mut()[previously_read..previously_read + bytes_modified], &mut buf.filled_mut()[previously_read..previously_read + bytes_modified],
); );
res res
@ -214,7 +215,7 @@ impl<'a, R: AsyncBufRead> Future for MetadataFuture<'a, R> {
// This needs to be outside the loop because we need to drop the // This needs to be outside the loop because we need to drop the
// reader ref, since that depends on a mut self. // reader ref, since that depends on a mut self.
pinned.as_mut().consume(dbg!(bytes_consumed)); pinned.as_mut().consume(bytes_consumed);
return res; return res;
} }
} }
@ -326,7 +327,9 @@ impl AsyncWrite for EncryptedDiskWriter {
Poll::Ready(Ok(buf.len())) Poll::Ready(Ok(buf.len()))
} }
Poll::Ready(Err(e)) => Poll::Ready(Err(e)), Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
Poll::Pending => Poll::Pending, // We have written the data to our buffer, even if we haven't
// couldn't write the file to disk.
Poll::Pending => Poll::Ready(Ok(buf.len())),
} }
} }