-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
9242b06
commit 0987dfb
Showing
9 changed files
with
485 additions
and
480 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,135 +1,82 @@ | ||
| // This is based on https://github.com/iced-rs/iced/blob/master/examples/download_progress/src/download.rs | ||
| // with some modifications to store the downloaded bytes in `Progress::Finished` and `State::Downloading` | ||
| // and to keep track of any download errors. | ||
| use iced::subscription; | ||
| use iced::futures::{SinkExt, Stream, StreamExt}; | ||
| use iced::stream::try_channel; | ||
| use iced::Subscription; | ||
|
|
||
| use std::hash::Hash; | ||
| use std::sync::Arc; | ||
|
|
||
| // Just a little utility function | ||
| pub fn file<I: 'static + Hash + Copy + Send + Sync, T: ToString>( | ||
| id: I, | ||
| url: T, | ||
| ) -> iced::Subscription<(I, Progress)> { | ||
| subscription::unfold(id, State::Ready(url.to_string()), move |state| { | ||
| download(id, state) | ||
| ) -> iced::Subscription<(I, Result<Progress, DownloadError>)> { | ||
| Subscription::run_with_id( | ||
| id, | ||
| download(url.to_string()).map(move |progress| (id, progress)), | ||
| ) | ||
| } | ||
|
|
||
| fn download(url: String) -> impl Stream<Item = Result<Progress, DownloadError>> { | ||
| try_channel(1, move |mut output| async move { | ||
| let response = reqwest::get(&url).await?; | ||
| let total = response | ||
| .content_length() | ||
| .ok_or(DownloadError::NoContentLength)?; | ||
|
|
||
| let _ = output.send(Progress::Downloading(0.0)).await; | ||
|
|
||
| let mut byte_stream = response.bytes_stream(); | ||
| let mut downloaded = 0; | ||
| let mut bytes = Vec::new(); | ||
|
|
||
| while let Some(next_bytes) = byte_stream.next().await { | ||
| let chunk = next_bytes?; | ||
| downloaded += chunk.len(); | ||
| bytes.append(&mut chunk.to_vec()); | ||
|
|
||
| let _ = output | ||
| .send(Progress::Downloading( | ||
| 100.0 * downloaded as f32 / total as f32, | ||
| )) | ||
| .await; | ||
| } | ||
|
|
||
| let _ = output.send(Progress::Finished(bytes)).await; | ||
|
|
||
| Ok(()) | ||
| }) | ||
| } | ||
|
|
||
| #[derive(Debug, Hash, Clone)] | ||
| pub struct Download<I> { | ||
| id: I, | ||
| url: String, | ||
| #[derive(Debug, Clone)] | ||
| pub enum Progress { | ||
| Downloading(f32), | ||
| Finished(Vec<u8>), | ||
| } | ||
|
|
||
| /// Possible errors with download. | ||
| #[derive(PartialEq, Eq, Debug, Clone)] | ||
| #[derive(Debug, Clone)] | ||
| pub enum DownloadError { | ||
| UnknownContentLength, | ||
| RequestError(String), | ||
| RequestFailed(Arc<reqwest::Error>), | ||
| NoContentLength, | ||
| } | ||
|
|
||
| impl std::fmt::Display for DownloadError { | ||
| fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | ||
| match self { | ||
| Self::UnknownContentLength => { | ||
| Self::NoContentLength => { | ||
| write!(f, "Response has unknown content length.") | ||
| } | ||
| Self::RequestError(e) => { | ||
| Self::RequestFailed(e) => { | ||
| write!(f, "Request error: '{}'.", e) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| async fn download<I: Copy>(id: I, state: State) -> ((I, Progress), State) { | ||
| match state { | ||
| State::Ready(url) => { | ||
| let response = reqwest::get(&url).await; | ||
|
|
||
| match response { | ||
| Ok(response) => { | ||
| if let Some(total) = response.content_length() { | ||
| ( | ||
| (id, Progress::Started), | ||
| State::Downloading { | ||
| response, | ||
| total, | ||
| downloaded: 0, | ||
| bytes: Vec::new(), | ||
| }, | ||
| ) | ||
| } else { | ||
| ( | ||
| (id, Progress::Errored(DownloadError::UnknownContentLength)), | ||
| State::Finished, | ||
| ) | ||
| } | ||
| } | ||
| Err(e) => ( | ||
| ( | ||
| id, | ||
| Progress::Errored(DownloadError::RequestError(e.to_string())), | ||
| ), | ||
| State::Finished, | ||
| ), | ||
| } | ||
| } | ||
| State::Downloading { | ||
| mut response, | ||
| total, | ||
| downloaded, | ||
| mut bytes, | ||
| } => match response.chunk().await { | ||
| Ok(Some(chunk)) => { | ||
| let downloaded = downloaded + chunk.len() as u64; | ||
|
|
||
| let percentage = (downloaded as f32 / total as f32) * 100.0; | ||
|
|
||
| bytes.append(&mut chunk.to_vec()); | ||
|
|
||
| ( | ||
| (id, Progress::Advanced(percentage)), | ||
| State::Downloading { | ||
| response, | ||
| total, | ||
| downloaded, | ||
| bytes, | ||
| }, | ||
| ) | ||
| } | ||
| Ok(None) => ((id, Progress::Finished(bytes)), State::Finished), | ||
| Err(e) => ( | ||
| ( | ||
| id, | ||
| Progress::Errored(DownloadError::RequestError(e.to_string())), | ||
| ), | ||
| State::Finished, | ||
| ), | ||
| }, | ||
| 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. | ||
| iced::futures::future::pending().await | ||
| } | ||
| impl From<reqwest::Error> for DownloadError { | ||
| fn from(error: reqwest::Error) -> Self { | ||
| DownloadError::RequestFailed(Arc::new(error)) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub enum Progress { | ||
| Started, | ||
| Advanced(f32), | ||
| Finished(Vec<u8>), | ||
| Errored(DownloadError), | ||
| } | ||
|
|
||
| pub enum State { | ||
| Ready(String), | ||
| Downloading { | ||
| response: reqwest::Response, | ||
| total: u64, | ||
| downloaded: u64, | ||
| bytes: Vec<u8>, | ||
| }, | ||
| Finished, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.