amended cat.py, ls.py, and wc.py

Author: Fradoka

implement-shell-tools/cat/cat.py

@@ -14,13 +14,14 @@ def main():
 
     args = parser.parse_args()
 
+    line_number = 1
+    non_blank_line_number = 1
+    
     for file_path in args.path:
         try:
             with open(file_path, 'r') as file:
                 content = file.read()
                 lines = content.split("\n")
-                line_number = 1
-                non_blank_line_number = 1
 
                 for i, line in enumerate(lines):
                     if i == len(lines) - 1 and line == "":  # Skip the last empty line if it exists

implement-shell-tools/ls/ls.py

@@ -1,36 +1,66 @@
+# implement-shell-tools/ls/ls.py
 import argparse
 import os
+import sys
+import shutil
+import math
+
+def print_columns(items, force_single_column=False):
+    """Print items in columns unless -1 is passed or output is not a tty."""
+    if force_single_column or not sys.stdout.isatty():
+        for item in items:
+            print(item)
+        return
+
+    # Get terminal width
+    term_width = shutil.get_terminal_size((80, 20)).columns
+
+    if not items:
+        return
+
+    # Longest filename length + spacing
+    max_len = max(len(f) for f in items) + 2
+    cols = max(1, term_width // max_len)
+    rows = math.ceil(len(items) / cols)
+
+    for r in range(rows):
+        row_items = []
+        for c in range(cols):
+            i = c * rows + r
+            if i < len(items):
+                row_items.append(items[i].ljust(max_len))
+        print("".join(row_items).rstrip())
 
-# implement-shell-tools/ls/ls.py
 def main():
     parser = argparse.ArgumentParser(
     prog="ls",
     description="Implements a simple version of the 'ls' command to list files in a directory."
     )
 
-    parser.add_argument("-1", help="", action="store_true")
-    parser.add_argument("-a", help="", action="store_true")
+    parser.add_argument("-1", help="List one file per line", action="store_true")
+    parser.add_argument("-a", help="Include hidden files", action="store_true")
     parser.add_argument("directory", nargs="?", default=".", help="The directory to search")
 
     args = parser.parse_args()
 
     try:
-        files = os.listdir(args.directory)
+        if os.path.isdir(args.directory):
+            files = os.listdir(args.directory)
 
-        if not args.a:
-            files = [f for f in files if not f.startswith(".")]
-        
-        files = sorted(files)
+            if not args.a:
+                files = [f for f in files if not f.startswith(".")]
+            
+            files = sorted(files)
 
-        for f in files:
-            print(f)
+            print_columns(files, force_single_column=args.__dict__["1"])
+        else:
+            # If it's a file, just print the name
+            print(args.directory)
 
     except FileNotFoundError:
-        print(f"ls: {args.directory}: No such file or directory")
-    except NotADirectoryError:
-        print(args.directory)
+        print(f"ls: {args.directory}: No such file or directory", file=sys.stderr)
     except Exception as e:
-        print(f"ls: {args.directory}: {e}")
+        print(f"ls: {args.directory}: {e}", file=sys.stderr)
 
 if __name__ == "__main__":
     main()

implement-shell-tools/wc/wc.py

@@ -7,10 +7,24 @@ def wc_file(path):
     with open(path, "r", encoding="utf-8") as f:
         text = f.read()
     lines = text.count("\n")
+    if text and not text.endswith("\n"):
+        lines += 1  # Count last line if it doesn't end with newline
     words = len(text.split())
     chars = len(text.encode("utf-8"))  # byte count
     return lines, words, chars
 
+def format_counts(lines, words, chars, args, label):
+    """Return formatted output string for wc counts."""
+    parts = []
+    if args.l:
+        parts.append(str(lines).rjust(8))
+    if args.w:
+        parts.append(str(words).rjust(8))
+    if args.c:
+        parts.append(str(chars).rjust(8))
+    if label:
+        parts.append(label)
+    return " ".join(parts)
 
 def main():
     parser = argparse.ArgumentParser(
@@ -37,31 +51,15 @@ def main():
             total_words += words
             total_chars += chars
 
-            counts = []
-            if args.l:
-                counts.append(str(lines))
-            if args.w:
-                counts.append(str(words))
-            if args.c:
-                counts.append(str(chars))
-            counts.append(file_path)
-            print(" ".join(counts))
+            print(format_counts(lines, words, chars, args, file_path))
 
         except FileNotFoundError:
             print(f"wc: {file_path}: No such file or directory", file=sys.stderr)
         except Exception as e:
             print(f"wc: {file_path}: {e}", file=sys.stderr)
 
     if len(args.path) > 1:
-        counts = []
-        if args.l:
-            counts.append(str(total_lines))
-        if args.w:
-            counts.append(str(total_words))
-        if args.c:
-            counts.append(str(total_chars))
-        counts.append("total")
-        print(" ".join(counts))
+        print(format_counts(total_lines, total_words, total_chars, args, "total"))
 
 if __name__ == "__main__":
     main()