@@ -644,10 +644,7 @@ def match_purldb_resources(
644644 else :
645645 to_resources = project .codebaseresources .files ().to_codebase ().no_status ()
646646
647- to_resources = (
648- to_resources .has_value ("sha1" )
649- .filter (extension__in = extensions )
650- )
647+ to_resources = to_resources .has_value ("sha1" ).filter (extension__in = extensions )
651648 resource_count = to_resources .count ()
652649
653650 extensions_str = ", " .join (extensions )
@@ -773,9 +770,13 @@ def map_javascript(project, logger=None, to_queryset=None, **kwargs):
773770 project_files = project .codebaseresources .files ()
774771
775772 if to_queryset is not None :
776- to_resources_base = to_queryset .files ().no_status ().exclude (name__startswith = "." )
773+ to_resources_base = (
774+ to_queryset .files ().no_status ().exclude (name__startswith = "." )
775+ )
777776 else :
778- to_resources_base = project_files .to_codebase ().no_status ().exclude (name__startswith = "." )
777+ to_resources_base = (
778+ project_files .to_codebase ().no_status ().exclude (name__startswith = "." )
779+ )
779780
780781 to_resources_dot_map = to_resources_base .filter (extension = ".map" )
781782 to_resources_minified = to_resources_base .filter (extension__in = [".css" , ".js" ])
@@ -1169,8 +1170,7 @@ def map_javascript_path(project, logger=None, to_queryset=None, **kwargs):
11691170 to_resources_base = project_files .to_codebase ().no_status ()
11701171
11711172 to_resources_key = (
1172- to_resources_base
1173- .filter (extension__in = [".map" , ".ts" ])
1173+ to_resources_base .filter (extension__in = [".map" , ".ts" ])
11741174 .exclude (name__startswith = "." )
11751175 .exclude (path__contains = "/node_modules/" )
11761176 )
@@ -1261,8 +1261,7 @@ def map_javascript_colocation(project, logger=None, to_queryset=None, **kwargs):
12611261 to_resources_base = project_files .to_codebase ().no_status ()
12621262
12631263 to_resources_key = (
1264- to_resources_base
1265- .filter (extension__in = [".map" , ".ts" ])
1264+ to_resources_base .filter (extension__in = [".map" , ".ts" ])
12661265 .exclude (name__startswith = "." )
12671266 .exclude (path__contains = "/node_modules/" )
12681267 )
@@ -1381,11 +1380,9 @@ def map_thirdparty_npm_packages(project, logger=None, to_queryset=None, **kwargs
13811380 else :
13821381 to_resources_base = project_files .to_codebase ()
13831382
1384- to_package_json = (
1385- to_resources_base
1386- .filter (path__regex = r"^.*\/node_modules\/.*\/package\.json$" )
1387- .exclude (path__regex = r"^.*\/node_modules\/.*\/node_modules\/.*$" )
1388- )
1383+ to_package_json = to_resources_base .filter (
1384+ path__regex = r"^.*\/node_modules\/.*\/package\.json$"
1385+ ).exclude (path__regex = r"^.*\/node_modules\/.*\/node_modules\/.*$" )
13891386
13901387 to_resources = to_resources_base .no_status ()
13911388 resource_count = to_package_json .count ()
@@ -1483,7 +1480,9 @@ def create_local_files_packages(project):
14831480 pipes .create_local_files_package (project , defaults , codebase_resource_ids )
14841481
14851482
1486- def match_resources_with_no_java_source (project , logger = None , to_queryset = None , ** kwargs ):
1483+ def match_resources_with_no_java_source (
1484+ project , logger = None , to_queryset = None , ** kwargs
1485+ ):
14871486 """
14881487 Match resources with ``no-java-source`` to PurlDB, if no match
14891488 is found update status to ``requires-review``.
@@ -1493,7 +1492,9 @@ def match_resources_with_no_java_source(project, logger=None, to_queryset=None,
14931492 if to_queryset is not None :
14941493 to_no_java_source = to_queryset .files ().filter (status = flag .NO_JAVA_SOURCE )
14951494 else :
1496- to_no_java_source = project_files .to_codebase ().filter (status = flag .NO_JAVA_SOURCE )
1495+ to_no_java_source = project_files .to_codebase ().filter (
1496+ status = flag .NO_JAVA_SOURCE
1497+ )
14971498
14981499 if to_no_java_source :
14991500 resource_count = to_no_java_source .count ()
@@ -1599,9 +1600,7 @@ def scan_ignored_to_files(project, logger=None, to_queryset=None):
15991600 scan_files = to_resources .filter (status = flag .IGNORED_FROM_CONFIG )
16001601 scancode .scan_for_files (project , scan_files , progress_logger = logger )
16011602
1602- to_resources .filter (status = flag .SCANNED ).update (
1603- status = flag .IGNORED_FROM_CONFIG
1604- )
1603+ to_resources .filter (status = flag .SCANNED ).update (status = flag .IGNORED_FROM_CONFIG )
16051604
16061605
16071606def scan_unmapped_to_files (project , logger = None , to_queryset = None ):
@@ -1617,9 +1616,7 @@ def scan_unmapped_to_files(project, logger=None, to_queryset=None):
16171616 scan_files = to_resources .filter (status = flag .REQUIRES_REVIEW )
16181617 scancode .scan_for_files (project , scan_files , progress_logger = logger )
16191618
1620- to_resources .filter (status = flag .SCANNED ).update (
1621- status = flag .REQUIRES_REVIEW
1622- )
1619+ to_resources .filter (status = flag .SCANNED ).update (status = flag .REQUIRES_REVIEW )
16231620
16241621
16251622def flag_deployed_from_resources_with_missing_license (project , doc_extensions = None ):
@@ -1721,9 +1718,7 @@ def match_purldb_resources_post_process(project, logger=None, to_queryset=None):
17211718
17221719 to_extract_directories = to_extract_directories .filter (path__regex = r"^.*-extract$" )
17231720
1724- to_resources = to_resources_base .filter (
1725- status = flag .MATCHED_TO_PURLDB_RESOURCE
1726- )
1721+ to_resources = to_resources_base .filter (status = flag .MATCHED_TO_PURLDB_RESOURCE )
17271722
17281723 resource_count = to_extract_directories .count ()
17291724
@@ -2288,10 +2283,8 @@ def map_javascript_symbols(project, logger=None, to_queryset=None, **kwargs):
22882283 else :
22892284 to_resources_base = project_files .to_codebase ()
22902285
2291- javascript_to_resources = (
2292- to_resources_base
2293- .has_no_relation ()
2294- .filter (extension__in = js_config .source_symbol_extensions )
2286+ javascript_to_resources = to_resources_base .has_no_relation ().filter (
2287+ extension__in = js_config .source_symbol_extensions
22952288 )
22962289
22972290 javascript_from_resources = (
@@ -2389,8 +2382,7 @@ def map_javascript_strings(project, logger=None, to_queryset=None, **kwargs):
23892382 to_resources_base = project_files .to_codebase ()
23902383
23912384 javascript_to_resources = (
2392- to_resources_base
2393- .has_no_relation ()
2385+ to_resources_base .has_no_relation ()
23942386 .filter (extension__in = [".ts" , ".js" ])
23952387 .exclude (extra_data = {})
23962388 )
0 commit comments