fix(oma-topics)!: make oma topics enabled pkgs operation atomic

Author: eatradish

oma-topics/src/lib.rs

@@ -207,7 +207,7 @@ impl<'a> TopicManager<'a> {
     }
 
     /// Enable select topic
-    pub fn add(&mut self, topic: &str) -> Result<()> {
+    pub fn add(&mut self, topic: &str) -> Result<Topic> {
         debug!("oma will opt_in: {}", topic);
 
         let index = self
@@ -220,11 +220,13 @@ impl<'a> TopicManager<'a> {
         debug!("Enabled: {enabled_names:?}");
 
         if let Some(index) = index {
+            let ic = index.clone();
+            let icc = index.clone();
             if !enabled_names.contains(&&index.name) {
-                self.enabled.push(index.clone());
+                self.enabled.push(ic);
             }
 
-            return Ok(());
+            return Ok(icc);
         }
 
         debug!("index: {index:?} does not exist");

src/subcommand/topics.rs

@@ -450,8 +450,11 @@ async fn topics_inner(
                 .unwrap()?;
     }
 
+    let mut enabled_pkgs = vec![];
+
     for i in opt_in {
-        tm.add(i)?;
+        let t = tm.add(i)?;
+        enabled_pkgs.extend(t.packages);
     }
 
     let mut downgrade_pkgs = vec![];
@@ -460,12 +463,6 @@ async fn topics_inner(
         downgrade_pkgs.extend(removed_topic.packages);
     }
 
-    let enabled_pkgs = tm
-        .enabled_topics()
-        .iter()
-        .flat_map(|x| x.packages.clone())
-        .collect::<Vec<_>>();
-
     Ok(TopicChanged {
         enabled_pkgs,
         downgrade_pkgs,