openstack/python-swiftclient
Code Issues Proposed changes

Unindent a chunk of st_list

Browse Source 
The chunk looks like nicely containable, but it pushes against the
right edge of the screen annoyingly. This patch _only_ prettifies,
without any observable changes.

Change-Id: I96fcb5848e3e5e0e8a8ebbe398b1d4a0bea5fa24
This commit is contained in:
Pete Zaitcev 2015-02-26 15:46:13 -07:00
parent 925c01ebfb
commit 35bcad638c
1 changed files with 52 additions and 57 deletions

109
swiftclient/shell.py

@ -350,6 +350,57 @@ Optional arguments:
def st_list(parser, args, output_manager): def st_list(parser, args, output_manager):
def _print_stats(options, stats):
total_count = total_bytes = 0
container = stats.get("container", None)
for item in stats["listing"]:
item_name = item.get('name')
if not options.long and not options.human:
output_manager.print_msg(item.get('name', item.get('subdir')))
else:
if not container: # listing containers
item_bytes = item.get('bytes')
byte_str = prt_bytes(item_bytes, options.human)
count = item.get('count')
total_count += count
try:
meta = item.get('meta')
utc = gmtime(float(meta.get('x-timestamp')))
datestamp = strftime('%Y-%m-%d %H:%M:%S', utc)
except TypeError:
datestamp = '????-??-?? ??:??:??'
if not options.totals:
output_manager.print_msg(
"%5s %s %s %s", count, byte_str,
datestamp, item_name)
else: # list container contents
subdir = item.get('subdir')
if subdir is None:
item_bytes = item.get('bytes')
byte_str = prt_bytes(item_bytes, options.human)
date, xtime = item.get('last_modified').split('T')
xtime = xtime.split('.')[0]
else:
item_bytes = 0
byte_str = prt_bytes(item_bytes, options.human)
date = xtime = ''
item_name = subdir
if not options.totals:
output_manager.print_msg(
"%s %10s %8s %s", byte_str, date, xtime, item_name)
total_bytes += item_bytes
# report totals
if options.long or options.human:
if not container:
output_manager.print_msg(
"%5s %s", prt_bytes(total_count, True),
prt_bytes(total_bytes, options.human))
else:
output_manager.print_msg(
prt_bytes(total_bytes, options.human))
parser.add_option( parser.add_option(
'-l', '--long', dest='long', action='store_true', default=False, '-l', '--long', dest='long', action='store_true', default=False,
help='Long listing format, similar to ls -l.') help='Long listing format, similar to ls -l.')
@ -400,64 +451,8 @@ def st_list(parser, args, output_manager):
stats_parts_gen = swift.list(container=container) stats_parts_gen = swift.list(container=container)
for stats in stats_parts_gen: for stats in stats_parts_gen:
total_count = total_bytes = 0
container = stats.get("container", None)
if stats["success"]: if stats["success"]:
for item in stats["listing"]: _print_stats(options, stats)
item_name = item.get('name')
if not options.long and not options.human:
output_manager.print_msg(
item.get('name', item.get('subdir')))
else:
if not container: # listing containers
item_bytes = item.get('bytes')
byte_str = prt_bytes(item_bytes, options.human)
count = item.get('count')
total_count += count
try:
meta = item.get('meta')
utc = gmtime(
float(meta.get('x-timestamp')))
datestamp = strftime(
'%Y-%m-%d %H:%M:%S', utc)
except TypeError:
datestamp = '????-??-?? ??:??:??'
if not options.totals:
output_manager.print_msg(
"%5s %s %s %s", count, byte_str,
datestamp, item_name)
else: # list container contents
subdir = item.get('subdir')
if subdir is None:
item_bytes = item.get('bytes')
byte_str = prt_bytes(
item_bytes, options.human)
date, xtime = item.get(
'last_modified').split('T')
xtime = xtime.split('.')[0]
else:
item_bytes = 0
byte_str = prt_bytes(
item_bytes, options.human)
date = xtime = ''
item_name = subdir
if not options.totals:
output_manager.print_msg(
"%s %10s %8s %s", byte_str, date,
xtime, item_name)
total_bytes += item_bytes
# report totals
if options.long or options.human:
if not container:
output_manager.print_msg(
"%5s %s", prt_bytes(total_count, True),
prt_bytes(total_bytes, options.human))
else:
output_manager.print_msg(
prt_bytes(total_bytes, options.human))
else: else:
raise stats["error"] raise stats["error"]