diff --git a/aerofs/aerofs-transfers b/aerofs/aerofs-transfers index 6e593a9..70d6bde 100755 --- a/aerofs/aerofs-transfers +++ b/aerofs/aerofs-transfers @@ -161,20 +161,21 @@ def print_stats(stats): sys.stdout.write(DOWN+CLRBLN+CLRLN) #sys.stdout.write(LOAD) -def print_activities(): +def print_activities(activities): ''' Prints activity log ''' - + if activities != None: + for e,l in enumerate(activities.readstdout().strip().split('\n')): + sys.stdout.write(pos(e+1,0)+l+CLRLN) try: activities = Threaded("aerofs-sh activities -c 5") activities.start() activities.join() - for e,l in enumerate(activities.readstdout().strip().split('\n')): - sys.stdout.write(pos(e+1,0)+l+CLRLN) except KeyboardInterrupt: pass except TypeError: activities.stop() activities.join() + return activities def human_time(): @@ -224,7 +225,7 @@ class Threaded(threading.Thread): options=setup_options() -stats={'time':datetime.now()-timedelta(seconds=60), +stats={'time':datetime.now()-timedelta(seconds=25), 'running':[], 'files':[], 'size': termsize()} @@ -234,6 +235,7 @@ sys.stdout.write(CLR+pos(0,0)+"Launching...") transfers = Threaded("aerofs-sh transfers") transfers.start() +activities = None for e in range(5): sys.stdout.write(pos(e+1,0)+CLRLN) while 1: @@ -248,7 +250,7 @@ while 1: raise EndProgram if ( datetime.now() - stats['time'] > timedelta(seconds=30) ) and options.activities: - print_activities() + activities=print_activities(activities) stats['time'] = datetime.now() stats=remove_running(stats)