Fix repo remove

Author: linyinfeng

src/main.rs

@@ -453,8 +453,11 @@ async fn repo_add(bot: Bot, msg: Message, name: String, url: String) -> Result<(
     let settings = {
         let mut locked = resources.settings.write().await;
         if let Some(info) = &github_info {
-            let repository = octocrab::instance().repos(&info.owner, &info.repo)
-                .get().await.map_err(|e| Error::Octocrab(Box::new(e)))?;
+            let repository = octocrab::instance()
+                .repos(&info.owner, &info.repo)
+                .get()
+                .await
+                .map_err(|e| Error::Octocrab(Box::new(e)))?;
             if let Some(default_branch) = repository.default_branch {
                 let default_regex_str = format!("^{}$", regex::escape(&default_branch));
                 let default_regex = Regex::new(&default_regex_str).map_err(Error::from)?;

src/repo/mod.rs

@@ -68,11 +68,13 @@ pub async fn create(name: &str, url: &str) -> Result<Output, Error> {
 }
 
 pub async fn remove(name: &str) -> Result<(), Error> {
+    let resource = resources(name).await?;
+    drop(resource);
     RESOURCES_MAP
-        .remove(&name.to_string(), async |r: Arc<RepoResources>| {
+        .remove(&name.to_string(), async |r: RepoResources| {
             log::info!("try remove repository outer directory: {:?}", r.paths.outer);
             remove_dir_all(&r.paths.outer).await?;
-            log::info!("repository outer directory removed: {:?}", &r.paths.outer);
+            log::info!("repository outer directory removed: {:?}", r.paths.outer);
             Ok(())
         })
         .await?;

src/resources.rs

@@ -46,13 +46,13 @@ impl<I, R> ResourcesMap<I, R> {
     pub async fn remove<C, F>(&self, index: &I, cleanup: C) -> Result<(), Error>
     where
         I: Ord + Clone + fmt::Display + fmt::Debug,
-        C: FnOnce(Arc<R>) -> F,
+        C: FnOnce(R) -> F,
         F: Future<Output = Result<(), Error>>,
     {
         let mut map = self.map.lock().await;
         if let Some(arc) = map.remove(index) {
-            wait_for_resources_drop(index, arc.clone()).await;
-            cleanup(arc).await?; // run before the map unlock
+            let resource = wait_for_resources_drop(index, arc).await;
+            cleanup(resource).await?;
             Ok(())
         } else {
             Err(Error::UnknownResource(format!("{index}")))
@@ -65,22 +65,22 @@ impl<I, R> ResourcesMap<I, R> {
     {
         let mut map = self.map.lock().await;
         while let Some((task, resources)) = map.pop_first() {
-            wait_for_resources_drop(&task, resources).await;
+            let _resource = wait_for_resources_drop(&task, resources).await;
         }
         Ok(())
     }
 }
 
-pub async fn wait_for_resources_drop<I, R>(index: &I, mut arc: Arc<R>)
+pub async fn wait_for_resources_drop<I, R>(index: &I, mut arc: Arc<R>) -> R
 where
     I: fmt::Display,
 {
     loop {
         match Arc::try_unwrap(arc) {
-            Ok(_resource) => {
+            Ok(resource) => {
                 // do nothing
                 // just drop
-                break;
+                return resource;
             }
             Err(a) => {
                 arc = a;