CM-53667: improved logging and process

Author: gotbadger

cycode/cli/files_collector/walk_ignore.py

@@ -4,7 +4,7 @@
 from cycode.cli.logger import get_logger
 from cycode.cli.utils.ignore_utils import IgnoreFilterManager
 
-logger = get_logger('File Ignore')
+logger = get_logger('Ignores')
 
 _SUPPORTED_IGNORE_PATTERN_FILES = {
     '.gitignore',
@@ -43,15 +43,17 @@ def walk_ignore(path: str) -> Generator[tuple[str, list[str], list[str]], None,
         global_ignore_file_paths=_collect_top_level_ignore_files(path),
         global_patterns=_DEFAULT_GLOBAL_IGNORE_PATTERNS,
     )
-
     for dirpath, dirnames, filenames, ignored_dirnames, ignored_filenames in ignore_filter_manager.walk_with_ignored():
         rel_dirpath = '' if dirpath == path else os.path.relpath(dirpath, path)
         display_dir = rel_dirpath or '.'
-        for kind, names in (
-            ('directory', ignored_dirnames),
-            ('file', ignored_filenames),
+        for is_dir, names in (
+            (True, ignored_dirnames),
+            (False, ignored_filenames),
         ):
             for name in names:
-                logger.debug('Skipping matched %s %s/%s', kind, display_dir, name)
+                full_path = os.path.join(path, display_dir, name)
+                if is_dir:
+                    full_path = os.path.join(full_path, '*')
+                logger.debug('Ignoring match %s', full_path)
 
         yield dirpath, dirnames, filenames

cycode/cli/utils/ignore_utils.py

@@ -399,17 +399,25 @@ def walk_with_ignored(
             rel_dirpath = '' if dirpath == self.path else os.path.relpath(dirpath, self.path)
 
             original_dirnames = list(dirnames)
-            included_dirnames = [d for d in original_dirnames if not self.is_ignored(os.path.join(rel_dirpath, d))]
+            included_dirnames = []
+            ignored_dirnames = []
+            for d in original_dirnames:
+                if self.is_ignored(os.path.join(rel_dirpath, d)):
+                    ignored_dirnames.append(d)
+                else:
+                    included_dirnames.append(d)
 
             # decrease recursion depth of os.walk() by ignoring subdirectories because of topdown=True
             # slicing ([:]) is mandatory to change dict in-place!
             dirnames[:] = included_dirnames
 
-            ignored_dirnames = [d for d in original_dirnames if d not in included_dirnames]
-
-            original_filenames = list(filenames)
-            included_filenames = [f for f in original_filenames if not self.is_ignored(os.path.join(rel_dirpath, f))]
-            ignored_filenames = [f for f in original_filenames if f not in included_filenames]
+            included_filenames = []
+            ignored_filenames = []
+            for f in filenames:
+                if self.is_ignored(os.path.join(rel_dirpath, f)):
+                    ignored_filenames.append(f)
+                else:
+                    included_filenames.append(f)
 
             yield dirpath, dirnames, included_filenames, ignored_dirnames, ignored_filenames