diff --git a/lib/common/rust/api/downloader_api.dart b/lib/common/rust/api/downloader_api.dart index a1a6cfd..07e95ff 100644 --- a/lib/common/rust/api/downloader_api.dart +++ b/lib/common/rust/api/downloader_api.dart @@ -234,4 +234,19 @@ class DownloadTaskInfo { } /// Download task status -enum DownloadTaskStatus { initializing, live, paused, error, finished } +enum DownloadTaskStatus { + /// Checking/verifying existing files + checking, + + /// Actively downloading + live, + + /// Paused + paused, + + /// Error occurred + error, + + /// Download completed + finished, +} diff --git a/lib/provider/download_manager.g.dart b/lib/provider/download_manager.g.dart index a27c706..8a98e08 100644 --- a/lib/provider/download_manager.g.dart +++ b/lib/provider/download_manager.g.dart @@ -41,7 +41,7 @@ final class DownloadManagerProvider } } -String _$downloadManagerHash() => r'95a8105bb544c8a1996f321e1d0258c41e18effa'; +String _$downloadManagerHash() => r'f12d3fb1d7c03fdfccff7d07903218f38a860437'; abstract class _$DownloadManager extends $Notifier { DownloadManagerState build(); diff --git a/lib/ui/home/downloader/home_downloader_ui_model.dart b/lib/ui/home/downloader/home_downloader_ui_model.dart index f56f190..338ebc2 100644 --- a/lib/ui/home/downloader/home_downloader_ui_model.dart +++ b/lib/ui/home/downloader/home_downloader_ui_model.dart @@ -131,8 +131,8 @@ class HomeDownloaderUIModel extends _$HomeDownloaderUIModel { switch (status) { case DownloadTaskStatus.live: return "live"; - case DownloadTaskStatus.initializing: - return "initializing"; + case DownloadTaskStatus.checking: + return "checking"; case DownloadTaskStatus.paused: return "paused"; case DownloadTaskStatus.error: @@ -191,7 +191,7 @@ class HomeDownloaderUIModel extends _$HomeDownloaderUIModel { case DownloadTaskStatus.live: activeTasks.add(task); break; - case DownloadTaskStatus.initializing: + case DownloadTaskStatus.checking: case DownloadTaskStatus.paused: waitingTasks.add(task); break; diff --git a/rust/src/api/downloader_api.rs b/rust/src/api/downloader_api.rs index a25fe72..45b02a6 100644 --- a/rust/src/api/downloader_api.rs +++ b/rust/src/api/downloader_api.rs @@ -37,10 +37,15 @@ static TASK_OUTPUT_FOLDERS: once_cell::sync::Lazy> /// Download task status #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub enum DownloadTaskStatus { - Initializing, + /// Checking/verifying existing files + Checking, + /// Actively downloading Live, + /// Paused Paused, + /// Error occurred Error, + /// Download completed Finished, } @@ -368,9 +373,11 @@ pub async fn downloader_get_task_info(task_id: usize) -> Result DownloadTaskStatus { } match stats.state { - TorrentStatsState::Initializing => DownloadTaskStatus::Initializing, + TorrentStatsState::Initializing => DownloadTaskStatus::Checking, TorrentStatsState::Live => DownloadTaskStatus::Live, TorrentStatsState::Paused => DownloadTaskStatus::Paused, TorrentStatsState::Error => DownloadTaskStatus::Error, @@ -485,7 +492,7 @@ pub async fn downloader_get_global_stats() -> Result { match task.status { DownloadTaskStatus::Live => stat.num_active += 1, - DownloadTaskStatus::Paused | DownloadTaskStatus::Initializing => stat.num_waiting += 1, + DownloadTaskStatus::Paused | DownloadTaskStatus::Checking => stat.num_waiting += 1, _ => {} } } diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs index 079bb9e..4cd038b 100644 --- a/rust/src/frb_generated.rs +++ b/rust/src/frb_generated.rs @@ -1879,7 +1879,7 @@ impl CstDecode for i32 { // Codec=Cst (C-struct based), see doc to use other codecs fn cst_decode(self) -> crate::api::downloader_api::DownloadTaskStatus { match self { - 0 => crate::api::downloader_api::DownloadTaskStatus::Initializing, + 0 => crate::api::downloader_api::DownloadTaskStatus::Checking, 1 => crate::api::downloader_api::DownloadTaskStatus::Live, 2 => crate::api::downloader_api::DownloadTaskStatus::Paused, 3 => crate::api::downloader_api::DownloadTaskStatus::Error, @@ -2074,7 +2074,7 @@ impl SseDecode for crate::api::downloader_api::DownloadTaskStatus { fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { let mut inner = ::sse_decode(deserializer); return match inner { - 0 => crate::api::downloader_api::DownloadTaskStatus::Initializing, + 0 => crate::api::downloader_api::DownloadTaskStatus::Checking, 1 => crate::api::downloader_api::DownloadTaskStatus::Live, 2 => crate::api::downloader_api::DownloadTaskStatus::Paused, 3 => crate::api::downloader_api::DownloadTaskStatus::Error, @@ -2635,7 +2635,7 @@ impl flutter_rust_bridge::IntoIntoDart flutter_rust_bridge::for_generated::DartAbi { match self { - Self::Initializing => 0.into_dart(), + Self::Checking => 0.into_dart(), Self::Live => 1.into_dart(), Self::Paused => 2.into_dart(), Self::Error => 3.into_dart(), @@ -3029,7 +3029,7 @@ impl SseEncode for crate::api::downloader_api::DownloadTaskStatus { fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) { ::sse_encode( match self { - crate::api::downloader_api::DownloadTaskStatus::Initializing => 0, + crate::api::downloader_api::DownloadTaskStatus::Checking => 0, crate::api::downloader_api::DownloadTaskStatus::Live => 1, crate::api::downloader_api::DownloadTaskStatus::Paused => 2, crate::api::downloader_api::DownloadTaskStatus::Error => 3,