refactored and corrected code to meet and answer the asked questions for all the files

Author: Luke-Manyamazi

implement-shell-tools/cat/cat.py

@@ -1,4 +1,3 @@
-import glob
 import argparse
 from enum import Enum
 
@@ -7,23 +6,27 @@ class Numbering(Enum):
     ALL = 1
     NONEMPTY = 2
 
-def cat(filepath, numbering=Numbering.NONE, line_counter=None):
+def print_numbered_line(line, line_number, pad=6):
+    print(f"{line_number:{pad}}\t{line}", end='')
+    return line_number + 1
+
+def cat(filepath, numbering, start_line):
+    line_number = start_line
     try:
         with open(filepath) as f:
             for line in f:
                 if numbering == Numbering.NONEMPTY:
                     if line.strip():
-                        print(f"{line_counter[0]:6}\t{line}", end='')
-                        line_counter[0] += 1
+                        line_number = print_numbered_line(line, line_number)
                     else:
                         print(line, end='')
                 elif numbering == Numbering.ALL:
-                    print(f"{line_counter[0]:6}\t{line}", end='')
-                    line_counter[0] += 1
+                    line_number = print_numbered_line(line, line_number)
                 else:
                     print(line, end='')
     except FileNotFoundError:
         print(f"cat: {filepath}: No such file or directory")
+    return line_number
 
 def main():
     parser = argparse.ArgumentParser(description="Concatenate files and print on the standard output.")
@@ -32,13 +35,6 @@ def main():
     parser.add_argument('files', nargs='+', help='files to concatenate')
     args = parser.parse_args()
 
-    files = []
-    for pattern in args.files:
-        files.extend(glob.glob(pattern) or [pattern])
-
-    line_counter = [1]
-
-    # Determine numbering mode (mutually exclusive)
     if args.n and args.b:
         parser.error("options -n and -b are mutually exclusive")
     elif args.n:
@@ -48,8 +44,9 @@ def main():
     else:
         numbering = Numbering.NONE
 
-    for file in sorted(files):
-        cat(file, numbering=numbering, line_counter=line_counter)
+    line_number = 1  # start line numbering
+    for file in args.files:
+        line_number = cat(file, numbering=numbering, start_line=line_number)
 
 if __name__ == "__main__":
     main()

implement-shell-tools/ls/ls.py

@@ -1,7 +1,8 @@
 import os
 import argparse
 
-def ls(path='.', one_column=False, show_hidden=False):
+def ls(path, one_column, show_hidden):
+    """List files in a directory, optionally in one column or including hidden files."""
     try:
         files = os.listdir(path)
         if not show_hidden:
@@ -14,6 +15,8 @@ def ls(path='.', one_column=False, show_hidden=False):
             print(*files)
     except FileNotFoundError:
         print(f"ls: cannot access '{path}': No such file or directory")
+    except NotADirectoryError:
+        print(f"ls: cannot access '{path}': Not a directory")
 
 def main():
     parser = argparse.ArgumentParser()
@@ -25,4 +28,4 @@ def main():
     ls(args.path, args.one_column, args.a)
 
 if __name__ == "__main__":
-    main()
+    main()

implement-shell-tools/wc/wc.py

@@ -1,26 +1,34 @@
 import argparse
 
 def wc(path, count_lines, count_words, count_bytes):
+    """Count lines, words, and bytes for a single file."""
     try:
         with open(path, 'r') as f:
             content = f.read()
         lines = content.splitlines()
         words = content.split()
         bytes_ = len(content.encode('utf-8'))
 
+        # Determine what to show
+        if not any([count_lines, count_words, count_bytes]):
+            count_lines = count_words = count_bytes = True
+
         parts = []
         if count_lines: parts.append(str(len(lines)))
         if count_words: parts.append(str(len(words)))
         if count_bytes: parts.append(str(bytes_))
 
-        if not parts:
-            parts = [str(len(lines)), str(len(words)), str(bytes_)]
         print(' '.join(parts), path)
 
+        return (len(lines) if count_lines else 0,
+                len(words) if count_words else 0,
+                bytes_ if count_bytes else 0)
     except FileNotFoundError:
         print(f"wc: {path}: No such file or directory")
+        return (0, 0, 0)
     except IsADirectoryError:
         print(f"wc: {path}: Is a directory")
+        return (0, 0, 0)
 
 def main():
     parser = argparse.ArgumentParser()
@@ -30,8 +38,21 @@ def main():
     parser.add_argument('paths', nargs='+', help='Files to count')
     args = parser.parse_args()
 
+    total_lines = total_words = total_bytes = 0
+    multiple_files = len(args.paths) > 1
+
     for path in args.paths:
-        wc(path, args.l, args.w, args.c)
+        l, w, b = wc(path, args.l, args.w, args.c)
+        total_lines += l
+        total_words += w
+        total_bytes += b
+
+    if multiple_files:
+        parts = []
+        if args.l or not any([args.l, args.w, args.c]): parts.append(str(total_lines))
+        if args.w or not any([args.l, args.w, args.c]): parts.append(str(total_words))
+        if args.c or not any([args.l, args.w, args.c]): parts.append(str(total_bytes))
+        print(' '.join(parts), 'total')
 
 if __name__ == "__main__":
-    main()
+    main()