fix: #362

phira/src/page/respack.rs

@@ -16,6 +16,7 @@ use prpr::{
     ui::{DRectButton, Dialog, Scroll, Ui},
 };
 use sasa::{AudioManager, PlaySfxParams, Sfx};
+use serde_yaml::Error;
 use std::{
     fs::File,
     path::{Path, PathBuf},
@@ -84,15 +85,41 @@ impl ResPackPage {
         MainScene::take_imported_respack();
         let dir = dir::respacks()?;
         let mut items = vec![ResPackItem::new(None, tl!("default").into_owned())];
-        for path in &get_data().respacks {
-            let p = format!("{dir}/{path}");
-            let p = Path::new(&p);
-            if !p.is_dir() {
-                continue;
-            }
-            let info: ResPackInfo = serde_yaml::from_reader(File::open(p.join("info.yml"))?)?;
-            items.push(ResPackItem::new(Some(p.to_owned()), info.name));
-        }
+        let data = get_data_mut();
+        data.respacks = data
+            .respacks
+            .clone()
+            .into_iter()
+            .filter(|path| -> bool {
+                let p = format!("{dir}/{path}");
+                let p = Path::new(&p);
+                if !p.is_dir() {
+                    return false;
+                }
+                let cfg = File::open(p.join("info.yml"));
+                match cfg {
+                    Err(_) => {
+                        let _ = std::fs::remove_dir_all(p);
+                        false
+                    }
+                    Ok(cfg) => {
+                        let info: Result<ResPackInfo, Error> = serde_yaml::from_reader(cfg);
+                        match info {
+                            Err(_) => {
+                                let _ = std::fs::remove_dir_all(p);
+                                false
+                            }
+                            Ok(info) => {
+                                items.push(ResPackItem::new(Some(p.to_owned()), info.name));
+                                true
+                            }
+                        }
+                    }
+                }
+            })
+            .collect();
+        save_data()?;
+
         let index = get_data().respack_id;
         items[index].load();
         let delete_btn = DRectButton::new().with_delta(-0.004).with_elevation(0.);

phira/src/scene/main.rs

@@ -335,24 +335,26 @@ impl Scene for MainScene {
                     self.import_task = Some(Task::new(import_chart(file)));
                 }
                 "_import_respack" => {
+                    let root = dir::respacks()?;
+                    let dir = prpr::dir::Dir::new(&root)?;
+                    let mut dir_id = String::new();
                     let item: Result<ResPackItem> = (|| {
-                        let root = dir::respacks()?;
-                        let dir = prpr::dir::Dir::new(&root)?;
-                        let mut id = Uuid::new_v4();
-                        while dir.exists(id.to_string())? {
-                            id = Uuid::new_v4();
+                        let mut uuid = Uuid::new_v4();
+                        while dir.exists(uuid.to_string())? {
+                            uuid = Uuid::new_v4();
                         }
-                        let id = id.to_string();
-                        dir.create_dir_all(&id)?;
-                        let dir = dir.open_dir(&id)?;
+                        dir_id = uuid.to_string();
+                        dir.create_dir_all(&dir_id)?;
+                        let dir = dir.open_dir(&dir_id)?;
                         unzip_into(BufReader::new(File::open(file)?), &dir, false).context("failed to unzip")?;
                         let config: ResPackInfo = serde_yaml::from_reader(dir.open("info.yml").context("missing yml")?)?;
-                        get_data_mut().respacks.push(id.clone());
+                        get_data_mut().respacks.push(dir_id.clone());
                         save_data()?;
-                        Ok(ResPackItem::new(Some(format!("{root}/{id}").into()), config.name))
+                        Ok(ResPackItem::new(Some(format!("{root}/{dir_id}").into()), config.name))
                     })();
                     match item {
                         Err(err) => {
+                            dir.remove_dir_all(&dir_id)?;
                             show_error(err.context(itl!("import-respack-failed")));
                         }
                         Ok(item) => {

prpr/src/dir.rs

@@ -49,6 +49,12 @@ impl Dir {
         Ok(())
     }
 
+    #[inline]
+    pub fn remove_dir_all(&self, p: impl AsRef<Path>) -> Result<()> {
+        std::fs::remove_dir_all(self.join(p)?)?;
+        Ok(())
+    }
+
     #[inline]
     pub fn open_dir(&self, p: impl AsRef<Path>) -> Result<Self> {
         Self::new(self.join(p)?)