Skip to content

Commit c948b01

Browse files
committed
Change the report name and add prod option to install npm package
Signed-off-by: Jiyeong Seok <[email protected]>
1 parent 17341a7 commit c948b01

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

src/fosslight_dependency/package_manager/Npm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def start_license_checker(self):
3939
license_checker_cmd = 'license-checker --production --json --out ' + self.input_file_name
4040
custom_path_option = ' --customPath '
4141
node_modules = 'node_modules'
42-
npm_install_cmd = 'npm install'
42+
npm_install_cmd = 'npm install --prod'
4343

4444
if os.path.isdir(node_modules) != 1:
4545
logger.info("node_modules directory is not existed. So it executes 'npm install'.")

src/fosslight_dependency/run_dependency_scanner.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020

2121
# Package Name
2222
_PKG_NAME = "fosslight_dependency"
23+
logger = logging.getLogger(constant.LOGGER_NAME)
24+
warnings.filterwarnings("ignore", category=FutureWarning)
25+
_sheet_name = "SRC"
26+
_fosslight_report = "FOSSLight-Report"
2327

2428

2529
def find_package_manager():
@@ -48,11 +52,6 @@ def find_package_manager():
4852
return ret, found_package_manager
4953

5054

51-
logger = logging.getLogger(constant.LOGGER_NAME)
52-
warnings.filterwarnings("ignore", category=FutureWarning)
53-
_PKG_NAME = "fosslight_dependency"
54-
55-
5655
def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_activate_cmd='', pip_deactivate_cmd='',
5756
output_custom_dir='', app_name=const.default_app_name, github_token=''):
5857
global logger
@@ -73,7 +72,7 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
7372
else:
7473
output_dir = os.getcwd()
7574

76-
start_time = datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
75+
start_time = datetime.now().strftime('%y%m%d_%H%M%S')
7776
logger, _result_log = init_log(os.path.join(output_dir, "fosslight_dependency_log_" + start_time + ".txt"),
7877
True, logging.INFO, logging.DEBUG, _PKG_NAME)
7978

@@ -123,15 +122,15 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
123122
found_package_manager.append(package_manager)
124123

125124
sheet_list = {}
126-
sheet_list["SRC"] = []
125+
sheet_list[_sheet_name] = []
127126

128127
for pm in found_package_manager:
129128
ret, package_sheet_list = analyze_dependency(pm, input_dir, output_dir, pip_activate_cmd, pip_deactivate_cmd,
130129
output_custom_dir, app_name, github_token)
131130
if ret:
132-
sheet_list["SRC"].extend(package_sheet_list)
131+
sheet_list[_sheet_name].extend(package_sheet_list)
133132

134-
output_filename = _PKG_NAME + '_output'
133+
output_filename = _fosslight_report + '_' + start_time
135134
if sheet_list is not None:
136135
success, msg = write_excel_and_csv(os.path.join(output_dir, output_filename), sheet_list)
137136
if success:

0 commit comments

Comments
 (0)