Merge pull request #4 from InnoFang/dev

❇️ 🎨 🐛 search support more than one path that separate by comma, and optimize some code format

Author: InnoFang

code_counter/conf/config.py

@@ -22,7 +22,7 @@ def invoke(self, args):
                 self.__append_config(args.suffix_add, args.comment_add, args.ignore_add)
             if any([args.suffix_reset, args.comment_reset, args.ignore_reset]):
                 self.__reset_config(args.suffix_reset, args.comment_reset, args.ignore_reset)
-        if args.list:
+        if args.show_list:
             self.show()
 
     def show(self):

code_counter/core/argspaser.py

@@ -6,7 +6,7 @@
 from code_counter import __version__
 
 
-def config_args_type(args):
+def split_args(args):
     return list(args.split(','))
 
 
@@ -26,24 +26,25 @@ def __init__(self):
         if not hasattr(self, args.command):
             print("Unrecognized command")
             parser.print_help()
+            exit(1)
         self.args = {args.command: getattr(self, args.command)()}
 
     def search(self):
         parser = argparse.ArgumentParser(
             description="Search code in the given path(s)")
-        parser.add_argument('path',
+        parser.add_argument('input_path', type=split_args,
                             help="specify a file or directory path you want to count or use CONFIG placeholder to configure")
         parser.add_argument('-v', '--verbose', dest="verbose", action='store_true',
                             help="show verbose infomation")
         parser.add_argument('-g', '--graph', dest='graph', action='store_true',
                             help="choose to whether to visualize the result")
         parser.add_argument('-o', '--output', dest='output_path',
                             help="specify a output path if you want to store the result")
-        parser.add_argument('--suffix', dest='suffix', type=config_args_type,
+        parser.add_argument('--suffix', dest='suffix', type=split_args,
                             help="what code files do you want to count, this parameter is disposable")
-        parser.add_argument('--comment', dest='comment', type=config_args_type,
+        parser.add_argument('--comment', dest='comment', type=split_args,
                             help="the comment symbol, which can be judged whether the current line is a comment, this parameter is disposable")
-        parser.add_argument('--ignore', dest='ignore', type=config_args_type,
+        parser.add_argument('--ignore', dest='ignore', type=split_args,
                             help="ignore some directories or files that you don't want to count, this parameter is disposable")
         return parser.parse_args(sys.argv[2:])
 
@@ -52,19 +53,19 @@ def config(self):
                                          description="A command-line interface (CLI) utility that can help you easily count code and display detailed results.")
         parser.add_argument('--list', dest='show_list', action='store_true',
                             help="list all variables set in config file, along with their values")
-        parser.add_argument('--suffix-reset', dest='suffix_reset', type=config_args_type,
+        parser.add_argument('--suffix-reset', dest='suffix_reset', type=split_args,
                             help="override 'suffix' in config and count codes according to this value")
-        parser.add_argument('--suffix-add', dest='suffix_add', type=config_args_type,
+        parser.add_argument('--suffix-add', dest='suffix_add', type=split_args,
                             help="append new value for 'suffix' in config and count codes according to this value")
 
-        parser.add_argument('--comment-reset', dest='comment_reset', type=config_args_type,
+        parser.add_argument('--comment-reset', dest='comment_reset', type=split_args,
                             help="override 'comment' in config and count comment lines according to this value")
-        parser.add_argument('--comment-add', dest='comment_add', type=config_args_type,
+        parser.add_argument('--comment-add', dest='comment_add', type=split_args,
                             help="append new value for 'comment' in config and count comment lines according to this value")
 
-        parser.add_argument('--ignore-reset', dest='ignore_reset', type=config_args_type,
+        parser.add_argument('--ignore-reset', dest='ignore_reset', type=split_args,
                             help="override 'ignore' in config and ignore some files or directory according to this value")
-        parser.add_argument('--ignore-add', dest='ignore_add', type=config_args_type,
+        parser.add_argument('--ignore-add', dest='ignore_add', type=split_args,
                             help="append new value for 'ignore' in config and ignore some files or directory according to this value")
 
         parser.add_argument('--restore', dest='restore', action='store_true',

code_counter/core/codecounter.py

@@ -47,7 +47,7 @@ def search(self):
         if not self.search_args:
             raise Exception('search_args is None, please invoke setSearchArgs first.')
 
-        input_path = self.search_args.path
+        input_path = self.search_args.input_path
         output_path = self.search_args.output_path
 
         output_file = open(output_path, 'w') if output_path else None
@@ -69,12 +69,16 @@ def search(self):
         #             else:
         #                 print('{} is not a validate path.'.format(l))
 
-        if os.path.isdir(input_path) or os.path.isfile(input_path):
-            self.__search(input_path, output_file)
-        else:
+        if not input_path:
             print('{} is not a validate path.'.format(input_path))
             return
 
+        for path in input_path:
+            if os.path.exists(path):
+                self.__search(path, output_file)
+            else:
+                print('{} is not a validate path.'.format(path))
+
         print('\n\t{}'.format("RESULT"), file=output_file)
         print("\t{}".format('=' * 20), file=output_file)
         print("\t{:<20}:{:>8} ({:>7})"