Skip to content

Change argument parsing from getopt to argparse #94

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
Oct 18, 2022
Merged

Change argument parsing from getopt to argparse #94

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
d62f67c
Change argument parsing from getopt to argparse
JustinWonjaePark Oct 17, 2022
f7c598b
add dependency for test
JustinWonjaePark Oct 18, 2022
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
3 changes: 2 additions & 1 deletion requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ pytest-cov
pytest-flake8
flake8==3.9.2
dataclasses
scanoss
scanoss
importlib-metadata==4.12.0
58 changes: 32 additions & 26 deletions src/fosslight_source/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import sys
import os
import warnings
import getopt
import logging
import copy
from datetime import datetime
Expand All @@ -20,6 +19,7 @@
from .run_scanoss import run_scanoss_py
from .run_scanoss import get_scanoss_extra_info
import yaml
import argparse

SCANOSS_SHEET_NAME = 'SRC_FL_Source'
SCANOSS_HEADER = {SCANOSS_SHEET_NAME: ['ID', 'Source Name or Path', 'OSS Name',
Expand All @@ -41,7 +41,6 @@ def main():
success = True
_result_log = {}

argv = sys.argv[1:]
path_to_scan = os.getcwd()
write_json_file = False
output_file_name = ""
Expand All @@ -53,31 +52,38 @@ def main():
license_list = []
time_out = 120

try:
opts, args = getopt.getopt(argv, 'hvmjs:p:o:f:t:')
for opt, arg in opts:
if opt == "-h":
print_help_msg_source()
elif opt == "-v":
print_version(_PKG_NAME)
elif opt == "-p":
path_to_scan = arg
if not path_to_scan:
path_to_scan = os.getcwd()
elif opt == "-j":
write_json_file = True
elif opt == "-o":
output_file_name = arg
elif opt == "-m":
print_matched_text = True
elif opt == "-f":
format = arg
elif opt == "-s":
selected_scanner = arg.lower()
elif opt == "-t":
time_out = arg
except Exception:
parser = argparse.ArgumentParser(description='FOSSLight Source', prog='fosslight_source', add_help=False)
parser.add_argument('-h', '--help', action='store_true', required=False)
parser.add_argument('-v', '--version', action='store_true', required=False)
parser.add_argument('-p', '--path', nargs=1, type=str, required=False)
parser.add_argument('-j', '--json', action='store_true', required=False)
parser.add_argument('-o', '--output', nargs=1, type=str, required=False, default="")
parser.add_argument('-m', '--matched', action='store_true', required=False)
parser.add_argument('-f', '--format', nargs=1, type=str, required=False)
parser.add_argument('-s', '--scanner', nargs=1, type=str, required=False, default='all')
parser.add_argument('-t', '--timeout', type=int, required=False, default=120)

args = parser.parse_args()

if args.help:
print_help_msg_source()
if args.version:
print_version(_PKG_NAME)
if not args.path:
path_to_scan = os.getcwd()
else:
path_to_scan = ''.join(args.path)
if args.json:
write_json_file = True
output_file_name = ''.join(args.output)
if args.matched:
print_matched_text = True
if args.format:
format = ''.join(args.format)
if args.scanner:
selected_scanner = ''.join(args.scanner)

time_out = args.timeout

timer = TimerThread()
timer.setDaemon(True)
Expand Down