Skip to content

Commit 5af8ca6

Browse files
Include is_builtin flag if there are additional licenses
Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
1 parent e964f6f commit 5af8ca6

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

src/licensedcode/cache.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,12 @@ def load_or_build(
182182
# TODO: handle unable to lock in a nicer way
183183
raise
184184

185+
@property
186+
def has_additional_licenses(self):
187+
cache = get_cache()
188+
if cache.additional_license_directory or cache.additional_license_plugins:
189+
return True
190+
185191

186192
def build_index(
187193
licenses_db=None,

src/licensedcode/license_db.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,16 @@ def generate_details(output_path, environment, licenses, test=False):
130130
131131
``test`` is to generate a stable output for testing only
132132
"""
133+
from licensedcode.cache import get_cache
134+
include_builtin = get_cache().has_additional_licenses
135+
133136
if test:
134137
base_context_mapping = base_context_test
135138
else:
136139
base_context_mapping = base_context
137140
license_details_template = environment.get_template("license_details.html")
138141
for lic in licenses.values():
139-
license_data = lic.to_dict(include_text=False, include_builtin=False)
142+
license_data = lic.to_dict(include_text=False, include_builtin=include_builtin)
140143
html = license_details_template.render(
141144
**base_context_mapping,
142145
license=lic,
@@ -206,7 +209,7 @@ def generate(
206209

207210
def scancode_license_data(path):
208211
"""
209-
Dump license data from scancode licenses to the directory ``value`` passed
212+
Dump license data from scancode licenses to the directory ``path`` passed
210213
in from command line.
211214
212215
Dumps data in JSON, YAML and HTML formats and also dumps the .LICENSE file
@@ -220,7 +223,7 @@ def scancode_license_data(path):
220223
@click.command(name='scancode-license-data')
221224
@click.option(
222225
'--path',
223-
type=click.Path(exists=False, readable=True, file_okay=False, resolve_path=True, path_type=str),
226+
type=click.Path(exists=False, writable=True, file_okay=False, resolve_path=True, path_type=str),
224227
metavar='DIR',
225228
help='Dump the license data in this directory in the LicenseDB format and exit. '
226229
'Creates the directory if it does not exist. ',
@@ -233,7 +236,9 @@ def dump_scancode_license_data(
233236
*args,
234237
**kwargs,
235238
):
236-
"""Reindex scancode licenses and exit"""
239+
"""
240+
Dump scancode license data in various formats, and the licenseDB static website at `path`.
241+
"""
237242
scancode_license_data(path=path)
238243

239244

src/licensedcode/plugin_license.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,20 +161,17 @@ def process_codebase(self, codebase, **kwargs):
161161
cche = cache.get_cache()
162162

163163
cle = codebase.get_or_create_current_header()
164-
has_additional_licenses = False
165164

166165
if cche.additional_license_directory:
167166
cle.extra_data['additional_license_directory'] = cche.additional_license_directory
168-
has_additional_licenses = True
169167

170168
if cche.additional_license_plugins:
171169
cle.extra_data['additional_license_plugins'] = cche.additional_license_plugins
172-
has_additional_licenses = True
173170

174-
if TRACE and has_additional_licenses:
171+
if TRACE and cche.has_additional_licenses:
175172
logger_debug(
176173
f'add_referenced_filenames_license_matches: additional_licenses',
177-
f'has_additional_licenses: {has_additional_licenses}\n',
174+
f'has_additional_licenses: {cche.has_additional_licenses}\n',
178175
f'additional_license_directory: {cche.additional_license_directory}\n',
179176
f'additional_license_plugins : {cche.additional_license_plugins}'
180177
)

0 commit comments

Comments
 (0)