Replace --date none with --skip-date for CLI consistency

elifarley · claude · elifarley · commit 89694cc7ff09 · 2025-11-27T15:56:44.000-03:00
- Add --skip-date boolean flag to skip date display entirely - Add --date-format flag for date format choices (seconds|day) - Remove --date choice-based flag entirely - Update both flat and tree renderers to use new parameters - Refactor get_column_specs() to handle skip_date boolean - Update all tests to use new flag patterns - Update README.md documentation - Achieve consistent skip-* pattern across all flags 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/README.md b/README.md
@@ -48,7 +48,10 @@ cedarmapper ls --max-depth 2
 cedarmapper ls --sort -w
 
 # Show dates in day format (YYYY-MM-DD)
-cedarmapper ls --date day
+cedarmapper ls --date-format day
+
+# Skip date display entirely
+cedarmapper ls --skip-date
 
 # Skip word counting for faster analysis
 cedarmapper ls --skip-word-count
@@ -66,7 +69,8 @@ cedarmapper ls src/ --tree --max-depth 3 --sort -s
 - `--tree` - Show tree-like nested output (human-friendly)
 - `--follow-symlinks` - Follow symbolic links during traversal
 - `--skip-word-count` - Skip word counting for speed
-- `--date` - Date display: 'seconds' (default), 'day', or 'none'
+- `--date-format` - Date format: 'seconds' (default) or 'day'
+- `--skip-date` - Skip date display entirely
 - `--numbered-indent` - Show depth as number prefix (tree only)
 - `--sort` - Sort specification using keys: w=word count, s=size, d=date, i=depth, n=name, p=path
 
diff --git a/src/cedarmapper/cli/main.py b/src/cedarmapper/cli/main.py
@@ -27,7 +27,8 @@ def run_cli(argv: list[str] | None = None) -> tuple[int, str]:
     tree = False
     follow_symlinks = False
     skip_word_count = False
-    date_mode = "seconds"  # seconds | day | none
+    date_format = "seconds"  # seconds | day
+    skip_date = False
     numbered_indent = False
     sort_spec = None
     skip_header = False
@@ -46,13 +47,15 @@ def run_cli(argv: list[str] | None = None) -> tuple[int, str]:
             follow_symlinks = True
         elif token == "--skip-word-count":
             skip_word_count = True
-        elif token == "--date":
+        elif token == "--skip-date":
+            skip_date = True
+        elif token == "--date-format":
             try:
-                date_mode = next(it)
-                if date_mode not in ("seconds", "day", "none"):
-                    return 2, "Error: --date must be one of seconds|day|none"
+                date_format = next(it)
+                if date_format not in ("seconds", "day"):
+                    return 2, "Error: --date-format must be one of seconds|day"
             except StopIteration:
-                return 2, "Error: --date expects a value"
+                return 2, "Error: --date-format expects a value"
         elif token == "--numbered-indent":
             numbered_indent = True
         elif token == "--sort":
@@ -83,20 +86,24 @@ def run_cli(argv: list[str] | None = None) -> tuple[int, str]:
         out = render_tree(
             dirinfo,
             max_depth=max_depth,
-            date_mode=date_mode,
+            date_format=date_format,
+            skip_date=skip_date,
             numbered_indent=numbered_indent,
             sort_spec=sort_spec,
             skip_header=skip_header,
             skip_totals=skip_totals,
+            skip_word_count=skip_word_count,
         )
     else:
         out = render_flat(
             dirinfo,
             max_depth=max_depth,
-            date_mode=date_mode,
+            date_format=date_format,
+            skip_date=skip_date,
             sort_spec=sort_spec,
             skip_header=skip_header,
             skip_totals=skip_totals,
+            skip_word_count=skip_word_count,
         )
 
     return 0, out
@@ -127,11 +134,17 @@ def cli() -> None:
     "--skip-word-count", is_flag=True, default=False, help="Skip word counting for speed."
 )
 @click.option(
-    "--date",
-    "date_mode",
-    type=click.Choice(["seconds", "day", "none"], case_sensitive=True),
+    "--date-format",
+    "date_format",
+    type=click.Choice(["seconds", "day"], case_sensitive=True),
     default="seconds",
-    help="Date display: 'seconds' (YYYY-MM-DDTHH:MM:SS), 'day' (YYYY-MM-DD), or 'none' (omit).",
+    help="Date format: 'seconds' (YYYY-MM-DDTHH:MM:SS) or 'day' (YYYY-MM-DD).",
+)
+@click.option(
+    "--skip-date",
+    is_flag=True,
+    default=False,
+    help="Skip date display entirely.",
 )
 @click.option(
     "--numbered-indent",
@@ -164,7 +177,8 @@ def ls(
     tree: bool,
     follow_symlinks: bool,
     skip_word_count: bool,
-    date_mode: str,
+    date_format: str,
+    skip_date: bool,
     numbered_indent: bool,
     sort_spec: str | None,
     skip_header: bool,
@@ -180,8 +194,10 @@ def ls(
         argv.append("--follow-symlinks")
     if skip_word_count:
         argv.append("--skip-word-count")
-    if date_mode and date_mode != "seconds":
-        argv.extend(["--date", date_mode])
+    if skip_date:
+        argv.append("--skip-date")
+    if date_format and date_format != "seconds":
+        argv.extend(["--date-format", date_format])
     if numbered_indent:
         argv.append("--numbered-indent")
     if sort_spec:
diff --git a/src/cedarmapper/render/flat.py b/src/cedarmapper/render/flat.py
@@ -58,10 +58,12 @@ def render_flat(
     root: DirInfo,
     max_depth: int = 0,
     *,
-    date_mode: str = "seconds",
+    date_format: str = "seconds",
+    skip_date: bool = False,
     sort_spec: str | None = None,
     skip_header: bool = False,
     skip_totals: bool = False,
+    skip_word_count: bool = False,
 ) -> str:
     """
     Render all nodes (dirs and files) that are at display depth <= max_depth.
@@ -129,22 +131,30 @@ def _render_node(node: DirInfo | FileInfo, depth: int, parent_path: str) -> None
 
     # Add header if not skipped
     if not skip_header:
-        column_specs = get_column_specs(date_mode)
+        column_specs = get_column_specs(date_format, skip_word_count, skip_date)
         lines.append(format_header_row(column_specs))
 
     # Add data rows
     for r in rows:
-        date_str = _fmt_mtime(r.mtime, date_mode)
-        if date_mode == "none":
+        date_str = _fmt_mtime(r.mtime, date_format)
+        if skip_word_count and skip_date:
+            # Size + Path
+            lines.append(f"{r.size_bytes:>12} {r.path}")
+        elif skip_word_count and not skip_date:
+            # Size + Modified + Path
+            lines.append(f"{r.size_bytes:>12} {date_str:>19} {r.path}")
+        elif not skip_word_count and skip_date:
+            # Words + Size + Path
             lines.append(f"{_fmt_count(r.word_count):>7} {r.size_bytes:>12} {r.path}")
         else:
+            # Words + Size + Modified + Path
             lines.append(
                 f"{_fmt_count(r.word_count):>7} {r.size_bytes:>12} {date_str:>19} {r.path}"
             )
 
     # Add totals footer if not skipped and we have multiple data rows
     if not skip_totals and len(rows) >= 2:
-        column_specs = get_column_specs(date_mode)
+        column_specs = get_column_specs(date_format, skip_word_count, skip_date)
         lines.append(format_separator_row(column_specs))
         lines.append(format_totals_row(column_specs, root))
 
diff --git a/src/cedarmapper/render/tree.py b/src/cedarmapper/render/tree.py
@@ -37,11 +37,13 @@ def render_tree(
     root: DirInfo,
     max_depth: int = 0,
     *,
-    date_mode: str = "seconds",
+    date_format: str = "seconds",
+    skip_date: bool = False,
     numbered_indent: bool = False,
     sort_spec: str | None = None,
     skip_header: bool = False,
     skip_totals: bool = False,
+    skip_word_count: bool = False,
 ) -> str:
     """
     Render tree structure with word count, bytes, mtime (per date_mode), and path.
@@ -89,28 +91,36 @@ def _render_node(
             prefix = "".join(prefix_parts)
 
         if isinstance(node, FileInfo):
-            date_str = _fmt_mtime(node.mtime, date_mode)
+            date_str = _fmt_mtime(node.mtime, date_format)
             display_name = node.path.name
-            if date_mode == "none":
-                data_lines.append(
-                    f"{_fmt_count(node.word_count):>7} {node.size_bytes:>12} {prefix}{display_name}"
-                )
+            if skip_word_count and skip_date:
+                # Size + Path
+                data_lines.append(f"{node.size_bytes:>12} {prefix}{display_name}")
+            elif skip_word_count and not skip_date:
+                # Size + Modified + Path
+                data_lines.append(f"{node.size_bytes:>12} {date_str:>19} {prefix}{display_name}")
+            elif not skip_word_count and skip_date:
+                # Words + Size + Path
+                data_lines.append(f"{_fmt_count(node.word_count):>7} {node.size_bytes:>12} {prefix}{display_name}")
             else:
-                data_lines.append(
-                    f"{_fmt_count(node.word_count):>7} {node.size_bytes:>12} {date_str:>19} {prefix}{display_name}"
-                )
+                # Words + Size + Modified + Path
+                data_lines.append(f"{_fmt_count(node.word_count):>7} {node.size_bytes:>12} {date_str:>19} {prefix}{display_name}")
         else:
             # DirInfo
-            date_str = _fmt_mtime(node.mtime, date_mode)
+            date_str = _fmt_mtime(node.mtime, date_format)
             display_name = f"{node.path.name}/"
-            if date_mode == "none":
-                data_lines.append(
-                    f"{str(node.word_count):>7} {node.size_bytes:>12} {prefix}{display_name}"
-                )
+            if skip_word_count and skip_date:
+                # Size + Path
+                data_lines.append(f"{node.size_bytes:>12} {prefix}{display_name}")
+            elif skip_word_count and not skip_date:
+                # Size + Modified + Path
+                data_lines.append(f"{node.size_bytes:>12} {date_str:>19} {prefix}{display_name}")
+            elif not skip_word_count and skip_date:
+                # Words + Size + Path
+                data_lines.append(f"{str(node.word_count):>7} {node.size_bytes:>12} {prefix}{display_name}")
             else:
-                data_lines.append(
-                    f"{str(node.word_count):>7} {node.size_bytes:>12} {date_str:>19} {prefix}{display_name}"
-                )
+                # Words + Size + Modified + Path
+                data_lines.append(f"{str(node.word_count):>7} {node.size_bytes:>12} {date_str:>19} {prefix}{display_name}")
 
             # If we are allowed to show children (display depth), iterate
             if depth < max_depth:
@@ -173,15 +183,15 @@ def __init__(self, obj, depth_value, parent_path):
 
     # Add header if not skipped
     if not skip_header:
-        column_specs = get_column_specs(date_mode)
+        column_specs = get_column_specs(date_format, skip_word_count, skip_date)
         lines.append(format_header_row(column_specs))
 
     # Add data rows
     lines.extend(data_lines)
 
     # Add totals footer if not skipped and we have multiple data rows
     if not skip_totals and len(data_lines) >= 2:
-        column_specs = get_column_specs(date_mode)
+        column_specs = get_column_specs(date_format, skip_word_count, skip_date)
         lines.append(format_separator_row(column_specs))
         lines.append(format_totals_row(column_specs, root))
 
diff --git a/src/cedarmapper/render/utils.py b/src/cedarmapper/render/utils.py
@@ -15,14 +15,14 @@ class ColumnSpec(NamedTuple):
     formatter: callable
 
 
-def get_column_specs(date_mode: str) -> list[ColumnSpec]:
-    """Get column specifications based on date mode."""
-    specs = [
-        ColumnSpec("Words", 7, _fmt_count),
-        ColumnSpec("Size", 12, lambda x: str(x)),
-    ]
-    if date_mode != "none":
-        specs.append(ColumnSpec("Modified", 19, lambda dt: _fmt_mtime(dt, date_mode)))
+def get_column_specs(date_format: str, skip_word_count: bool = False, skip_date: bool = False) -> list[ColumnSpec]:
+    """Get column specifications based on date format and skip preferences."""
+    specs = []
+    if not skip_word_count:
+        specs.append(ColumnSpec("Words", 7, _fmt_count))
+    specs.append(ColumnSpec("Size", 12, lambda x: str(x)))
+    if not skip_date:
+        specs.append(ColumnSpec("Modified", 19, lambda dt: _fmt_mtime(dt, date_format)))
     return specs
 
 
@@ -69,10 +69,9 @@ def _fmt_count(c: int | None) -> str:
     return "-" if c is None else str(c)
 
 
-def _fmt_mtime(dt: datetime, mode: str) -> str:
+def _fmt_mtime(dt: datetime, format_mode: str) -> str:
     """Format modification time for display."""
-    if mode == "none":
-        return ""
-    if mode == "day":
+    if format_mode == "day":
         return dt.date().isoformat()
+    # default: seconds
     return dt.replace(microsecond=0).isoformat()
diff --git a/tests/test_cli.py b/tests/test_cli.py
diff --git a/tests/test_headers_totals.py b/tests/test_headers_totals.py
