Sort by license

Author: soimkim

setup.py

@@ -14,7 +14,7 @@
 if __name__ == "__main__":
     setup(
         name='fosslight_source',
-        version='1.4.3',
+        version='1.4.4',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Source',

src/fosslight_source/convert_scancode.py

@@ -34,6 +34,8 @@ def convert_json_to_excel(scancode_json, excel_name):
             file_list = get_detected_licenses_from_scancode(
                 scancode_json)
             if len(file_list) > 0:
+                file_list = sorted(
+                                file_list, key=lambda row: (''.join(row.licenses)))
                 sheet_list["SRC"] = [scan_item.get_row_to_print() for scan_item in file_list]
         elif os.path.isdir(scancode_json):
             for root, dirs, files in os.walk(scancode_json):
@@ -45,6 +47,8 @@ def convert_json_to_excel(scancode_json, excel_name):
                                 result_file)
                             if len(file_list) > 0:
                                 file_name = os.path.basename(file)
+                                file_list = sorted(
+                                    file_list, key=lambda row: (''.join(row.licenses)))
                                 sheet_list["SRC_" + file_name] = [scan_item.get_row_to_print() for scan_item in file_list]
                         except Exception as ex:
                             pass

src/fosslight_source/run_scancode.py

@@ -112,7 +112,10 @@ def run_scan(path_to_scan, output_file_name="",
                         rc, result_list, parsing_msg = parsing_file_item(value)
                         _result_log["Parsing Log"] = parsing_msg
                         if rc:
+                            result_list = sorted(
+                                result_list, key=lambda row: (''.join(row.licenses)))
                             sheet_list["SRC"] = [scan_item.get_row_to_print() for scan_item in result_list]
+
                             success_to_write, writing_msg = write_excel_and_csv(
                                 output_file, sheet_list)
                             logger.warn("* Writing excel :"+str(success_to_write)+ " "+writing_msg)