Use -o to ignore optional deps with --clean

Fixes Morganamilo#812

man/paru.8

@@ -108,7 +108,8 @@ date. Updates will then be detected on the next commit.
 Remove unneeded dependencies.
 
 Make and check dependencies are considered for
-foreign packages. Pass this twice to ignore these.
+foreign packages. Pass this twice to ignore these. Pass \-o to
+ignore optional dependencies.
 
 .SH SHOW OPTIONS (APPLY TO \-P AND \-\-SHOW)
 .TP

src/args.rs

@@ -57,6 +57,7 @@ pub static PACMAN_FLAGS: &[&str] = &[
     "recursive",
     "unneeded",
     "clean",
+    "optional",
     "sysupgrade",
     "w",
     "downloadonly",

src/command_line.rs

@@ -210,7 +210,11 @@ impl Config {
                 self.stats = true;
                 self.ssh = true;
             }
-            Arg::Long("order") | Arg::Short('o') => self.order = true,
+            Arg::Long("order") => self.order = true,
+            Arg::Short('o') => {
+                self.order = true;
+                self.optional = true;
+            }
             Arg::Long("removemake") => {
                 self.remove_make = YesNoAsk::Yes.default_or(argkey, value.ok())?
             }
@@ -261,6 +265,7 @@ impl Config {
             }
             Arg::Long("nosudoloop") => self.sudo_loop.clear(),
             Arg::Long("clean") => self.clean += 1,
+            Arg::Long("optional") => self.optional = true,
             Arg::Long("complete") => self.complete = true,
             Arg::Short('c') => {
                 self.complete = true;

src/config.rs

@@ -406,6 +406,7 @@ pub struct Config {
     pub use_ask: bool,
     pub save_changes: bool,
     pub clean: usize,
+    pub optional: bool,
     pub complete: bool,
     pub print: bool,
     pub news_on_upgrade: bool,

src/lib.rs

@@ -242,10 +242,11 @@ async fn handle_yay(config: &mut Config) -> Result<i32> {
         Ok(0)
     } else if config.clean > 0 {
         config.need_root = true;
-        let unneeded = util::unneeded_pkgs(config, config.clean == 1);
+        let unneeded = util::unneeded_pkgs(config, config.clean == 1, !config.optional);
         if !unneeded.is_empty() {
             let mut args = config.pacman_args();
             args.remove("c").remove("clean");
+            args.remove("o");
             args.targets = unneeded;
             args.op = "remove";
             Ok(exec::pacman(config, &args)?.code())

src/util.rs

@@ -167,7 +167,7 @@ enum State {
     Keep,
 }
 
-pub fn unneeded_pkgs(config: &Config, optional: bool) -> Vec<&str> {
+pub fn unneeded_pkgs(config: &Config, keep_make: bool, keep_optional: bool) -> Vec<&str> {
     let mut states = HashMap::new();
     let mut remove = Vec::new();
     let mut providers = HashMap::<_, Vec<_>>::new();
@@ -221,11 +221,11 @@ pub fn unneeded_pkgs(config: &Config, optional: bool) -> Vec<&str> {
                 state.set(State::Keep);
                 check_deps(pkg.depends());
 
-                if optional {
+                if keep_optional {
                     check_deps(pkg.optdepends());
                 }
 
-                if config.clean > 1 {
+                if keep_make {
                     continue;
                 }