[wip] retry chunks

- `AppState::rewind` impl
- error handling in `main`

src/appstate.rs

@@ -8,19 +8,15 @@ use console::style;
 use indicatif::{ProgressBar, ProgressStyle};
 use log::{debug, warn};
 
-use crate::file::Chunk;
-
 use super::{
     cachefile::CacheFile,
     cli::Cli,
-    file::{self, FileTrait},
+    file::{self, Chunk, FileTrait},
     sharry::{self, Client},
 };
 
 pub struct AppState {
     progress: RefCell<Option<ProgressBar>>,
-    buffer: Vec<u8>,
-
     http: ureq::Agent,
     inner: CacheFile,
 }
@@ -41,10 +37,9 @@ fn new_http(timeout: Option<Duration>) -> ureq::Agent {
 }
 
 impl AppState {
-    fn new(chunk_size: usize, http: ureq::Agent, inner: CacheFile) -> Self {
+    fn new(http: ureq::Agent, inner: CacheFile) -> Self {
         Self {
-            progress: None.into(),
+            progress: RefCell::new(None),
-            buffer: vec![0; chunk_size * 1024 * 1024],
             http,
             inner,
         }
@@ -55,11 +50,7 @@ impl AppState {
             .inspect_err(|e| debug!("could not resume from hash {:?}: {e}", args.get_hash()))
             .ok()?;
 
-        Some(Self::new(
+        Some(Self::new(new_http(args.get_timeout()), inner))
-            args.chunk_size,
-            new_http(args.get_timeout()),
-            inner,
-        ))
     }
 
     pub fn from_args(args: &Cli) -> sharry::Result<Self> {
@@ -71,11 +62,7 @@ impl AppState {
             args.get_share_request(),
         )?;
 
-        Ok(Self::new(
+        Ok(Self::new(http, CacheFile::from_args(args, share_id)))
-            args.chunk_size,
-            http,
-            CacheFile::from_args(args, share_id),
-        ))
     }
 
     fn get_or_create_progressbar(&self, uploading: &file::Uploading) -> Ref<'_, ProgressBar> {
@@ -114,7 +101,7 @@ impl AppState {
         }
     }
 
-    fn next_chunk(&mut self) -> io::Result<Option<Chunk>> {
+    fn next_chunk<'t>(&mut self, buffer: &'t mut [u8]) -> io::Result<Option<Chunk<'t>>> {
         let Some(mut uploading) = self.inner.pop_file(&self.http) else {
             self.inner
                 .share_notify(&self.http)
@@ -122,15 +109,14 @@ impl AppState {
 
             return Ok(None);
         };
-
         debug!("{uploading:?}");
 
         self.get_or_create_progressbar(&uploading);
 
-        let chunk = uploading.read(&mut self.buffer);
+        let chunk_res = uploading.read(buffer);
         self.inner.push_file(uploading);
-        let chunk = chunk?;
 
+        let chunk = chunk_res?;
         debug!("{chunk:?}");
 
         Ok(Some(chunk))
@@ -146,7 +132,7 @@ impl AppState {
                 let bar = self.get_or_create_progressbar(&uploading);
                 bar.set_position(uploading.get_offset());
                 // BUG in `indicatif` crate?
-                // `set_position` does not force immediate redraw, so we also call `inc_length` here
+                // `set_position` does not force an immediate redraw, so we also call `inc_length` here
                 bar.inc_length(0);
                 drop(bar);
 
@@ -161,8 +147,8 @@ impl AppState {
         self.inner.is_empty()
     }
 
-    pub fn upload_chunk(&mut self) -> sharry::Result<bool> {
+    pub fn upload_chunk(&mut self, buffer: &mut [u8]) -> sharry::Result<bool> {
-        let Some(chunk) = self.next_chunk()? else {
+        let Some(chunk) = self.next_chunk(buffer)? else {
             return Ok(true);
         };
 
@@ -170,12 +156,24 @@ impl AppState {
             chunk.get_patch_uri(),
             self.inner.alias_id(),
             chunk.get_offset(),
-            unsafe { chunk.get_data() },
+            chunk.get_data(),
         )?;
 
         Ok(self.is_done())
     }
 
+    pub fn rewind(mut self) -> Option<Self> {
+        let Some(uploading) = self.inner.pop_file(&self.http) else {
+            warn!("rewind called on empty queue");
+            return None;
+        };
+
+        let uploading = uploading.rewind()?;
+        self.inner.push_file(uploading);
+
+        Some(self)
+    }
+
     pub fn file_names(&self) -> Vec<&str> {
         self.inner.file_names()
     }

src/file/chunk.rs

@@ -1,25 +1,23 @@
 use std::fmt;
 
-pub struct Chunk {
+pub struct Chunk<'t> {
-    data: *const [u8],
+    data: &'t [u8],
     patch_uri: String,
     offset: u64,
 }
 
-impl fmt::Debug for Chunk {
+impl fmt::Debug for Chunk<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Chunk")
             .field("patch_uri", &self.patch_uri)
             .field("offset", &self.offset)
-            .field("data_len", &self.data.len())
+            .field("data.len()", &self.data.len())
             .finish_non_exhaustive()
     }
 }
 
-impl Chunk {
+impl<'t> Chunk<'t> {
-    pub fn new(data: &[u8], patch_uri: String, offset: u64) -> Self {
+    pub fn new(data: &'t [u8], patch_uri: String, offset: u64) -> Self {
-        let data: *const [u8] = data as *const [u8];
-
         Self {
             data,
             patch_uri,
@@ -27,8 +25,8 @@ impl Chunk {
         }
     }
 
-    pub unsafe fn get_data(&self) -> &[u8] {
+    pub fn get_data(&self) -> &[u8] {
-        unsafe { &*self.data }
+        self.data
     }
 
     pub fn get_length(&self) -> u64 {

src/file/uploading.rs

@@ -4,6 +4,7 @@ use std::{
     path::PathBuf,
 };
 
+use log::warn;
 use serde::{Deserialize, Serialize};
 
 use super::{Chunk, FileTrait};
@@ -45,14 +46,20 @@ impl Uploading {
     }
 
     pub fn rewind(self) -> Option<Self> {
-        self.last_offset.map(|last_offset| Self {
+        match self.last_offset {
-            last_offset: None,
+            Some(last_offset) => Some(Self {
-            offset: last_offset,
+                last_offset: None,
-            ..self
+                offset: last_offset,
-        })
+                ..self
+            }),
+            None => {
+                warn!("attempted to rewind twice");
+                None
+            }
+        }
     }
 
-    pub fn read(&mut self, buf: &mut [u8]) -> io::Result<Chunk> {
+    pub fn read<'t>(&mut self, buf: &'t mut [u8]) -> io::Result<Chunk<'t>> {
         let mut f = fs::File::open(&self.path)?;
 
         f.seek(SeekFrom::Start(self.offset))?;

src/main.rs

@@ -113,9 +113,21 @@ fn main() {
         style(state.file_names().join(", ")).magenta(),
     );
 
+    let mut buffer = vec![0; args.chunk_size * 1024 * 1024];
+
     loop {
-        match state.upload_chunk() {
+        match state.upload_chunk(&mut buffer) {
-            Err(e) => error!("error: {e:?}"), // HACK handle errors better
+            Err(e) => {
+                // HACK handle errors better
+                error!("error: {e:?}");
+
+                if let Some(s) = state.rewind() {
+                    state = s;
+                } else {
+                    eprintln!("{} Failed to retry chunk!", style("Error:").red().bold());
+                    process::exit(1);
+                };
+            }
             Ok(true) => {
                 info!("all uploads done");
                 state.clear().unwrap_or_else(|e| {