Merge pull request CLARIAH#334 from c-martinez/licenseOptional

Add extra check for missing license
nichtich · May 5, 2021 · d82f9f5 · d82f9f5
2 parents 15c7c06 + 78a2aff
commit d82f9f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/fileLoaders.py b/src/fileLoaders.py
@@ -340,7 +340,7 @@ def getRepoURI(self):
 
     def getLicenceURL(self):
         """Returns the URL of the license file in the specification."""
-        return self.spec['licence'] if self.spec['licence'] else ''
+        return self.spec['licence'] if 'licence' in self.spec else None
 
     def getEndpointText(self):
         """Return content of endpoint file (endpoint.txt)"""

diff --git a/src/swagger.py b/src/swagger.py
@@ -29,7 +29,7 @@ def get_repo_info(loader, sha, prov_g):
     contact_name = loader.getContactName()
     contact_url = loader.getContactUrl()
     commit_list = loader.getCommitList()
-    licence_url = loader.getLicenceURL()
+    licence_url = loader.getLicenceURL()    # This will be None if there is no license
 
     # Add the API URI as a used entity by the activity
     if prov_g:
@@ -50,12 +50,13 @@ def get_repo_info(loader, sha, prov_g):
         'contact': {
             'name': contact_name,
             'url': contact_url
-        },
-        'license': {
+        } 
+    }
+    if licence_url:
+        info['license'] = {
             'name': 'License',
             'url': licence_url
         }
-    }
 
     if type(loader) is GithubLoader:
         basePath = '/api-git/' + user_repo + '/'