Fix command line

Author: rhpvorderman

src/isal/igzip.py

@@ -28,6 +28,7 @@
 import os
 
 import _compression
+import sys
 
 from . import isal_zlib
 
@@ -228,7 +229,7 @@ def main():
     parser.description = (
         "A simple command line interface for the igzip module. "
         "Acts like igzip.")
-    parser.add_argument("file")
+    parser.add_argument("file", nargs="?")
     compress_group = parser.add_mutually_exclusive_group()
     compress_group.add_argument(
         "-0", "--fast", action="store_const", dest="compresslevel",
@@ -254,24 +255,35 @@ def main():
 
     compresslevel = args.compresslevel or _COMPRESS_LEVEL_TRADEOFF
 
-    if args.compress:
-        out_filename = args.file + ".gz"
-        out_open = functools.partial(open, compresslevel=compresslevel)
-        in_open = io.open
+    if args.file is None:
+        if args.compress:
+            in_file = sys.stdin.buffer
+            out_file = IGzipFile(mode="wb", compresslevel=compresslevel,
+                                 fileobj=sys.stdout.buffer)
+        else:
+            in_file = IGzipFile(mode="rb", fileobj=sys.stdin.buffer)
+            out_file = sys.stdout.buffer
     else:
-        base, extension = os.path.splitext(args.file)
-        if extension != ".gz":
-            raise ValueError("Can only decompress files with a .gz extension")
-        out_filename = base
-        out_open = io.open
-        in_open = open
-    with in_open(args.file, "rb") as in_file:
-        with out_open(out_filename, "wb") as out_file:
-            while True:
-                block = in_file.read(_BLOCK_SIZE)
-                if block == b"":
-                    break
-                out_file.write(block)
+        if args.compress:
+            in_file = io.open(args.file, mode="rb")
+            out_file = open(args.file + ".gz", mode="wb",
+                            compresslevel=compresslevel)
+        else:
+            base, extension = os.path.splitext(args.file)
+            if extension != ".gz":
+                print(f"filename doesn't end in .gz: {args.file}")
+                return
+            in_file = open(args.file, "rb")
+            out_file = io.open(base, "wb")
+    try:
+        while True:
+            block = in_file.read(_BLOCK_SIZE)
+            if block == b"":
+                break
+            out_file.write(block)
+    finally:
+        in_file.close()
+        out_file.close()
 
 
 if __name__ == "__main__":

tests/test_gzip_compliance.py

@@ -772,7 +772,7 @@ def create_and_remove_directory(directory):
     def decorator(function):
         @functools.wraps(function)
         def wrapper(*args, **kwargs):
-            os.makedirs(directory)
+            os.makedirs(directory, exist_ok=True)
             try:
                 return function(*args, **kwargs)
             finally:
@@ -789,7 +789,7 @@ def test_decompress_stdin_stdout(self):
             with igzip.IGzipFile(fileobj=bytes_io, mode='wb') as igzip_file:
                 igzip_file.write(self.data)
 
-            args = sys.executable, '-m', 'igzip', '-d'
+            args = sys.executable, '-m', 'isal.igzip', '-d'
             with Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE) as proc:
                 out, err = proc.communicate(bytes_io.getvalue())
 
@@ -803,7 +803,7 @@ def test_decompress_infile_outfile(self):
 
         with igzip.open(igzipname, mode='wb') as fp:
             fp.write(self.data)
-        rc, out, err = assert_python_ok('-m', 'igzip', '-d', igzipname)
+        rc, out, err = assert_python_ok('-m', 'isal.igzip', '-d', igzipname)
 
         with open(os.path.join(TEMPDIR, "testigzip"), "rb") as gunziped:
             self.assertEqual(gunziped.read(), self.data)
@@ -814,14 +814,14 @@ def test_decompress_infile_outfile(self):
         self.assertEqual(err, b'')
 
     def test_decompress_infile_outfile_error(self):
-        rc, out, err = assert_python_ok('-m', 'igzip', '-d', 'thisisatest.out')
+        rc, out, err = assert_python_ok('-m', 'isal.igzip', '-d', 'thisisatest.out')
         self.assertIn(b"filename doesn't end in .gz:", out)
         self.assertEqual(rc, 0)
         self.assertEqual(err, b'')
 
     @create_and_remove_directory(TEMPDIR)
     def test_compress_stdin_outfile(self):
-        args = sys.executable, '-m', 'igzip'
+        args = sys.executable, '-m', 'isal.igzip'
         with Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE) as proc:
             out, err = proc.communicate(self.data)
 
@@ -837,7 +837,7 @@ def test_compress_infile_outfile_default(self):
         with open(local_testigzip, 'wb') as fp:
             fp.write(self.data)
 
-        rc, out, err = assert_python_ok('-m', 'igzip', local_testigzip)
+        rc, out, err = assert_python_ok('-m', 'isal.igzip', local_testigzip)
 
         self.assertTrue(os.path.exists(igzipname))
         self.assertEqual(out, b'')
@@ -854,7 +854,7 @@ def test_compress_infile_outfile(self):
                 with open(local_testigzip, 'wb') as fp:
                     fp.write(self.data)
 
-                rc, out, err = assert_python_ok('-m', 'igzip', compress_level, local_testigzip)
+                rc, out, err = assert_python_ok('-m', 'isal.igzip', compress_level, local_testigzip)
 
                 self.assertTrue(os.path.exists(igzipname))
                 self.assertEqual(out, b'')
@@ -863,13 +863,13 @@ def test_compress_infile_outfile(self):
                 self.assertFalse(os.path.exists(igzipname))
 
     def test_compress_fast_best_are_exclusive(self):
-        rc, out, err = assert_python_failure('-m', 'igzip', '--fast', '--best')
-        self.assertIn(b"error: argument --best: not allowed with argument --fast", err)
+        rc, out, err = assert_python_failure('-m', 'isal.igzip', '--fast', '--best')
+        self.assertIn(b"error: argument -3/--best: not allowed with argument -0/--fast", err)
         self.assertEqual(out, b'')
 
     def test_decompress_cannot_have_flags_compression(self):
-        rc, out, err = assert_python_failure('-m', 'igzip', '--fast', '-d')
-        self.assertIn(b'error: argument -d/--decompress: not allowed with argument --fast', err)
+        rc, out, err = assert_python_failure('-m', 'isal.igzip', '--fast', '-d')
+        self.assertIn(b'error: argument -d/--decompress: not allowed with argument -0/--fast', err)
         self.assertEqual(out, b'')