notes.md

@@ -53,4 +53,3 @@
 - hashing
     - store file hashes with all `file::*` variants
     - check hashes on "continue"
-    - CLI switch to skip hashing

src/appstate.rs

@@ -136,7 +136,7 @@ impl AppState {
             }
             Err(path) => {
                 debug!("Finished {:?}!", path.display());
-                self.end_progressbar(ProgressBar::finish);
+                self.end_progressbar(|pb| pb.finish());
             }
         }
 
@@ -174,11 +174,15 @@ impl AppState {
         let checked = uploading.abort();
         self.inner.requeue_file(checked);
 
-        self.end_progressbar(ProgressBar::abandon);
+        self.end_progressbar(|pb| pb.abandon());
 
         Some(self)
     }
 
+    pub fn file_names(&self) -> Vec<&str> {
+        self.inner.file_names()
+    }
+
     pub fn save(&self) -> io::Result<()> {
         self.inner.save()
     }

src/cachefile.rs

@@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     cli::Cli,
-    file::{self, Chunk},
+    file::{self, Chunk, FileTrait},
     sharry::{self, Client, Uri},
 };
 
@@ -21,6 +21,13 @@ enum FileState {
 }
 
 impl FileState {
+    fn file_name(&self) -> &str {
+        match self {
+            FileState::C(c) => c.get_name(),
+            FileState::U(u) => u.get_name(),
+        }
+    }
+
     fn start_upload(
         self,
         client: &impl sharry::Client,
@@ -85,6 +92,10 @@ impl CacheFile {
         }
     }
 
+    pub fn file_names(&self) -> Vec<&str> {
+        self.files.iter().map(FileState::file_name).collect()
+    }
+
     pub fn is_empty(&self) -> bool {
         self.files.is_empty()
     }

src/cli.rs

@@ -14,7 +14,7 @@ use clap::{
 use log::LevelFilter;
 
 use crate::{
-    file::{Checked, FileTrait},
+    file::Checked,
     sharry::{NewShareRequest, Uri},
 };
 
@@ -130,10 +130,6 @@ impl Cli {
         }
     }
 
-    pub fn file_names(&self) -> Vec<&str> {
-        self.files.iter().map(FileTrait::get_name).collect()
-    }
-
     pub fn get_hash(&self) -> String {
         let file_refs = {
             let mut refs: Vec<_> = self.files.iter().collect();

src/main.rs

@@ -73,7 +73,7 @@ fn main() {
 
     info!("continuing with state: {state:#?}");
 
-    let fns_magenta = output::style_all(&args.file_names(), |s| style(s).magenta()).join(", ");
+    let fns_magenta = output::style_all(&state.file_names(), |s| style(s).magenta()).join(", ");
 
     println!("{} is uploading: {fns_magenta}", *SHRUPL);
 
@@ -90,30 +90,33 @@ fn main() {
                 Log::handle(&e);
                 tries += 1;
 
-                if let ClientError::InvalidParameter(p) = e { match p {
+                match e {
-                    // TODO Error 404: File not found
+                    ClientError::InvalidParameter(p) => match p {
-                    Parameter::FileID(fid) => {
+                        // TODO Error 404: File not found
-                        // requeue file
+                        Parameter::FileID(fid) => {
-                        let Some(s) = state.requeue_file() else {
+                            // requeue file
-                            Log::error("Failed to requeue file!");
+                            let Some(s) = state.requeue_file() else {
+                                Log::error("Failed to requeue file!");
+                            };
+
+                            trace!("File {fid:?} requeued (tried: {tries})");
+                            state = s;
+                        }
+                        // TODO Error 404: Share might have been deleted
+                        Parameter::ShareID(sid) => {
+                            Log::error(format_args!("404 sid: {sid}"));
+                        }
+                        p => Log::error(format_args!("Unexpected {p}!")),
+                    },
+                    _ => {
+                        // retry chunk
+                        let Some(s) = state.rewind() else {
+                            Log::error("Failed to retry chunk!");
                         };
 
-                        trace!("File {fid:?} requeued (tried: {tries})");
+                        trace!("State rewound, retrying last chunk (tried: {tries})");
                         state = s;
                     }
-                    // TODO Error 404: Share might have been deleted
-                    Parameter::ShareID(sid) => {
-                        Log::error(format_args!("404 sid: {sid}"));
-                    }
-                    p => Log::error(format_args!("Unexpected {p}!")),
-                } } else {
-                    // retry chunk
-                    let Some(s) = state.rewind() else {
-                        Log::error("Failed to retry chunk!");
-                    };
-
-                    trace!("State rewound, retrying last chunk (tried: {tries})");
-                    state = s;
                 }
             }
             Ok(false) => {