Skip to content

Display report with asset locations for all CLI downloads #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarasafavi merged 2 commits into from
Mar 6, 2019
Merged

Display report with asset locations for all CLI downloads #124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
347b389
Output the same report for all downloads via CLI
Sep 25, 2017
57ed018
Don't let final report get swallowed up with ANSI output
Sep 25, 2017
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
21 changes: 10 additions & 11 deletions planet/scripts/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,16 @@ class _BaseOutput(object):

refresh_rate = 1

def _report_complete(self, item, asset, path=None):
msg = {
'item': item['id'],
'asset': asset['type'],
'location': path or asset['location']
}
# cancel() allows report log to persist for both ANSI & regular output
self.cancel()
click.echo(json.dumps(msg))

def __init__(self, thread, dl):
self._thread = thread
self._timer = None
Expand Down Expand Up @@ -228,14 +238,6 @@ def cancel(self):

class Output(_BaseOutput):

def _report_complete(self, item, asset, path=None):
msg = {
'item': item['id'],
'asset': asset['type'],
'location': path or asset['location']
}
click.echo(json.dumps(msg))

def _output(self, stats):
logging.info('%s', stats)

Expand Down Expand Up @@ -273,9 +275,6 @@ def _output(self, stats):
self._stats.update(stats)
self._do_output()

def _report_complete(self, item, asset, path=None):
pass

def _do_output(self):
# renders a terminal like:
# highlighted status rows
Expand Down