mirror of
https://github.com/docker/compose.git
synced 2025-04-08 17:05:13 +02:00
Closes: #6890 Some remarks, - `# coding ... utf-8` statements are not needed - isdigit on strings instead of a try-catch. - Default opening mode is read, so we can do `open()` without the `'r'` everywhere - Removed inheritinng from `object` class, it isn't necessary in python3. - `super(ClassName, self)` can now be replaced with `super()` - Use of itertools and `chain` on a couple places dealing with sets. - Used the operator module instead of lambdas when warranted `itemgetter(0)` instead of `lambda x: x[0]` `attrgetter('name')` instead of `lambda x: x.name` - `sorted` returns a list, so no need to use `list(sorted(...))` - Removed `dict()` using dictionary comprehensions whenever possible - Attempted to remove python3.2 support Signed-off-by: alexrecuenco <alejandrogonzalezrecuenco@gmail.com>
124 lines
3.5 KiB
Python
124 lines
3.5 KiB
Python
from compose import utils
|
|
|
|
|
|
class StreamOutputError(Exception):
|
|
pass
|
|
|
|
|
|
def write_to_stream(s, stream):
|
|
try:
|
|
stream.write(s)
|
|
except UnicodeEncodeError:
|
|
encoding = getattr(stream, 'encoding', 'ascii')
|
|
stream.write(s.encode(encoding, errors='replace').decode(encoding))
|
|
|
|
|
|
def stream_output(output, stream):
|
|
is_terminal = hasattr(stream, 'isatty') and stream.isatty()
|
|
stream = stream
|
|
lines = {}
|
|
diff = 0
|
|
|
|
for event in utils.json_stream(output):
|
|
yield event
|
|
is_progress_event = 'progress' in event or 'progressDetail' in event
|
|
|
|
if not is_progress_event:
|
|
print_output_event(event, stream, is_terminal)
|
|
stream.flush()
|
|
continue
|
|
|
|
if not is_terminal:
|
|
continue
|
|
|
|
# if it's a progress event and we have a terminal, then display the progress bars
|
|
image_id = event.get('id')
|
|
if not image_id:
|
|
continue
|
|
|
|
if image_id not in lines:
|
|
lines[image_id] = len(lines)
|
|
write_to_stream("\n", stream)
|
|
|
|
diff = len(lines) - lines[image_id]
|
|
|
|
# move cursor up `diff` rows
|
|
write_to_stream("%c[%dA" % (27, diff), stream)
|
|
|
|
print_output_event(event, stream, is_terminal)
|
|
|
|
if 'id' in event:
|
|
# move cursor back down
|
|
write_to_stream("%c[%dB" % (27, diff), stream)
|
|
|
|
stream.flush()
|
|
|
|
|
|
def print_output_event(event, stream, is_terminal):
|
|
if 'errorDetail' in event:
|
|
raise StreamOutputError(event['errorDetail']['message'])
|
|
|
|
terminator = ''
|
|
|
|
if is_terminal and 'stream' not in event:
|
|
# erase current line
|
|
write_to_stream("%c[2K\r" % 27, stream)
|
|
terminator = "\r"
|
|
elif 'progressDetail' in event:
|
|
return
|
|
|
|
if 'time' in event:
|
|
write_to_stream("[%s] " % event['time'], stream)
|
|
|
|
if 'id' in event:
|
|
write_to_stream("%s: " % event['id'], stream)
|
|
|
|
if 'from' in event:
|
|
write_to_stream("(from %s) " % event['from'], stream)
|
|
|
|
status = event.get('status', '')
|
|
|
|
if 'progress' in event:
|
|
write_to_stream("{} {}{}".format(status, event['progress'], terminator), stream)
|
|
elif 'progressDetail' in event:
|
|
detail = event['progressDetail']
|
|
total = detail.get('total')
|
|
if 'current' in detail and total:
|
|
percentage = float(detail['current']) / float(total) * 100
|
|
write_to_stream('{} ({:.1f}%){}'.format(status, percentage, terminator), stream)
|
|
else:
|
|
write_to_stream('{}{}'.format(status, terminator), stream)
|
|
elif 'stream' in event:
|
|
write_to_stream("{}{}".format(event['stream'], terminator), stream)
|
|
else:
|
|
write_to_stream("{}{}\n".format(status, terminator), stream)
|
|
|
|
|
|
def get_digest_from_pull(events):
|
|
digest = None
|
|
for event in events:
|
|
status = event.get('status')
|
|
if not status or 'Digest' not in status:
|
|
continue
|
|
else:
|
|
digest = status.split(':', 1)[1].strip()
|
|
return digest
|
|
|
|
|
|
def get_digest_from_push(events):
|
|
for event in events:
|
|
digest = event.get('aux', {}).get('Digest')
|
|
if digest:
|
|
return digest
|
|
return None
|
|
|
|
|
|
def read_status(event):
|
|
status = event['status'].lower()
|
|
if 'progressDetail' in event:
|
|
detail = event['progressDetail']
|
|
if 'current' in detail and 'total' in detail:
|
|
percentage = float(detail['current']) / float(detail['total'])
|
|
status = '{} ({:.1%})'.format(status, percentage)
|
|
return status
|