fosslight-dependency 4.1.26__py3-none-any.whl → 4.1.28__py3-none-any.whl

fosslight_dependency/package_manager/Nuget.py

@@ -48,25 +48,9 @@ class Nuget(PackageManager):
         logger.info(f"Found {self.directory_packages_props}. Using NuGet CPM flow.")
         self.packageReference = True
 
-        has_any_assets = False
-        for root, dirs, files in os.walk(self.input_dir):
-            rel_root = os.path.relpath(root, self.input_dir)
-            parts = rel_root.split(os.sep) if rel_root != os.curdir else []
-            if any(p.lower() in self._exclude_dirs for p in parts):
-                continue
-            assets_candidate = os.path.join(root, 'obj', 'project.assets.json')
-            if os.path.isfile(assets_candidate):
-                has_any_assets = True
-                break
-
-        if not has_any_assets:
-            logger.info("No project.assets.json found. Running 'dotnet restore'...")
-            restore_targets = self._find_restore_targets()
-            if not restore_targets:
-                logger.warning("No .sln or .csproj files found to restore.")
-                return False
-
-            success = False
+        restore_targets = self._find_restore_targets()
+        if restore_targets:
+            logger.info("Found .sln or .csproj files. Running 'dotnet restore'...")
             for target_path, target_file in restore_targets:
                 logger.info(f"Restoring: {os.path.relpath(target_file, self.input_dir)}")
                 try:
@@ -78,22 +62,19 @@ class Nuget(PackageManager):
                         timeout=300
                     )
                     if result.returncode == 0:
-                        success = True
+                        logger.info(f"Successfully restored {os.path.relpath(target_file, self.input_dir)}")
                     else:
                         logger.warning(f"'dotnet restore' failed for {target_file} with return code {result.returncode}")
                         if result.stderr:
                             logger.warning(result.stderr)
                 except FileNotFoundError:
                     logger.error("'dotnet' command not found. Please install .NET SDK.")
-                    return False
                 except subprocess.TimeoutExpired:
                     logger.warning(f"'dotnet restore' timed out for {target_file}.")
                 except Exception as e:
                     logger.warning(f"Failed to run 'dotnet restore' for {target_file}: {e}")
-
-            if not success:
-                logger.warning("All 'dotnet restore' attempts failed.")
-                return False
+        else:
+            logger.warning("No .sln or .csproj files found to restore.")
 
         self.project_dirs = []
         found_projects = False
@@ -377,11 +358,11 @@ class Nuget(PackageManager):
                 elif f.endswith('.csproj'):
                     csproj_files.append((depth, root, os.path.join(root, f)))
 
+        result = []
         if sln_files:
-            sln_files.sort(key=lambda x: x[0])
-            min_depth = sln_files[0][0]
-            return [(d, f) for depth, d, f in sln_files if depth == min_depth]
+            result.extend([(d, f) for _, d, f in sln_files])
+
         if csproj_files:
-            return [(d, f) for _, d, f in csproj_files]
+            result.extend([(d, f) for _, d, f in csproj_files])
 
-        return []
+        return result

fosslight_dependency/run_dependency_scanner.py

@@ -20,6 +20,7 @@ from fosslight_dependency._analyze_dependency import analyze_dependency
 from fosslight_util.output_format import check_output_formats_v2, write_output_file
 from fosslight_util.oss_item import ScannerItem
 from fosslight_dependency._graph_convertor import GraphConvertor
+from fosslight_util.exclude import get_excluded_paths
 
 # Package Name
 _PKG_NAME = "fosslight_dependency"
@@ -244,7 +245,6 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
     else:
         input_dir = os.getcwd()
         os.chdir(input_dir)
-    scan_item.set_cover_pathinfo(input_dir, path_to_exclude)
 
     autodetect = True
     found_package_manager = {}
@@ -268,6 +268,12 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
         manifest_file_name = []
 
     try:
+        excluded_path_with_default_exclusion, excluded_path_without_dot, _, _ = (
+            get_excluded_paths(input_dir, path_to_exclude, ''))
+        logger.debug(f"Skipped paths: {excluded_path_with_default_exclusion}")
+        scan_item.set_cover_pathinfo(input_dir, excluded_path_without_dot)
+        abs_path_to_exclude = [os.path.abspath(os.path.join(input_dir, path))
+                               for path in excluded_path_with_default_exclusion]
         ret, found_package_manager, input_dir, suggested_files = find_package_manager(input_dir,
                                                                                       abs_path_to_exclude,
                                                                                       manifest_file_name,

{fosslight_dependency-4.1.26.dist-info → fosslight_dependency-4.1.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_dependency
-Version: 4.1.26
+Version: 4.1.28
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Download-URL: https://github.com/fosslight/fosslight_dependency_scanner
@@ -23,7 +23,7 @@ Requires-Dist: lxml
 Requires-Dist: virtualenv
 Requires-Dist: pyyaml
 Requires-Dist: lastversion
-Requires-Dist: fosslight_util>=2.1.30
+Requires-Dist: fosslight_util>=2.1.34
 Requires-Dist: PyGithub
 Requires-Dist: requirements-parser
 Requires-Dist: defusedxml

{fosslight_dependency-4.1.26.dist-info → fosslight_dependency-4.1.28.dist-info}/RECORD

@@ -5,7 +5,7 @@ fosslight_dependency/_help.py,sha256=1ER9CDiORhMdX1FYedPHcp2TRyvICPFGM1wxOOJ4PNE
 fosslight_dependency/_package_manager.py,sha256=-hEOG44AnBoSKjMM-WQAbZIXhD8kHc-EwkOl1aLu-CA,15824
 fosslight_dependency/constant.py,sha256=zaLjZsk4r5Gv6puCbV_Crt9pWrX_FEYzgEh0UQVIE4g,1291
 fosslight_dependency/dependency_item.py,sha256=wNLWcsNycf3HQ5Pib2WrMeo2dn0eHCRg20NLcL95Qew,3345
-fosslight_dependency/run_dependency_scanner.py,sha256=9hbrrW_EfJ_6XeajrVFl-B59q5MlMHXsMRJ2BjjKu6o,22736
+fosslight_dependency/run_dependency_scanner.py,sha256=VTY9KLHhfNjcHUNepxNBmcUOr0_GHzNsqBsjJf7-QWw,23188
 fosslight_dependency/LICENSES/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 fosslight_dependency/LICENSES/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
 fosslight_dependency/package_manager/Android.py,sha256=SgQyVxEYvAcCN3EgP9p4QOQZpLIGDahXRm8ntgoCM3c,3666
@@ -17,7 +17,7 @@ fosslight_dependency/package_manager/Gradle.py,sha256=zTMvospDpfabl2DRk1jW316lW9
 fosslight_dependency/package_manager/Helm.py,sha256=ucx2Y0tWX37UHIzIGaRyTe7uQ2vlu2nUuO09hOMq9ZU,4223
 fosslight_dependency/package_manager/Maven.py,sha256=F1KQxR_LjSxl7ZgRS_W1TbuDpRERLoAVGLIUWOpjLmk,11046
 fosslight_dependency/package_manager/Npm.py,sha256=6DSsRnk8tj8NUTjG4qFfybi9x-GW1I3FRGYbNn9IJpk,12300
-fosslight_dependency/package_manager/Nuget.py,sha256=YxoyQjd9q8gvdrjs2ZzGhiaIleEq1NjtYQ-xcxIwack,18056
+fosslight_dependency/package_manager/Nuget.py,sha256=Q_pDGxsNOboVcA6KCEt2rAdFvTB46Z5sOvY4pKwNiHo,17290
 fosslight_dependency/package_manager/Pnpm.py,sha256=LDKooFGQHui_Q5U7XqSJ8KcCPiLVndXf5oGKTJExh5w,7056
 fosslight_dependency/package_manager/Pub.py,sha256=g4jqA19vf3jBdlmPLVZiIYMAQHNn3Y2I-_oq3vtpfv0,10372
 fosslight_dependency/package_manager/Pypi.py,sha256=Ae-mFl9jSgc1XrUdzAuKGuZA4nduSsWaC-u6VVjFNtg,17187
@@ -25,12 +25,12 @@ fosslight_dependency/package_manager/Swift.py,sha256=8fdbdAXTNlp2NDoSqQXm48JGAg9
 fosslight_dependency/package_manager/Unity.py,sha256=n1006GZ6Qrk8wAdO6wla1Q-JD7Evin7REVj-HDeTARc,5142
 fosslight_dependency/package_manager/Yarn.py,sha256=ZSi7_O5tMmS80Z58YOZxvai84_KyDpP8plo0x80YtVc,10069
 fosslight_dependency/package_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fosslight_dependency-4.1.26.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.26.dist-info/licenses/LICENSES/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.26.dist-info/licenses/LICENSES/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
-fosslight_dependency-4.1.26.dist-info/licenses/LICENSES/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
-fosslight_dependency-4.1.26.dist-info/METADATA,sha256=PxBOENWXec2lUrHB38ZAwalQB7RXl-OrnA22Z8o9dxg,5555
-fosslight_dependency-4.1.26.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-fosslight_dependency-4.1.26.dist-info/entry_points.txt,sha256=AeU-9Bl8al8Sa-XvhitGHdT3ZTPIrlhqADcp7s5OLF8,90
-fosslight_dependency-4.1.26.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
-fosslight_dependency-4.1.26.dist-info/RECORD,,
+fosslight_dependency-4.1.28.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.28.dist-info/licenses/LICENSES/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.28.dist-info/licenses/LICENSES/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
+fosslight_dependency-4.1.28.dist-info/licenses/LICENSES/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
+fosslight_dependency-4.1.28.dist-info/METADATA,sha256=zyuppSQD8EgIN4J4IIWptlzq3rKFoyB0dcc2aZqmEd4,5555
+fosslight_dependency-4.1.28.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+fosslight_dependency-4.1.28.dist-info/entry_points.txt,sha256=AeU-9Bl8al8Sa-XvhitGHdT3ZTPIrlhqADcp7s5OLF8,90
+fosslight_dependency-4.1.28.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
+fosslight_dependency-4.1.28.dist-info/RECORD,,