From 3b22ce41105387e7f46a410460cf04759feef197 Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Mon, 28 Jun 2021 08:04:46 -0700 Subject: [PATCH] fix local plugin parser issue where parser has .py in the name but it is not at the end --- CHANGELOG | 3 +++ jc/__init__.py | 2 +- jc/cli.py | 2 +- jc/man/jc.1.gz | Bin 2691 -> 2691 bytes man/jc.1.gz | Bin 2691 -> 2691 bytes setup.py | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 19c37f84..766c9008 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ jc changelog +20210628 v1.15.6 +- Fix issue to only load local plugin parsers that have filenames that end in .py + 20210520 v1.15.5 - Fix issue where help and about information would not display if a 3rd party parser library was missing. (e.g. xmltodict) - Add more error message detail when encountering ParseError and LibraryNotFound exceptions diff --git a/jc/__init__.py b/jc/__init__.py index 6e6938ff..c1c3d337 100644 --- a/jc/__init__.py +++ b/jc/__init__.py @@ -86,4 +86,4 @@ Module Example: """ name = 'jc' -__version__ = '1.15.5' +__version__ = '1.15.6' diff --git a/jc/cli.py b/jc/cli.py index 14f7b983..e0a3db8c 100644 --- a/jc/cli.py +++ b/jc/cli.py @@ -130,7 +130,7 @@ local_parsers_dir = os.path.join(data_dir, 'jcparsers') if os.path.isdir(local_parsers_dir): sys.path.append(data_dir) for name in os.listdir(local_parsers_dir): - if re.match(r'\w+\.py', name) and os.path.isfile(os.path.join(local_parsers_dir, name)): + if re.match(r'\w+\.py$', name) and os.path.isfile(os.path.join(local_parsers_dir, name)): plugin_name = name[0:-3] local_parsers.append(plugin_name) if plugin_name not in parsers: diff --git a/jc/man/jc.1.gz b/jc/man/jc.1.gz index b7b4c49b52c9e5b6e76a82af2d13765b4ba5cd74..4e75e0f4cd2473a07be21a705ddc56aa89927fe6 100644 GIT binary patch delta 1993 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 bsT5MJj#cg;d5KHtr^4v}-j}eqoF4!H6ZFGq diff --git a/man/jc.1.gz b/man/jc.1.gz index b7b4c49b52c9e5b6e76a82af2d13765b4ba5cd74..4e75e0f4cd2473a07be21a705ddc56aa89927fe6 100644 GIT binary patch delta 1993 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 bsT5MJj#cg;d5KHtr^4v}-j}eqoF4!H6ZFGq diff --git a/setup.py b/setup.py index 325f8141..16a536e3 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open('README.md', 'r') as f: setuptools.setup( name='jc', - version='1.15.5', + version='1.15.6', author='Kelly Brazil', author_email='kellyjonbrazil@gmail.com', description='Converts the output of popular command-line tools and file-types to JSON.',