Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions scanpipe/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2997,7 +2997,10 @@ def parent(self, codebase=None):
else:
parent_path = self.compute_parent_directory()

return parent_path and self.project.codebaseresources.get(path=parent_path)
if parent_path:
with suppress(ObjectDoesNotExist):
return self.project.codebaseresources.get(path=parent_path)
return None

def siblings(self, codebase=None):
"""
Expand Down Expand Up @@ -4184,7 +4187,7 @@ def create_from_data(
if strip_datafile_path_root:
segments = datafile_path.split("/")
datafile_path = "/".join(segments[1:])
datafile_resource = project.codebaseresources.get(path=datafile_path)
datafile_resource = project.codebaseresources.get_or_none(path=datafile_path)

if datasource_id:
dependency_data["datasource_id"] = datasource_id
Expand Down
46 changes: 30 additions & 16 deletions scanpipe/pipes/scancode.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,23 +603,37 @@ def assemble_package(resource, project, processed_paths):
handler = get_package_handler(package_data)
logger.info(f" Selected package handler: {handler.__name__}")

extracted_items = handler.assemble(
package_data=package_data,
resource=resource,
codebase=project,
package_adder=add_resource_to_package,
)
try:
extracted_items = handler.assemble(
package_data=package_data,
resource=resource,
codebase=project,
package_adder=add_resource_to_package,
)
except AttributeError as e:
if "'NoneType' object has no attribute 'path'" in str(e):
continue
raise
except Exception:
continue

for item in extracted_items:
logger.info(f" Processing item: {item}")
if isinstance(item, packagedcode_models.Package):
pipes.update_or_create_package(project, item.to_dict())
elif isinstance(item, packagedcode_models.Dependency):
pipes.update_or_create_dependency(project, item.to_dict())
elif isinstance(item, CodebaseResource):
processed_paths.add(item.path)
else:
logger.info(f"Unknown Package assembly item type: {item!r}")
try:
for item in extracted_items:
logger.info(f" Processing item: {item}")
if isinstance(item, packagedcode_models.Package):
pipes.update_or_create_package(project, item.to_dict())
elif isinstance(item, packagedcode_models.Dependency):
pipes.update_or_create_dependency(project, item.to_dict())
elif isinstance(item, CodebaseResource):
processed_paths.add(item.path)
else:
logger.info(f"Unknown Package assembly item type: {item!r}")
except AttributeError as e:
if "'NoneType' object has no attribute 'path'" in str(e):
continue
raise
except Exception:
continue


def process_package_data(project, static_resolve=False):
Expand Down
Loading