♻️ Inlinize Ace to AceWithPlatform conversion

ChanTsune · Nov 24, 2024 · 62b5630 · 62b5630
1 parent fe399d9
commit 62b5630
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/cli/src/command/list.rs b/cli/src/command/list.rs
@@ -26,6 +26,7 @@ use rayon::prelude::*;
 #[cfg(feature = "memmap")]
 use std::path::Path;
 use std::{
+    collections::HashMap,
     fmt::{Display, Formatter},
     io,
     time::{Duration, SystemTime, UNIX_EPOCH},
@@ -98,7 +99,7 @@ struct TableRow {
     modified: Option<Duration>,
     name: String,
     xattrs: Vec<ExtendedAttribute>,
-    acl: Vec<chunk::AceWithPlatform>,
+    acl: HashMap<chunk::AcePlatform, Vec<chunk::Ace>>,
     privates: Vec<RawChunk>,
 }
 
@@ -120,7 +121,7 @@ where
     ) -> Result<Self, Self::Error> {
         let header = entry.header();
         let metadata = entry.metadata();
-        let acl = entry.acl_with_platform()?;
+        let acl = entry.acl()?;
         let has_acl = !acl.is_empty();
         let has_xattr = !entry.xattrs().is_empty();
         Ok(Self {
@@ -383,7 +384,13 @@ fn detail_list_entries(entries: impl Iterator<Item = TableRow>, options: ListOpt
             content.name,
         ]);
         if options.show_acl {
-            for a in &content.acl {
+            let acl = content.acl.into_iter().flat_map(|(platform, ace)| {
+                ace.into_iter().map(move |it| chunk::AceWithPlatform {
+                    platform: Some(platform.clone()),
+                    ace: it,
+                })
+            });
+            for a in acl {
                 builder.push_record([String::new(), String::new(), a.to_string()]);
                 acl_rows.push(builder.count_records());
             }

diff --git a/cli/src/ext.rs b/cli/src/ext.rs
@@ -5,18 +5,6 @@ use std::io;
 
 pub(crate) trait NormalEntryExt {
     fn acl(&self) -> io::Result<HashMap<AcePlatform, Vec<Ace>>>;
-    fn acl_with_platform(&self) -> io::Result<Vec<AceWithPlatform>> {
-        let acl = self.acl()?;
-        Ok(acl
-            .into_iter()
-            .flat_map(|(platform, ace)| {
-                ace.into_iter().map(move |it| AceWithPlatform {
-                    platform: Some(platform.clone()),
-                    ace: it,
-                })
-            })
-            .collect())
-    }
 }
 
 impl<T> NormalEntryExt for NormalEntry<T>