cat, la and wc changes done, removed other sprint work

Author: katarzynakaz

implement-shell-tools/cat/cat.py

@@ -6,39 +6,42 @@ def cleanInput(listOfFiles):
 
     for file in listOfFiles:
         grabbedText = Path(file).read_text(encoding="utf-8") 
-        splitLines = grabbedText.split("\n")
+        splitLines = grabbedText.splitlines()
         cleanLinesArr.extend(splitLines) 
 
     return cleanLinesArr
 
-args = sys.argv[1:]  
-flag = None
-restIsFiles = []
-
-if len(args) > 0 and args[0] and args[0][0] == "-":
-    flag = args[0]
-    restIsFiles = args[1:]
-else:
-    flag = None
-    restIsFiles = args
-
 def takeSpecifiedAction(cleanLinesArr, flag):
     countingOnlyFullLines = 1
 
-    for file in cleanLinesArr: 
+    if flag not in (None, "-n", "-b"):
+        print("incorrect flag")
+        return
+
+    for line in cleanLinesArr: 
         if not flag:
-            print(file)
+            print(line)
         elif flag == "-n":
-            print(f"{countingOnlyFullLines} {file}")
+            print(f"{countingOnlyFullLines} {line}")
             countingOnlyFullLines += 1
         elif flag == "-b":
-            if file == "":
+            if line == "":
                 print("")
             else:
-                print(f"{countingOnlyFullLines} {file}")
+                print(f"{countingOnlyFullLines} {line}")
                 countingOnlyFullLines += 1
-        else:
-            print("incorrect flag")
+
+
+args = sys.argv[1:]  
+flag = None
+restIsFiles = []
+
+if len(args) > 0 and args[0] and args[0][0] == "-":
+    flag = args[0]
+    restIsFiles = args[1:]
+else:
+    flag = None
+    restIsFiles = args
 
 lines = cleanInput(restIsFiles)
 takeSpecifiedAction(lines, flag)

implement-shell-tools/ls/ls.py

@@ -10,25 +10,30 @@ def showAllFilesInDir(directory):
             print(eachFile)
 
 # `ls -1 sample-files`
-def showVisibleInSampleFiles():
-    listOfFiles = os.listdir("sample-files")
+def showVisibleInSampleFiles(directory):
+    listOfFiles = os.listdir(directory)
 
     for eachFile in listOfFiles:
         if eachFile[0] != ".":
             print(eachFile)
 
 # `ls -1 -a sample-files`
-def showAllInSampleFiles():
-    listOfFiles = os.listdir("sample-files")
+def showAllInSampleFiles(directory):
+    listOfFiles = os.listdir(directory)
 
     for eachFile in listOfFiles:
         print(eachFile)
 
 argv = sys.argv[1:]
 
-if "-a" in argv:
-    showAllInSampleFiles()
-elif "sample-files" in argv:
-    showVisibleInSampleFiles()
-else:
-    showAllFilesInDir(".")
+show_all = "-a" in argv
+
+directories = [arg for arg in argv if arg != "-a"]
+if not directories:
+    directories = ["."]
+    
+for directory in directories:
+    if show_all:
+        showAllInSampleFiles(directory)
+    else:
+        showVisibleInSampleFiles(directory)

implement-shell-tools/wc/wc.py

@@ -1,53 +1,26 @@
 import sys
 from pathlib import Path
 
-def calculateCounts(inputFiles):
-    return {
-        "lines": len(inputFiles.split("\n")) - 1,
-        "words": len(inputFiles.split()),
-        "bytes": len(inputFiles),
-    }
-
-# * `wc -l sample-files/3.txt`
-# * `wc -l sample-files/*`
-def countLines(listOfFiles):
-    for file in listOfFiles:
-        content = Path(file).read_text(encoding="utf-8")
-
-        counts = calculateCounts(content)
-        print(f"{counts['lines']} {file}")
-
-# * `wc -w sample-files/3.txt`
-def countWords(listOfFiles):
-    for file in listOfFiles:
-        content = Path(file).read_text(encoding="utf-8")
-
-        # const wordsCounted = content.split(" ").filter(word => word !== "").length;
-        counts = calculateCounts(content)
-        print(f"{counts['words']} {file}")
-
-# * `wc -c sample-files/3.txt`
-def countBytes(listOfFiles):
-    for file in listOfFiles:
-        content = Path(file).read_text(encoding="utf-8")
-        counts = calculateCounts(content)
-        print(f"{counts['bytes']} {file}")
-
-# * `wc sample-files/*`
-def countAll(listOfFiles):
+def countAll(listOfFiles, flag=None):
     for file in listOfFiles:
         content = Path(file).read_text(encoding="utf-8")
-        counts = calculateCounts(content)
-        print(f"{counts['lines']} {counts['words']} {counts['bytes']} {file}")
+        if flag == "-l":
+            print(f"{len(content.splitlines())} {file}")
+        elif flag == "-w":
+            print(f"{len(content.split())} {file}")
+        elif flag == "-c":
+            print(f"{len(content)} {file}")
+        else:
+            print(f"{len(content.splitlines())} {len(content.split())} {len(content)} {file}")
 
 argv = sys.argv[1:]
 files = [arg for arg in argv if not arg.startswith("-")]
 
 if "-l" in argv:
-    countLines(files)
+    countAll(files, "-l")
 elif "-w" in argv:
-    countWords(files)
+    countAll(files, "-w")
 elif "-c" in argv:
-    countBytes(files)
+    countAll(files, "-c")
 else:
     countAll(files)

number-systems/README.md

@@ -5,61 +5,41 @@ Do not convert any binary numbers to decimal when solving a question unless the
 The goal of these exercises is for you to gain an intuition for binary numbers. Using tools to solve the problems defeats the point.
 
 Convert the decimal number 14 to binary.
-Answer:1110
 
 Convert the binary number 101101 to decimal:
-Answer:45
 
 Which is larger: 1000 or 0111?
-Answer:1000
 
 Which is larger: 00100 or 01011?
-Answer:01011
 
 What is 10101 + 01010?
-Answer:11111
 
 What is 10001 + 10001?
-Answer:100010
 
 What's the largest number you can store with 4 bits, if you want to be able to represent the number 0?
-Answer:1111 so 15
 
 How many bits would you need in order to store the numbers between 0 and 255 inclusive?
-Answer:8 as 2 **8 = 256 0-255
 
 How many bits would you need in order to store the numbers between 0 and 3 inclusive?
-Answer: 2 **2 0 1 2 3
 
 How many bits would you need in order to store the numbers between 0 and 1000 inclusive?
-Answer:2** 10 = 1024 so 10
 
 How can you test if a binary number is a power of two (e.g. 1, 2, 4, 8, 16, ...)?
-Answer: number /2 until it reaches 1, check remainder at each division
 
 Convert the decimal number 14 to hex.
-Answer: E
 
 Convert the decimal number 386 to hex.
-Answer:0x182 863/16 =24 %2 24/16=1 %8 
 
 Convert the hex number 386 to decimal.
-Answer:902
 
 Convert the hex number B to decimal.
-Answer:11
 
 If reading the byte 0x21 as a number, what decimal number would it mean?
-Answer: 33
 
 If reading the byte 0x21 as an ASCII character, what character would it mean?
-Answer:!
 
 If reading the byte 0x21 as a greyscale colour, as described in "Approaches for Representing Colors and Images", what colour would it mean?
-Answer:33 intensity so grey dark
 
 If reading the bytes 0xAA00FF as an RGB colour, as described in "Approaches for Representing Colors and Images", what colour would it mean?
-Answer:RGB(170, 0, 255)
 
 If reading the bytes 0xAA00FF as a sequence of three one-byte decimal numbers, what decimal numbers would they be?
-Answer: 170, 0, 255