tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganize conditional branches to improve readability 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2015-11-11 11:21:24 -08:00
parent b8b4c84573
commit c573fcc70a
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
compose/progress_stream.py
View File

@ -19,30 +19,33 @@ def stream_output(output, stream):
if not is_progress_event: if not is_progress_event:
print_output_event(event, stream, is_terminal) print_output_event(event, stream, is_terminal)
stream.flush() stream.flush()
continue
if not is_terminal:
continue
# if it's a progress event and we have a terminal, then display the progress bars # if it's a progress event and we have a terminal, then display the progress bars
elif is_terminal: image_id = event.get('id')
image_id = event.get('id') if not image_id:
if not image_id: continue
continue
if image_id in lines: if image_id in lines:
diff = len(lines) - lines[image_id] diff = len(lines) - lines[image_id]
else: else:
lines[image_id] = len(lines) lines[image_id] = len(lines)
stream.write("\n") stream.write("\n")
diff = 0 diff = 0
# move cursor up `diff` rows # move cursor up `diff` rows
stream.write("%c[%dA" % (27, diff)) stream.write("%c[%dA" % (27, diff))
print_output_event(event, stream, is_terminal) print_output_event(event, stream, is_terminal)
if 'id' in event: if 'id' in event:
# move cursor back down # move cursor back down
stream.write("%c[%dB" % (27, diff)) stream.write("%c[%dB" % (27, diff))
stream.flush() stream.flush()
return all_events return all_events