Implemented a dual-pass system to identify and log excluded items separately.

Author: alighazi288

src/borg/archiver/extract_cmd.py

@@ -38,7 +38,6 @@ def do_extract(self, args, repository, manifest, archive):
         matcher = build_matcher(args.patterns, args.paths)
 
         progress = args.progress
-        output_list = args.output_list
         dry_run = args.dry_run
         stdout = args.stdout
         sparse = args.sparse
@@ -48,6 +47,7 @@ def do_extract(self, args, repository, manifest, archive):
         hlm = HardLinkManager(id_type=bytes, info_type=str)  # hlid -> path
 
         filter = build_filter(matcher, strip_components)
+
         if progress:
             pi = ProgressIndicatorPercent(msg="%5.1f%% Extracting: %s", step=0.1, msgid="extract")
             pi.output("Calculating total archive size for the progress indicator (might take long for large archives)")
@@ -56,9 +56,13 @@ def do_extract(self, args, repository, manifest, archive):
         else:
             pi = None
 
-        all_items = list(archive.iter_items(preload=True))
+        excluded_items = []
+        # First pass to identify excluded items
+        for item in archive.iter_items(preload=True):
+            if not matcher.match(item.path):
+                excluded_items.append(item.path)
 
-        for item in all_items:
+        for item in archive.iter_items(filter, preload=True):
             orig_path = item.path
             if strip_components:
                 item.path = os.sep.join(orig_path.split(os.sep)[strip_components:])
@@ -71,29 +75,34 @@ def do_extract(self, args, repository, manifest, archive):
                     except BackupError as e:
                         self.print_warning_instance(BackupWarning(remove_surrogates(dir_item.path), e))
 
-                if output_list and matcher.match(item.path):
-                    logging.getLogger("borg.output.list").info(remove_surrogates(item.path))
+            is_matched = matcher.match(item.path)
             try:
+                log_prefix = "+" if is_matched else "-"
+                logging.getLogger("borg.output.list").info(f"{log_prefix} {remove_surrogates(item.path)}")
                 if dry_run:
-                    if matcher.match(item.path):
-                        logging.getLogger("borg.output.list").info(f"+ {remove_surrogates(item.path)}")
-                    else:
-                        logging.getLogger("borg.output.list").info(f"- {remove_surrogates(item.path)}")
                     archive.extract_item(item, dry_run=True, hlm=hlm, pi=pi)
                 else:
-                    if matcher.match(item.path):
+                    if is_matched:
                         if stat.S_ISDIR(item.mode):
                             dirs.append(item)
                             archive.extract_item(item, stdout=stdout, restore_attrs=False)
-                    else:
-                        archive.extract_item(
-                            item, stdout=stdout, sparse=sparse, hlm=hlm, pi=pi, continue_extraction=continue_extraction
-                        )
+                        else:
+                            archive.extract_item(
+                                item,
+                                stdout=stdout,
+                                sparse=sparse,
+                                hlm=hlm,
+                                pi=pi,
+                                continue_extraction=continue_extraction,
+                            )
             except BackupError as e:
                 self.print_warning_instance(BackupWarning(remove_surrogates(orig_path), e))
-
         if pi:
             pi.finish()
+        # Display excluded items
+        if excluded_items:
+            for excluded_item in excluded_items:
+                logging.getLogger("borg.output.list").info(f"- {remove_surrogates(excluded_item)}")
 
         if not args.dry_run:
             pi = ProgressIndicatorPercent(