jmm/shrupl
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

minor refactoring

Browse source
This commit is contained in:
Jörn-Michael Miehe 2025-06-24 02:05:27 +00:00
parent 005c5f7cfa
commit 1e05155cc1
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/appstate.rs
View file

@ -108,10 +108,7 @@ impl AppState {
self.touch_progressbar(); self.touch_progressbar();
let uploading = self let uploading = self.inner.expect_uploading();
.inner
.get_uploading(&self.http)?
.expect("we just checked!");
debug!("{uploading:?}"); debug!("{uploading:?}");
let chunk = uploading.read(buffer)?; let chunk = uploading.read(buffer)?;

28
src/cachefile.rs
View file

@ -87,6 +87,12 @@ impl CacheFile {
} }
} }
pub fn expect_uploading(&mut self) -> &mut file::Uploading {
self.uploading
.as_mut()
.expect("expect_uploading called while not uploading")
}
pub fn peek_uploading(&self) -> Option<&file::Uploading> { pub fn peek_uploading(&self) -> Option<&file::Uploading> {
self.uploading.as_ref() self.uploading.as_ref()
} }
@ -103,21 +109,23 @@ impl CacheFile {
} }
pub fn rewind_chunk(mut self) -> Option<Self> { pub fn rewind_chunk(mut self) -> Option<Self> {
let Some(upl) = self.uploading.take() else { self.uploading = Some(
panic!("rewind_chunk called while not uploading"); self.uploading
}; .take()
.expect("rewind_chunk called while not uploading")
self.uploading = Some(upl.rewind()?); .rewind()?,
);
Some(self) Some(self)
} }
pub fn abort_upload(&mut self) { pub fn abort_upload(&mut self) {
let Some(upl) = self.uploading.take() else { self.files.push_front(
panic!("abort_upload called while not uploading"); self.uploading
}; .take()
.expect("abort_upload called while not uploading")
self.files.push_front(upl.abort()); .abort(),
);
} }
pub fn share_notify(&self, client: &impl Client) -> sharry::Result<()> { pub fn share_notify(&self, client: &impl Client) -> sharry::Result<()> {