Skip to content

Commit

Permalink
Merge pull request DOI-USGS#3 in SBE/pysb from ~BSERNA_USGS.GOV/pysb:…
Browse files Browse the repository at this point in the history
…bugfix/line-indenting to master

* commit 'be02d98608e71665bcb1f767a62291d5319c794b':
  fixed line indenting
  • Loading branch information
jllong-usgs committed Nov 28, 2017
2 parents 7ca68fb + be02d98 commit d775c00
Showing 1 changed file with 41 additions and 41 deletions.
82 changes: 41 additions & 41 deletions pysb/SbSession.py
Original file line number Diff line number Diff line change
Expand Up @@ -415,48 +415,48 @@ def get_item_files_zip(self, item, destination='.'):
return local_filename

def get_item_file_info(self, item):
"""Retrieve file information from a ScienceBase Item
"""Retrieve file information from a ScienceBase Item
:param item: ScienceBase Catalog Item JSON of the item from which to get file information
:return: A list of dictionaries containing url, name and size of each file
:param item: ScienceBase Catalog Item JSON of the item from which to get file information
:return: A list of dictionaries containing url, name and size of each file
"""
retval = []
if item:
#
# regular files
#
if 'files' in item:
for f in item['files']:
finfo = {}
if 'url' in f:
finfo['url'] = f['url']
if 'name' in f:
finfo['name'] = f['name']
if 'size' in f:
finfo['size'] = f['size']
if 'originalMetadata' in f:
finfo['originalMetadata'] = f['originalMetadata']
if 'contentType' in f:
finfo['contentType'] = f['contentType']
retval.append(finfo)
if 'facets' in item:
for facet in item['facets']:
if 'files' in facet:
for f in facet['files']:
finfo = {}
if 'url' in f:
finfo['url'] = f['url']
if 'name' in f:
finfo['name'] = f['name']
if 'size' in f:
finfo['size'] = f['size']
if 'originalMetadata' in f:
finfo['originalMetadata'] = f['originalMetadata']
if 'contentType' in f:
finfo['contentType'] = f['contentType']
retval.append(finfo)
return retval
"""
retval = []
if item:
#
# regular files
#
if 'files' in item:
for f in item['files']:
finfo = {}
if 'url' in f:
finfo['url'] = f['url']
if 'name' in f:
finfo['name'] = f['name']
if 'size' in f:
finfo['size'] = f['size']
if 'originalMetadata' in f:
finfo['originalMetadata'] = f['originalMetadata']
if 'contentType' in f:
finfo['contentType'] = f['contentType']
retval.append(finfo)
if 'facets' in item:
for facet in item['facets']:
if 'files' in facet:
for f in facet['files']:
finfo = {}
if 'url' in f:
finfo['url'] = f['url']
if 'name' in f:
finfo['name'] = f['name']
if 'size' in f:
finfo['size'] = f['size']
if 'originalMetadata' in f:
finfo['originalMetadata'] = f['originalMetadata']
if 'contentType' in f:
finfo['contentType'] = f['contentType']
retval.append(finfo)
return retval

def download_file(self, url, local_filename, destination='.'):
"""Download file from URL
Expand Down Expand Up @@ -1037,4 +1037,4 @@ def create_related_item_link(self, from_item_id, to_item_id):
"""
related_item_link = self.get_item_link_type_by_name('related')
return self.create_item_link(from_item_id, to_item_id, related_item_link['id'])


0 comments on commit d775c00

Please sign in to comment.