`9301005`

'renderer'

Authored by

espadonne 8 months ago

SHA: 93010058264df03ac4813a33742d8a8acf4e067a
Parents: 6b40f91
Tree: e9de9c7

2 changed files

Status	File	+	-
M	`src/sultree/cli.py`	10	7
M	`src/sultree/traversal.py`	4	3

src/sultree/cli.pymodified

  from .args import parse_arguments
  from .traversal import SecureTraverser, FileEntry
 -from .formatting import TreeFormatter
 +from .tree_renderer import TreeRenderer, build_tree_structure
  from .selinux import is_selinux_enabled, SELinuxQueryError
  from .constants import CONFIG
  def process_directory(directory: Path, traverser: SecureTraverser,
 -                     formatter: TreeFormatter) -> bool:
 +                     renderer: TreeRenderer) -> bool:
      """
      Process a single directory and display its tree.
          for entry in traverser.traverse(directory):
              entries.append(entry)
 -        # Format and display the tree
 +        # Build proper tree structure
 +        root_node = build_tree_structure(entries, directory)
++
 +        # Render the tree
          show_report = True  # Could be made configurable
 -        formatter.format_tree(directory, entries, show_report)
 +        renderer.render_tree(directory, root_node, show_report)
          return True
          # Setup logging if needed (could add --verbose flag)
          setup_logging(verbose=False)
 -        # Create traverser and formatter
 +        # Create traverser and renderer
          traverser = SecureTraverser(options)
          # Determine if SELinux context should be shown
          show_selinux = options.selinux_filter is not None
 -        formatter = TreeFormatter(
 +        renderer = TreeRenderer(
              show_full_path=options.show_full_path,
              show_selinux=show_selinux,
              use_ascii=False  # Could be made configurable
                  print()  # Empty line between directories
              # Process directory
 -            if process_directory(directory, traverser, formatter):
 +            if process_directory(directory, traverser, renderer):
                  success_count += 1
              else:
                  logger.warning(f"Failed to process directory: {directory}")

src/sultree/traversal.pymodified

          try:
              # Get directory contents
 -            entries = self._get_directory_entries(current_path)
 +            entries = self._get_directory_entries(current_path, depth)
              # Apply file limit if specified
              if self.options.file_limit is not None:
          except OSError as e:
              logger.warning(f"Error accessing {current_path}: {e}")
 -    def _get_directory_entries(self, dir_path: Path) -> List[FileEntry]:
 +    def _get_directory_entries(self, dir_path: Path, depth: int = 0) -> List[FileEntry]:
          """
          Get entries in a directory with error handling.
          Args:
              dir_path: Directory to read
 +            depth: Current depth in traversal
          Returns:
              List of FileEntry objects
                          path=item,
                          name=item.name,
                          is_dir=is_dir,
 -                        depth=0  # Will be set by caller
 +                        depth=depth + 1  # Set correct depth
                      ))
                  except (OSError, RuntimeError) as e: