improvement: Streamlines FileSourceWidget and implements Restore

kreshuklab · Jul 1, 2024 · 5dbe6ca · 5dbe6ca
1 parent 7db639d
commit 5dbe6ca
Show file tree

Hide file tree

Showing 4 changed files with 215 additions and 146 deletions.
diff --git a/bioimg_gui/src/project_data.rs b/bioimg_gui/src/project_data.rs
@@ -1,5 +1,3 @@
-use bioimg_runtime as rt;
-
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct AuthorWidgetRawData{
     pub name_widget: String,
@@ -32,23 +30,14 @@ pub struct MaintainerWidgetRawData {
 // }
 
 #[derive(serde::Serialize, serde::Deserialize)]
-pub enum FileWidgetResultRawData<OkRawData>{
+pub enum LocalFileSourceWidgetRawData{
     Empty,
-    AboutToLoad{path: String},
-    Finished{path: String, value: Result<OkRawData, String>}
+    AboutToLoad{path: String, inner_path: Option<String>}
 }
 
-#[derive(serde::Serialize, serde::Deserialize)]
-pub enum LocalFileSourceRawData{
-    PickedNormalFile{path: String},
-    PickedEmptyZip{path: String},
-    PickingInner{outer: String, inner: String},
-}
-
-
 #[derive(serde::Serialize, serde::Deserialize)]
 pub enum FileSourceWidgetRawData{
-    Path(LocalFileSourceRawData),
+    Local(LocalFileSourceWidgetRawData),
     Url(String),
 }