20
20
21
21
# Package Name
22
22
_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"
23
27
24
28
25
29
def find_package_manager ():
@@ -48,11 +52,6 @@ def find_package_manager():
48
52
return ret , found_package_manager
49
53
50
54
51
- logger = logging .getLogger (constant .LOGGER_NAME )
52
- warnings .filterwarnings ("ignore" , category = FutureWarning )
53
- _PKG_NAME = "fosslight_dependency"
54
-
55
-
56
55
def run_dependency_scanner (package_manager = '' , input_dir = '' , output_dir = '' , pip_activate_cmd = '' , pip_deactivate_cmd = '' ,
57
56
output_custom_dir = '' , app_name = const .default_app_name , github_token = '' ):
58
57
global logger
@@ -73,7 +72,7 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
73
72
else :
74
73
output_dir = os .getcwd ()
75
74
76
- start_time = datetime .now ().strftime ('%Y-%m- %d_%H-%M- %S' )
75
+ start_time = datetime .now ().strftime ('%y%m %d_%H%M %S' )
77
76
logger , _result_log = init_log (os .path .join (output_dir , "fosslight_dependency_log_" + start_time + ".txt" ),
78
77
True , logging .INFO , logging .DEBUG , _PKG_NAME )
79
78
@@ -123,15 +122,15 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
123
122
found_package_manager .append (package_manager )
124
123
125
124
sheet_list = {}
126
- sheet_list ["SRC" ] = []
125
+ sheet_list [_sheet_name ] = []
127
126
128
127
for pm in found_package_manager :
129
128
ret , package_sheet_list = analyze_dependency (pm , input_dir , output_dir , pip_activate_cmd , pip_deactivate_cmd ,
130
129
output_custom_dir , app_name , github_token )
131
130
if ret :
132
- sheet_list ["SRC" ].extend (package_sheet_list )
131
+ sheet_list [_sheet_name ].extend (package_sheet_list )
133
132
134
- output_filename = _PKG_NAME + '_output'
133
+ output_filename = _fosslight_report + '_' + start_time
135
134
if sheet_list is not None :
136
135
success , msg = write_excel_and_csv (os .path .join (output_dir , output_filename ), sheet_list )
137
136
if success :
0 commit comments