05_howler

overtune · overtune · commit 263e041eb862 · 2020-08-04T09:49:02.000+02:00
diff --git a/05_howler/README.md b/05_howler/README.md
@@ -1,73 +0,0 @@
-# Howler
-
-https://www.youtube.com/playlist?list=PLhOuww6rJJNNzo5zqtx0388myQkUKyrQz
-
-Write a program that uppercases the given text:
-
-```
-$ ./howler.py 'The quick brown fox jumps over the lazy dog.'
-THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG.
-```
-
-If the text names a file, uppercase the contents of the file:
-
-```
-$ ./howler.py ../inputs/fox.txt
-THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG.
-```
-
-If given no arguments, print a brief usage:
-
-```
-$ ./howler.py
-usage: howler.py [-h] [-o str] str
-howler.py: error: the following arguments are required: str
-```
-
-If the `-o` or `--outfile` option is present, write the output to the given file and print nothing:
-
-```
-$ ./howler.py ../inputs/fox.txt -o out.txt
-```
-
-There should now be an `out.txt` file with the contents:
-
-```
-$ cat out.txt
-THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG.
-```
-
-Respond to `-h` or `--help` with a longer usage:
-
-```
-$ ./howler.py -h
-usage: howler.py [-h] [-o str] str
-
-Howler (upper-cases input)
-
-positional arguments:
-  str                   Input string or file
-
-optional arguments:
-  -h, --help            show this help message and exit
-  -o str, --outfile str
-                        Output filename (default: )
-```
-
-Run the test suite to ensure your program is working correctly:
-
-```
-$ make test
-pytest -xv test.py
-============================= test session starts ==============================
-...
-collected 5 items
-
-test.py::test_exists PASSED                                              [ 20%]
-test.py::test_usage PASSED                                               [ 40%]
-test.py::test_text_stdout PASSED                                         [ 60%]
-test.py::test_text_outfile PASSED                                        [ 80%]
-test.py::test_file PASSED                                                [100%]
-
-============================== 5 passed in 0.40s ===============================
-```
diff --git a/05_howler/hagrid.txt b/05_howler/hagrid.txt
diff --git a/05_howler/howler.py b/05_howler/howler.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+"""
+Author : Johan Runesson <info@johanrunesson.se>
+Date   : 2020-08-04
+Purpose: Howler (upper-cases input) 
+"""
+
+import argparse
+import os
+
+
+# --------------------------------------------------
+def get_args():
+    """Get command-line arguments"""
+
+    parser = argparse.ArgumentParser(
+        description='Howler (upper-cases input)',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+
+    parser.add_argument('text',
+                        metavar='text',
+                        type=str,
+                        help='Input string or file')
+
+    parser.add_argument('-o',
+                        '--outfile',
+                        help='Output filename',
+                        metavar='str',
+                        type=str,
+                        default='')
+
+    return parser.parse_args()
+
+
+# --------------------------------------------------
+def main():
+    """Start things up"""
+
+    args = get_args()
+    text = args.text
+    outfile = args.outfile
+    output = text.upper()
+
+    # validate arguments inside get_args (see solution1.py)
+    if os.path.isfile(text):
+        fh_in = open(text)
+        output = fh_in.read().upper()
+        fh_in.close()
+
+    if outfile:
+        fh_out = open(outfile, 'wt')
+        fh_out.write(output)
+        fh_out.close()
+    else:
+        print(output)
+
+
+# --------------------------------------------------
+if __name__ == '__main__':
+    main()
diff --git a/05_howler/test.txt b/05_howler/test.txt
@@ -0,0 +1 @@
+hej hej he
diff --git a/05_howler/test2.txt b/05_howler/test2.txt
@@ -0,0 +1 @@
+HEJ HEJ HE
diff --git a/NOTES.md b/NOTES.md
@@ -62,3 +62,35 @@ Get help in repl:
 python3
 help(str)
 ```
+
+Read a file (reads the entire file into memory):
+
+```
+fh = open(text)
+text = fh.read()
+fh.close()
+```
+
+Read a file (without reading the entire file into memory):
+
+```
+fh = open(text)
+for line in fh:
+	print(line.upper())
+fh.close()
+```
+
+Handle text that might be a file of a string:
+
+```
+if os.path.isfile(args.text):
+	args.text = open(args.text)
+else:
+	args.text = io.StringIO(args.text + '\n')
+```
+
+Handle output to file if specified else to print:
+
+```
+out_fh = open(args.outfile, 'wt') if args.outfile else sys.stdout
+```
diff --git a/out.txt b/out.txt
@@ -0,0 +1,2 @@
+this is some text
+this is some more text

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+this is some text`
	`2`	`+this is some more text`