Skip to content

Added stdin support #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2019
Merged

Added stdin support #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1433d7e
Added stdin support
AlfredBerg Jan 17, 2019
7d358c3
Update __version__.py
codingo Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Interlace/lib/core/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = '1.1.1'
__version__ = '1.2'

16 changes: 13 additions & 3 deletions Interlace/lib/core/input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from netaddr import IPNetwork, IPRange, IPGlob
from Interlace.lib.core.output import OutputHelper, Level
import os.path
import sys
from re import compile


Expand Down Expand Up @@ -81,8 +82,12 @@ def process_commands(arguments):
if arguments.target:
ranges.add(arguments.target)
else:
for target in arguments.target_list:
ranges.add(target.strip())
targetFile = arguments.target_list
if not sys.stdin.isatty():
targetFile = sys.stdin
for target in targetFile:
if target.strip():
ranges.add(target.strip())

# process exclusions first
if arguments.exclusions:
Expand Down Expand Up @@ -182,7 +187,12 @@ def parse(self, argv):
def setup_parser():
parser = ArgumentParser()

targets = parser.add_mutually_exclusive_group(required=True)
#Is stdin attached?
requireTargetArg = True
if not sys.stdin.isatty():
requireTargetArg = False

targets = parser.add_mutually_exclusive_group(required=requireTargetArg)

targets.add_argument(
'-t', dest='target', required=False,
Expand Down