Handle errors in `download_progress` example

2 files changed, 43 insertions, 11 deletions

diff --git a/examples/download_progress/src/download.rs b/examples/download_progress/src/download.rs
index 0562f54d..96e1dc28 100644
--- a/examples/download_progress/src/download.rs
+++ b/examples/download_progress/src/download.rs
@@ -35,15 +35,23 @@ where
                         let response = reqwest::get(&url).await;
 
                         match response {
-                            Ok(response) => Some((
-                                Progress::Started,
-                                State::Downloading {
-                                    total: response.content_length().unwrap(),
-                                    downloaded: 0,
-                                    response,
-                                },
-                            )),
-                            Err(_) => None,
+                            Ok(response) => {
+                                if let Some(total) = response.content_length() {
+                                    Some((
+                                        Progress::Started,
+                                        State::Downloading {
+                                            response,
+                                            total,
+                                            downloaded: 0,
+                                        },
+                                    ))
+                                } else {
+                                    Some((Progress::Errored, State::Finished))
+                                }
+                            }
+                            Err(_) => {
+                                Some((Progress::Errored, State::Finished))
+                            }
                         }
                     }
                     State::Downloading {
@@ -67,9 +75,16 @@ where
                             ))
                         }
                         Ok(None) => Some((Progress::Finished, State::Finished)),
-                        Err(_) => None,
+                        Err(_) => Some((Progress::Errored, State::Finished)),
                     },
-                    State::Finished => None,
+                    State::Finished => {
+                        // We do not let the stream die, as it would start a
+                        // new download repeatedly if the user is not careful
+                        // in case of errors.
+                        let _: () = iced::futures::future::pending().await;
+
+                        None
+                    }
                 }
             },
         ))
@@ -81,6 +96,7 @@ pub enum Progress {
     Started,
     Advanced(f32),
     Finished,
+    Errored,
 }
 
 pub enum State {
diff --git a/examples/download_progress/src/main.rs b/examples/download_progress/src/main.rs
index f3da3d7b..817a45ac 100644
--- a/examples/download_progress/src/main.rs
+++ b/examples/download_progress/src/main.rs
@@ -14,6 +14,7 @@ enum Example {
     Idle { button: button::State },
     Downloading { progress: f32 },
     Finished { button: button::State },
+    Errored { button: button::State },
 }
 
 #[derive(Debug, Clone)]
@@ -60,6 +61,11 @@ impl Application for Example {
                             button: button::State::new(),
                         }
                     }
+                    download::Progress::Errored => {
+                        *self = Example::Errored {
+                            button: button::State::new(),
+                        };
+                    }
                 },
                 _ => {}
             },
@@ -83,6 +89,7 @@ impl Application for Example {
             Example::Idle { .. } => 0.0,
             Example::Downloading { progress } => *progress,
             Example::Finished { .. } => 100.0,
+            Example::Errored { .. } => 0.0,
         };
 
         let progress_bar = ProgressBar::new(0.0..=100.0, current_progress);
@@ -106,6 +113,15 @@ impl Application for Example {
                 Text::new(format!("Downloading... {:.2}%", current_progress))
                     .into()
             }
+            Example::Errored { button } => Column::new()
+                .spacing(10)
+                .align_items(Align::Center)
+                .push(Text::new("Something went wrong :("))
+                .push(
+                    Button::new(button, Text::new("Try again"))
+                        .on_press(Message::Download),
+                )
+                .into(),
         };
 
         let content = Column::new()