Address PR review: reduce duplication and fix flag handling

Author: zohrehKazemianpour

implement-shell-tools/cat/cat.py

@@ -13,38 +13,25 @@
 
 args = parser.parse_args()
 
-line_number = 0  # Shared counter across all files
+line_number = 1  # Shared counter across all files
 
-# Process each file
-for path in args.paths:  # LEVEL 1: for loop starts
-    with open(path, "r") as f:  # LEVEL 2: inside for loop
-        content = f.read()  # LEVEL 3: inside with block
+for path in args.paths:
+    with open(path, "r") as f:
 
-    # Check if numbering is needed
-    if args.number:  # LEVEL 2: inside for loop
-        lines = content.split("\n")  # LEVEL 3: inside if
-        numbered_lines = []
-        
-        for index, line in enumerate(lines):  # LEVEL 3: inside if
-            line_number = line_number + 1  # LEVEL 4: inside inner for
-            numbered_line = f"{line_number:6}\t{line}"
-            numbered_lines.append(numbered_line)
-        
-        print("\n".join(numbered_lines))  # LEVEL 3: inside if
-    
-    elif args.number_nonblank:  # LEVEL 2: inside for loop
-        lines = content.split("\n")  # LEVEL 3: inside elif
-        numbered_lines = []
-        
-        for line in lines:  # LEVEL 3: inside elif
-            if line.strip() == "":  # LEVEL 4: inside inner for
-                numbered_lines.append(line)
+        lines = f.read().splitlines()
+
+    output = []
+    for line in lines:
+        if args.number_nonblank:
+            if line.strip():
+                output.append(f"{line_number:6}\t{line}")
+                line_number += 1
             else:
-                line_number = line_number + 1
-                numbered_line = f"{line_number:6}\t{line}"
-                numbered_lines.append(numbered_line)
-        
-        print("\n".join(numbered_lines))
-    
-    else:  # LEVEL 2: inside for loop
-        print(content)  # LEVEL 3: inside else
+                output.append(line)
+        elif args.number:
+            output.append(f"{line_number:6}\t{line}")
+            line_number += 1
+        else:
+            output.append(line)
+
+    print("\n".join(output))

implement-shell-tools/ls/ls.py

@@ -1,24 +1,30 @@
 import os
 import argparse
 
-# Setup argument parser
-parser = argparse.ArgumentParser(
-    prog="ls",
-    description="Lists contents of a directory"
-)
+parser = argparse.ArgumentParser(prog="ls", description="Lists contents of a directory")
 
 parser.add_argument("-1", dest="one_column", action="store_true", help="List one file per line")
 parser.add_argument("-a", "--all", action="store_true", help="Include hidden files")
-parser.add_argument("path", nargs='?', default=".", help="Directory to list (default: current directory)")
+parser.add_argument("paths", nargs='*', default=["."], help="Directories to list")
 
 args = parser.parse_args()
 
-# List directory contents
-files = os.listdir(args.path)
+for path in args.paths:
+    if len(args.paths) > 1:
+        print(f"{path}:")
 
-# Filter out hidden files unless -a flag is used
-if not args.all:
-    files = [f for f in files if not f.startswith('.')]
+    try:
+        files = os.listdir(path)
+        if not args.all:
+            files = [f for f in files if not f.startswith('.')]
+        
+        files.sort()
 
-for file in files:
-    print(file)
+        sep = "\n" if args.one_column else "  "
+        print(sep.join(files))
+        
+        if len(args.paths) > 1:
+            print()
+            
+    except FileNotFoundError:
+        print(f"ls: cannot access '{path}': No such file or directory")

implement-shell-tools/wc/wc.py

@@ -1,55 +1,42 @@
 import argparse
 
-# Setup argument parser
-parser = argparse.ArgumentParser(
-    prog="wc",
-    description="Count lines, words, and characters"
-)
+parser = argparse.ArgumentParser(prog="wc", description="Count lines, words, and characters")
 parser.add_argument("paths", nargs='+', help="Files to count")
-parser.add_argument("-l", "--lines", action="store_true", help="Count lines only")
-parser.add_argument("-w", "--words", action="store_true", help="Count words only")
-parser.add_argument("-c", "--chars", action="store_true", help="Count characters only")
+parser.add_argument("-l", "--lines", action="store_true")
+parser.add_argument("-w", "--words", action="store_true")
+parser.add_argument("-c", "--chars", action="store_true")
 
 args = parser.parse_args()
 
-# Track totals
-total_lines = 0
-total_words = 0
-total_chars = 0
+# If no flags are provided, the default behavior is to show all three
+show_all = not (args.lines or args.words or args.chars)
+
+total_stats = [0, 0, 0] # lines, words, chars
 
 for path in args.paths:
-    # Read the file
     with open(path, "r") as f:
         content = f.read()
 
-    # Count lines, words, characters
-    lines = len(content.rstrip('\n').split('\n'))
-    words = len(content.split())
-    chars = len(content)
-
-    # Add to totals
-    total_lines += lines
-    total_words += words
-    total_chars += chars
-
-    if args.lines:
-        print(f"{lines:8} {path}")
-    elif args.words:
-        print(f"{words:8} {path}")
-    elif args.chars:
-        print(f"{chars:8} {path}")
-    else:
-        print(f"{lines:8}{words:8}{chars:8} {path}")  
-
-        
-# Print totals if multiple files
-if len(args.paths) > 1:
-    if args.lines:
-        print(f"{total_lines:8} total")
-    elif args.words:
-        print(f"{total_words:8} total")
-    elif args.chars:
-        print(f"{total_chars:8} total")
-    else:
-        print(f"{total_lines:8}{total_words:8}{total_chars:8} total")        
+    stats = [
+        len(content.splitlines()), 
+        len(content.split()), 
+        len(content)
+    ]
+    
+    for i in range(3):
+        total_stats[i] += stats[i]
+
+    output = []
+    if args.lines or show_all: output.append(f"{stats[0]:8}")
+    if args.words or show_all: output.append(f"{stats[1]:8}")
+    if args.chars or show_all: output.append(f"{stats[2]:8}")
+    
+    print(f"{''.join(output)} {path}")
 
+if len(args.paths) > 1:
+    total_output = []
+    if args.lines or show_all: total_output.append(f"{total_stats[0]:8}")
+    if args.words or show_all: total_output.append(f"{total_stats[1]:8}")
+    if args.chars or show_all: total_output.append(f"{total_stats[2]:8}")
+    
+    print(f"{''.join(total_output)} total")