Show help when no args passed (#1)

* Show help when no args passed
* Fix landscape warnings & errors

Author: jia3ep

Makefile

@@ -9,6 +9,7 @@ clean:
 	rm -rf test/__pycache__
 	rm -rf zxtools/__pycache__
 	rm -rf zxtools.egg-info
+	rm -rf coverage.xml
 
 coverage:
 	coverage run --source zxtools setup.py test

test/test_hobeta.py

@@ -24,6 +24,9 @@ def test_args_parser(self):
         with self.assertRaises(SystemExit):
             hobeta.parse_args(("-h", "-v"))
 
+        with self.assertRaises(SystemExit):
+            hobeta.parse_args(())
+
         temp_in_file = tempfile.mkstemp()[1]
         input_file = open(temp_in_file, "w")
         input_file.close()

test/test_zeus2txt.py

@@ -25,6 +25,9 @@ def test_args_parser(self):
         with self.assertRaises(SystemExit):
             zeus2txt.parse_args(("-h", "-v"))
 
+        with self.assertRaises(SystemExit):
+            zeus2txt.parse_args(())
+
         temp_in_file = tempfile.mkstemp()[1]
         input_file = open(temp_in_file, "w")
         input_file.close()

zxtools/__init__.py

@@ -8,5 +8,5 @@
 # See LICENSE file in the project root for full license information.
 #
 
-__version__ = '1.0.21'
-CHUNK_SIZE = 512 * 1024  # 512 KBytes
+__version__ = '1.0.22'
+CHUNK_SIZE = 512 * 1024  # 512 KBytes

zxtools/hobeta.py

@@ -41,6 +41,7 @@ def hobeta_help(*parsed_args):
         " F   - The first occupied sector or just padding?\n"
         " C   - File size in TR-DOS sectors\n"
         " CHK - Checksum of this header (excluding CHK)")
+    return parsed_args
 
 
 def calc_checksum(data):
@@ -153,7 +154,15 @@ def parse_args(args):
         help="Show Hobeta header format description")
     help_parser.set_defaults(func=hobeta_help)
 
-    return parser.parse_args(args)
+    try:
+        options = parser.parse_args(args)
+        if len(args) == 0:
+            raise ValueError
+    except ValueError:
+        parser.print_help()
+        sys.exit(0)
+
+    return options
 
 
 def main():

zxtools/zeus2txt.py

@@ -20,7 +20,7 @@
 
 
 def show_info(*parsed_args):
-    return
+    return parsed_args
 
 
 def read_file(src_file):
@@ -59,6 +59,8 @@ def convert_file(parsed_args):
     tab = False
     output = parsed_args.output_file
     strnum = 0
+    cur_buffer = ""
+    cur_line = io.StringIO()
     for b in read_file(parsed_args.zeus_file):
         if process_string:
             cur_buffer += "0x%02X " % b
@@ -87,7 +89,7 @@ def convert_file(parsed_args):
                 print(ASM_META[b-ASM_FIRST_TOKEN], end="", file=cur_line)
             except IndexError:
                 logger.warning("Token not defined: 0x%02X (%d), at line %05d. "
-                               "Skipped." % (b, b, strnum))
+                               "Skipped.", b, b, strnum)
         else:
             if not strnum_lo[0]:
                 strnum_lo = True, b
@@ -135,7 +137,15 @@ def parse_args(args):
         action='store_true', help="Include original code in the output file")
     convert_parser.set_defaults(func=convert_file)
 
-    return parser.parse_args(args)
+    try:
+        options = parser.parse_args(args)
+        if len(args) == 0:
+            raise ValueError
+    except ValueError:
+        parser.print_help()
+        sys.exit(0)
+
+    return options
 
 
 def main():