Update files: cat/ls/wc

Author: aydaeslami

implement-shell-tools/cat/cat.py

@@ -1,30 +1,44 @@
 import argparse
-parser = argparse.ArgumentParser(
-    prog="my-cat",
-    description="Simple cat clone with -n and -b options",
-)
 
-counterNumber = 1
-parser.add_argument("-n", action="store_true", help="number all lines")
-parser.add_argument("-b", action="store_true", help="The character to search for" )
-parser.add_argument("path", nargs="+", help="The file to search")
 
-args = parser.parse_args()
+def run(args):
+    for file_path in args.path:
+        counter_number = 1
 
-for file_path in args.path:
-    with open(file_path, "r") as f:
-        content = f.read()
-        arrText = content.split("\n")
+        with open(file_path, "r") as f:
+            lines = f.readlines()
 
         if args.b:
-            for i in range(len(arrText )):
-                if arrText[i].strip() != "":
-                    print(counterNumber,arrText[i])
-                    counterNumber += 1
+            for line in lines:
+                if line.strip() != "":
+                    print(counter_number, line, end="")
+                    counter_number += 1
+                else:
+                    print(line, end="")
 
         elif args.n:
-          for i in range(len(arrText )):
-              print(counterNumber, arrText[i])
-              counterNumber += 1
+            for line in lines:
+                print(counter_number, line, end="")
+                counter_number += 1
+
         else:
-            print(content)
+            for line in lines:
+                print(line, end="")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="my-cat",
+        description="Simple cat clone with -n and -b options",
+    )
+
+    parser.add_argument("-n", action="store_true", help="number all lines")
+    parser.add_argument("-b", action="store_true", help="The character to search for")
+    parser.add_argument("path", nargs="+", help="The file to search")
+
+    args = parser.parse_args()
+    run(args)
+
+
+if __name__ == "__main__":
+    main()

implement-shell-tools/ls/ls.py

@@ -1,13 +1,14 @@
 import argparse
 import os
 
-def show_unhidden_files(listDir):
-    for file in listDir:
-        if not file.startswith('.'):
+
+def show_files(files, show_hidden):
+    for file in files:
+        if show_hidden:
             print(file)
-def show_all_files(listDir):
-    for file in listDir:
-        print(file)
+        else:
+            if not file.startswith("."):
+                print(file)
 
 
 parser = argparse.ArgumentParser(
@@ -16,24 +17,15 @@ def show_all_files(listDir):
 )
 
 parser.add_argument("-a", action="store_true", help="include hidden files")
-parser.add_argument("-1", dest="one" ,action="store_true", help="use a long listing format")
+parser.add_argument(
+    "-1", dest="one", action="store_true", help="list one entry per line"
+)
 parser.add_argument("path", nargs="?", default=".", help="The directory to list")
 args = parser.parse_args()
 
 
-
-
-
 fn = args.path
 listDir = os.listdir(fn)
-if  fn!="":
-    if args.a and args.one:
-        show_all_files(listDir)
-    elif args.a:
-        show_all_files(listDir)
-    elif args.one:
-        show_unhidden_files(listDir)
-   
-    else:
-        show_unhidden_files(listDir)
 
+if fn != "":
+    show_files(listDir, args.a)

implement-shell-tools/wc/wc.py

@@ -1,66 +1,55 @@
 import argparse
+
 parser = argparse.ArgumentParser(
     prog="my-wc",
     description="Simple wc clone with -l and -w options",
 )
+
+
+
+
+def read_file(file_path):
+    with open(file_path, "r") as file:
+        return file.read()
+
+
+def count_text(text):
+    line_count = text.count("\n")
+    word_count = len(text.split())
+    char_count = len(text)
+    return line_count, word_count, char_count
+
+
+
+
 lineCounter = 0
 wordCounter = 0
 charCounter = 0
+
 parser.add_argument("-l", action="store_true", help="count lines")
 parser.add_argument("-w", action="store_true", help="count words")
 parser.add_argument("-c", action="store_true", help="count characters")
 parser.add_argument("path", nargs="+", default=".", help="The file to count")
 args = parser.parse_args()
 
-if not args.l and not args.w and not args.c:
-    for file_path in args.path:
-        with open(file_path, "r") as f:
-            content = f.read()
-        arrText = content.split("\n")
-        lineCounter += len(arrText)
-        arrWords = content.split()
-        wordCounter += len(arrWords)
-        charCounter += len(content)
-    print("Line count:", lineCounter,"lines")
-    print("Word count:", wordCounter,"words")
-    print("Character count:", charCounter,"characters")
-elif args.l and args.w:
-    for file_path in args.path:
-        with open(file_path, "r") as f:
-            content = f.read()
-        arrText = content.split("\n")
-        lineCounter += len(arrText)
-        arrWords = content.split()
-        wordCounter += len(arrWords)
-    print("Line count:", lineCounter,"lines")
-    print("Word count:", wordCounter,"words")
-elif args.l and args.c:
-    for file_path in args.path:
-        with open(file_path, "r") as f:
-            content = f.read()
-        arrText = content.split("\n")
-        lineCounter += len(arrText)
-        charCounter += len(content)
-    print("Line count:", lineCounter,"lines")
-    print("Character count:", charCounter,"characters")
-elif args.l:
-    for file_path in args.path:
-        with open(file_path, "r") as f:
-            content = f.read()
-        arrText = content.split("\n")
-        lineCounter += len(arrText)
-    print("Line count:", lineCounter,"lines")
-
-elif args.w:
-    for file_path in args.path:
-        with open(file_path, "r") as f:
-            content = f.read()
-        arrText = content.split()
-        wordCounter += len(arrText)
-    print("Word count:", wordCounter,"words")
-elif args.c:
-    for file_path in args.path:
-        with open(file_path, "r") as f:
-            content = f.read()
-            charCounter += len(content)
-    print("Character count:", charCounter,"characters")
+
+
+for path in args.path:
+    text = read_file(path)
+    lines, words, chars = count_text(text)
+
+    lineCounter += lines
+    wordCounter += words
+    charCounter += chars
+
+    if args.l:
+        print(lines, path)
+    elif args.w:
+        print(words, path)
+    elif args.c:
+        print(chars, path)
+    else:
+        print(lines, words, chars, path)
+
+if len(args.path) > 1 and not args.l and not args.w and not args.c:
+    print(lineCounter, wordCounter, charCounter, "total")