Command line support read from multi files by using -i/-p param.

Author: cfhamlet

README.rst

@@ -195,19 +195,18 @@ Command line
   .. code:: console
     
     $ pattern-make -h
-    usage: pattern-make [-h] [-v] [-i INPUT [INPUT ...]]
-                        [-l {NOTSET,DEBUG,INFO,WARN,ERROR,FATAL}]
-                        [-c CONFIG [CONFIG ...]]
+    usage: pattern-make [-h] [-v] [-i INPUTS [INPUTS ...]]
+                        [-l {NOTSET,DEBUG,INFO,WARN,ERROR,FATAL}] [-c CONFIG]
                         [-f {PATTERN,CLUSTER,JSON,ETE,INLINE,NULL}]
 
     optional arguments:
       -h, --help            show this help message and exit
       -v, --version         show program's version number and exit
-      -i INPUT [INPUT ...], --input INPUT [INPUT ...]
-                            input file to be processed (default: stdin)
+      -i INPUTS [INPUTS ...], --inputs INPUTS [INPUTS ...]
+                            input files to be processed (default: stdin)
       -l {NOTSET,DEBUG,INFO,WARN,ERROR,FATAL}, --loglevel {NOTSET,DEBUG,INFO,WARN,ERROR,FATAL}
                             log level (default: NOTSET)
-      -c CONFIG [CONFIG ...], --config CONFIG [CONFIG ...]
+      -c CONFIG, --config CONFIG
                             config file
       -f {PATTERN,CLUSTER,JSON,ETE,INLINE,NULL}, --formatter {PATTERN,CLUSTER,JSON,ETE,INLINE,NULL}
                             output formatter (default: CLUSTER)
@@ -237,19 +236,19 @@ Command line
   .. code:: console
     
     $ pattern-match -h
-    usage: pattern-match [-h] [-v] [-i INPUT [INPUT ...]]
-                         [-l {NOTSET,DEBUG,INFO,WARN,ERROR,FATAL}] -p PATTERN_FILE
-                         [PATTERN_FILE ...] [-a]
+    usage: pattern-match [-h] [-v] [-i INPUTS [INPUTS ...]]
+                         [-l {NOTSET,DEBUG,INFO,WARN,ERROR,FATAL}] -p
+                         PATTERN_FILES [PATTERN_FILES ...] [-a]
 
     optional arguments:
       -h, --help            show this help message and exit
       -v, --version         show program's version number and exit
-      -i INPUT [INPUT ...], --input INPUT [INPUT ...]
-                            input file to be processed (default: stdin)
+      -i INPUTS [INPUTS ...], --inputs INPUTS [INPUTS ...]
+                            input files to be processed (default: stdin)
       -l {NOTSET,DEBUG,INFO,WARN,ERROR,FATAL}, --loglevel {NOTSET,DEBUG,INFO,WARN,ERROR,FATAL}
                             log level (default: NOTSET)
-      -p PATTERN_FILE [PATTERN_FILE ...], --pattern-file PATTERN_FILE [PATTERN_FILE ...]
-                            pattern file to be loaded
+      -p PATTERN_FILES [PATTERN_FILES ...], --pattern-files PATTERN_FILES [PATTERN_FILES ...]
+                            pattern files to be loaded
       -a, --all_matched     all matched patterns
 
 

src/os_urlpattern/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.10.1

src/os_urlpattern/cmdline.py

@@ -14,6 +14,7 @@
 import sys
 import time
 from collections import Counter
+from itertools import chain
 
 from . import __version__
 from .compat import binary_stdin, binary_stdout
@@ -62,12 +63,12 @@ def add_argument(self, parser):
                                 version=__version__)
                             )
 
-        parser.add_argument('-i', '--input',
-                            help='input file to be processed (default: stdin)',
+        parser.add_argument('-i', '--inputs',
+                            help='input files to be processed (default: stdin)',
                             nargs='+',
                             type=argparse.FileType('rb'),
                             default=[binary_stdin],
-                            dest='input')
+                            dest='inputs')
 
         parser.add_argument('-l', '--loglevel',
                             help='log level (default: NOTSET)',
@@ -96,9 +97,8 @@ def add_argument(self, parser):
         super(MakePatternCommand, self).add_argument(parser)
         parser.add_argument('-c', '--config',
                             help='config file',
-                            nargs='+',
+                            nargs=1,
                             type=argparse.FileType('r'),
-                            action='store',
                             dest='config')
 
         parser.add_argument('-f', '--formatter',
@@ -114,7 +114,7 @@ def _load(self, pattern_maker, args):
         stats = Counter()
         with LogSpeedAdapter(self._logger, 5000) as speed_logger:
             load = pattern_maker.load
-            for line in args.input[0]:
+            for line in chain.from_iterable(args.inputs):
                 speed_logger.debug('[LOADING]')
                 stats['ALL'] += 1
                 line = line.strip()
@@ -164,13 +164,12 @@ def __init__(self):
 
     def add_argument(self, parser):
         super(MatchPatternCommand, self).add_argument(parser)
-        parser.add_argument('-p', '--pattern-file',
-                            help='pattern file to be loaded',
+        parser.add_argument('-p', '--pattern-files',
+                            help='pattern files to be loaded',
                             nargs='+',
                             type=argparse.FileType('rb'),
                             required=True,
-                            action='store',
-                            dest='pattern_file')
+                            dest='pattern_files')
 
         parser.add_argument('-a', '--all_matched',
                             help='all matched patterns',
@@ -180,11 +179,14 @@ def add_argument(self, parser):
 
     def _load(self, pattern_matcher, args):
         stats = Counter()
-        io_input = args.pattern_file[0]
-        self._logger.debug('[LOAD] Pattrn file: %s', io_input.name)
+        p_inputs = args.pattern_files
+        self._logger.debug('[LOAD] %d pattern file%s: %s',
+                           len(p_inputs),
+                           's' if len(p_inputs) > 1 else '',
+                           ', '.join([p.name for p in p_inputs]))
         with LogSpeedAdapter(self._logger, 1000) as speed_logger:
             load = pattern_matcher.load
-            for line in io_input:
+            for line in chain.from_iterable(p_inputs):
                 speed_logger.debug('[LOADING]')
                 stats['ALL'] += 1
                 line = line.rstrip()
@@ -225,7 +227,7 @@ def _match_result(self, pattern_matcher, raw_url, args):
     def _match(self, pattern_matcher, args):
         speed_logger = LogSpeedAdapter(self._logger, 5000)
         write = binary_stdout.write
-        for line in args.input[0]:
+        for line in chain.from_iterable(args.inputs):
             speed_logger.debug('[MATCHING]')
             line = line.strip()
             result = self._match_result(pattern_matcher, line, args)