Merge pull request #141 from fosslight/ui

Add dep item in ui result

Author: dd-jy

requirements.txt

@@ -4,7 +4,7 @@ openpyxl
 progress
 pyyaml
 beautifulsoup4
-fosslight_util>=2.1.6,<3.0.0
+fosslight_util>=2.1.12,<3.0.0
 fosslight_source>=2.1.4,<3.0.0
 fosslight_dependency>=4.1.3,<5.0.0
 fosslight_binary>=5.1.2,<6.0.0

src/fosslight_scanner/common.py

@@ -116,11 +116,10 @@ def create_scancodejson(all_scan_item_origin, ui_mode_report, src_path=""):
 
     try:
         all_scan_item = copy.deepcopy(all_scan_item_origin)
-        if FOSSLIGHT_DEPENDENCY in all_scan_item.file_items:
-            del all_scan_item.file_items[FOSSLIGHT_DEPENDENCY]
         if all_scan_item.file_items:
-            first_sheet = next(iter(all_scan_item.file_items))
-        else:
+            first_sheet = next((item for item in all_scan_item.file_items if item != FOSSLIGHT_DEPENDENCY),
+                                None)
+        if not first_sheet:
             first_sheet = FOSSLIGHT_SOURCE
             all_scan_item.file_items[first_sheet] = []
         if src_path: