Update stdio.rs

Author: ChanTsune

cli/src/command/stdio.rs

@@ -636,6 +636,7 @@ fn run_create_archive(args: StdioCommand) -> anyhow::Result<()> {
                 writer,
                 collected_items,
                 &create_options,
+                &filter,
                 cli_option,
                 password,
                 args.solid,
@@ -646,6 +647,7 @@ fn run_create_archive(args: StdioCommand) -> anyhow::Result<()> {
                 io::stdout().lock(),
                 collected_items,
                 &create_options,
+                &filter,
                 cli_option,
                 password,
                 args.solid,
@@ -965,6 +967,7 @@ fn run_append(args: StdioCommand) -> anyhow::Result<()> {
                 &mut archive,
                 collected_items,
                 &create_options,
+                &filter,
                 password,
                 args.verbose,
             )?;
@@ -982,6 +985,7 @@ fn run_append(args: StdioCommand) -> anyhow::Result<()> {
                 &mut output_archive,
                 collected_items,
                 &create_options,
+                &filter,
                 password,
                 args.verbose,
             )?;
@@ -1019,6 +1023,7 @@ fn append_with_inclusions<W: Write>(
     archive: &mut Archive<W>,
     collected_items: Vec<CollectedItem>,
     create_options: &CreateOptions,
+    filter: &PathFilter<'_>,
     password: Option<&[u8]>,
     verbose: bool,
 ) -> anyhow::Result<()> {
@@ -1033,7 +1038,7 @@ fn append_with_inclusions<W: Write>(
                 }
             }
             CollectedItem::ArchiveMarker(source) => {
-                append_archive_entries(archive, &source, password, verbose)?;
+                append_archive_entries(archive, &source, filter, password, verbose)?;
             }
         }
     }
@@ -1070,10 +1075,12 @@ fn resolve_name_id(
 /// Processes collected items in order, interleaving filesystem entries
 /// with entries from included archives. Order is preserved exactly as
 /// specified on the command line.
+#[allow(clippy::too_many_arguments)]
 fn create_archive_with_inclusions<W: Write>(
     writer: W,
     collected_items: Vec<CollectedItem>,
     create_options: &CreateOptions,
+    filter: &PathFilter<'_>,
     write_option: WriteOptions,
     password: Option<&[u8]>,
     solid: bool,
@@ -1084,6 +1091,7 @@ fn create_archive_with_inclusions<W: Write>(
             writer,
             collected_items,
             create_options,
+            filter,
             write_option,
             password,
             verbose,
@@ -1093,6 +1101,7 @@ fn create_archive_with_inclusions<W: Write>(
             writer,
             collected_items,
             create_options,
+            filter,
             password,
             verbose,
         )
@@ -1104,6 +1113,7 @@ fn create_normal_archive_with_inclusions<W: Write>(
     writer: W,
     collected_items: Vec<CollectedItem>,
     create_options: &CreateOptions,
+    filter: &PathFilter<'_>,
     password: Option<&[u8]>,
     verbose: bool,
 ) -> anyhow::Result<()> {
@@ -1121,7 +1131,7 @@ fn create_normal_archive_with_inclusions<W: Write>(
                 }
             }
             CollectedItem::ArchiveMarker(source) => {
-                append_archive_entries(&mut archive, &source, password, verbose)?;
+                append_archive_entries(&mut archive, &source, filter, password, verbose)?;
             }
         }
     }
@@ -1135,6 +1145,7 @@ fn create_solid_archive_with_inclusions<W: Write>(
     writer: W,
     collected_items: Vec<CollectedItem>,
     create_options: &CreateOptions,
+    filter: &PathFilter<'_>,
     write_option: WriteOptions,
     password: Option<&[u8]>,
     verbose: bool,
@@ -1153,7 +1164,7 @@ fn create_solid_archive_with_inclusions<W: Write>(
                 }
             }
             CollectedItem::ArchiveMarker(source) => {
-                append_archive_entries_to_solid(&mut builder, &source, password, verbose)?;
+                append_archive_entries_to_solid(&mut builder, &source, filter, password, verbose)?;
             }
         }
     }
@@ -1170,16 +1181,21 @@ fn create_solid_archive_with_inclusions<W: Write>(
 fn append_archive_entries<W: Write>(
     archive: &mut Archive<W>,
     source: &ArchiveSource,
-    _password: Option<&[u8]>,
+    filter: &PathFilter<'_>,
+    password: Option<&[u8]>,
     verbose: bool,
 ) -> anyhow::Result<()> {
     let reader = source.open()?;
     let mut src_archive = Archive::read_header(reader)?;
 
-    for entry in src_archive.raw_entries() {
+    for entry in src_archive.entries_with_password(password) {
         let entry = entry?;
+        let entry_path = entry.header().path();
+        if filter.excluded(entry_path) {
+            continue;
+        }
         if verbose {
-            eprintln!("a (from @{source})");
+            eprintln!("a {} (from @{source})", entry_path.as_path().display());
         }
         archive.add_entry(entry)?;
     }
@@ -1193,6 +1209,7 @@ fn append_archive_entries<W: Write>(
 fn append_archive_entries_to_solid(
     builder: &mut SolidEntryBuilder,
     source: &ArchiveSource,
+    filter: &PathFilter<'_>,
     password: Option<&[u8]>,
     verbose: bool,
 ) -> anyhow::Result<()> {
@@ -1201,11 +1218,12 @@ fn append_archive_entries_to_solid(
 
     for entry in src_archive.entries_with_password(password) {
         let entry = entry?;
+        let entry_path = entry.header().path();
+        if filter.excluded(entry_path) {
+            continue;
+        }
         if verbose {
-            eprintln!(
-                "a {} (from @{source})",
-                entry.header().path().as_path().display(),
-            );
+            eprintln!("a {} (from @{source})", entry_path.as_path().display());
         }
 
         // Re-create entry for solid mode