fix the issues

Author: ebrahimbeiati

implement-shell-tools/implement-shell-tools-python/cat/cat.py

@@ -1,60 +1,52 @@
 #!/usr/bin/env python3
 import sys
-import os
+import argparse
 
-global_line_counter = 1
 
-def print_file(file_path, options):
-    global global_line_counter
+def print_file(file_path, options, counter):
     try:
         with open(file_path, "r", encoding="utf-8") as f:
-            content = f.read()
+            for line in f:
+                stripped = line.rstrip("\n")
 
-        lines = content.split("\n")
-        if lines and lines[-1] == "":
-            lines.pop()
+                should_number = options.number_mode == "all" or (
+                    options.number_mode == "non-empty" and stripped != ""
+                )
 
-        for line in lines:
-            prefix = ""
+                if should_number:
+                    print(f"{counter}\t{stripped}")
+                    counter += 1
+                else:
+                    print(stripped)
 
-            should_number = (
-                options["number_mode"] == "all" or
-                (options["number_mode"] == "non-empty" and line.strip() != "")
-            )
+    except FileNotFoundError:
+        print(f"cat: {file_path}: No such file or directory", file=sys.stderr)
 
-            if should_number:
-                prefix = f"{global_line_counter:6}\t"
-                global_line_counter += 1
+    return counter
 
-            sys.stdout.write(prefix + line + "\n")
 
-    except Exception as e:
-        print(f"cat: {file_path}: {e}", file=sys.stderr)
-        sys.exit(1)
+def main():
+    parser = argparse.ArgumentParser(description="Concatenate files and print output")
+    parser.add_argument("-n", "--number", action="store_true", help="number all lines")
 
+    parser.add_argument(
+        "-b", "--number-nonblank", action="store_true", help="number non-empty lines"
+    )
 
-def main():
-    global global_line_counter
-    args = sys.argv[1:]
-
-    options = {"number_mode": "off"}
-    files = []
-
-    for arg in args:
-        if arg == "-n":
-            options["number_mode"] = "all"
-        elif arg == "-b":
-            options["number_mode"] = "non-empty"
-        else:
-            files.append(arg)
-
-    if not files:
-        print("cat: missing file operand", file=sys.stderr)
-        sys.exit(1)
-
-    for file_path in files:
-        global_line_counter = 1
-        print_file(file_path, options)
+    parser.add_argument("files", nargs="+", help="files to read")
+
+    args = parser.parse_args()
+
+    if args.number_nonblank:
+        args.number_mode = "non-empty"
+    elif args.number:
+        args.number_mode = "all"
+    else:
+        args.number_mode = "none"
+
+    counter = 1
+    for file in args.files:
+        counter = print_file(file, args, counter)
 
 
 if __name__ == "__main__":

implement-shell-tools/implement-shell-tools-python/ls/ls.py

@@ -1,46 +1,38 @@
 #!/usr/bin/env python3
 import sys
 import os
+import argparse
 
-def list_directory(path, show_all, one_per_line):
+
+def list_directory(path, show_all):
     try:
         entries = os.listdir(path)
-        if show_all:
-            # Add . and .. when -a is used
-            entries = [".", ".."] + entries
-        else:
-            entries = [e for e in entries if not e.startswith(".")]
-
-        entries.sort(key=lambda x: (x not in (".", ".."), x))
-
-        for e in entries:
-            print(e)
 
     except Exception as e:
         print(f"Error reading directory {path}: {e}", file=sys.stderr)
         sys.exit(1)
+    for entry in sorted(entries):
+        if not show_all and entry.startswith("."):
+            continue
+        print(entry)
 
 
 def main():
-    args = sys.argv[1:]
+    parser = argparse.ArgumentParser(description="List directory contents")
+    parser.add_argument("-a", "--all", action="store_true", help="show hidden files")
+    parser.add_argument("paths", nargs="*", default=["."], help="directories to list")
 
-    show_all = "-a" in args
-    one_per_line = "-1" in args
+    args = parser.parse_args()
 
-    dirs = [a for a in args if a not in ("-a", "-1")]
-
-    if not dirs:
-        dirs = [os.getcwd()]
+    dirs = args.paths
 
     for i, path in enumerate(dirs):
-            if os.path.isdir(path):
-                if len(dirs) > 1:
-                    print(f"{path}:")
-                list_directory(path, show_all, one_per_line)
-                if len(dirs) > 1 and i < len(dirs) - 1:
-                    print("")
-            else:
-                print(path)
+        if len(dirs) > 1:
+            print(f"{path}:")
+        list_directory(path, args.all)
+
+        if len(dirs) > 1 and i < len(dirs) - 1:
+            print("")
 
 
 if __name__ == "__main__":