borgend: comparison ui.py

-:10bd7e3906d9
+:bc6c3d74e6ea
 from config import settings
 import objc
 logger=borgend.logger.getChild(__name__)
-traynames={
+traynames_ok={
-backup.INACTIVE: 'B.',
+backup.State.INACTIVE: 'B.',
-backup.SCHEDULED: 'B.',
+backup.State.SCHEDULED: 'B.',
-backup.QUEUED: 'B:',
+backup.State.QUEUED: 'B:',
-backup.ACTIVE: 'B!',
+backup.State.ACTIVE: 'B!',
-backup.BUSY: 'B⦙',
-backup.OFFLINE: 'B⦙',
-backup.ERRORS: 'B?'
 }
-statestring={
+traynames_errors={
-backup.INACTIVE: 'inactive',
+# The first one should never be used
-backup.SCHEDULED: 'scheduled',
+backup.Errors.OK: traynames_ok[backup.State.INACTIVE],
-backup.QUEUED: 'queued',
+backup.Errors.BUSY: 'B⦙',
-backup.ACTIVE: 'active',
+backup.Errors.OFFLINE: 'B⦙',
-backup.BUSY: 'busy',
+backup.Errors.ERRORS: 'B?'
-backup.OFFLINE: 'offline',
-backup.ERRORS: 'errors'
 }
+def trayname(ste):
+state=ste[0]
+errors=ste[1]
+if not errors.ok():
+return traynames_errors[errors]
+else:
+return traynames_ok[state]
+def combine_state(a, b):
+return (max(a[0], b[0]), max(a[1], b[1]))
 # Refresh the menu at most once a second to reduce flicker
 refresh_interval=1.0
 # Workaround to rumps brokenness;
 return '{0:.2f}GB'.format(B/GB)
 elif TB <= B:
 return '{0:.2f}TB'.format(B/TB)
 def make_title(status):
-state=status['state']
+def add_detail(detail, new):
-detail=''
+if detail:
-if status['type']=='scheduled':
+return "%s; %s" % (detail, new)
+else:
+return new
+errors=status['errors']
+detail=None
+if not errors.ok():
+detail=add_detail(detail, str(errors))
+if status['state']==backup.State.SCHEDULED:
 # Operation scheduled
 when=status['when']
 now=time.time()
 if when<now:
 whenstr='overdue'
 if twhen.tm_sec>30:
 # Round up minute display to avoid user confusion
 twhen=time.localtime(when+30)
 whenstr='at %02d:%02d' % (twhen.tm_hour, twhen.tm_min)
-detail=''
+this_detail=''
-if state>=backup.BUSY and state in statestring:
-detail=statestring[state] + '; '
 if status['detail']!='normal':
-detail=detail+status['detail']+' '
+this_detail=status['detail'] + ' '
-title="%s (%s%s %s)" % (status['name'], detail, status['operation'], whenstr)
-elif status['type']=='queued':
+when_how_sched= "%s%s %s" % (this_detail, status['operation'], whenstr)
-title="%s (queued)" % status['name']
-elif status['type']=='current':
+detail=add_detail(detail, when_how_sched)
+elif status['state']==backup.State.QUEUED:
+detail=add_detail(detail, "queued")
+elif status['state']==backup.State.ACTIVE:
 # Operation running
 progress=''
 if 'progress_current' in status and 'progress_total' in status:
 progress=' %d%%' % (status['progress_current']/status['progress_total'])
 elif 'original_size' in status and 'deduplicated_size' in status:
 progress=' %s→%s' % (humanbytes(status['original_size']),
 humanbytes(status['deduplicated_size']))
-title="%s (running: %s%s)" % (status['name'], status['operation'], progress)
-else: # status['type']=='nothing':
+howrunning = "running %s%s" % (status['operation'], progress)
-# Should be unscheduled, nothing running
-detail=''
+detail=add_detail(detail, howrunning)
-if state>=backup.BUSY and state in statestring:
+else:
-detail=' (' + statestring[state] + ')'
+pass
-title=status['name'] + detail
+if detail:
-return title, state
+title=status['name'] + ' (' + detail + ')'
+else:
+title=status['name']
+return title, (status['state'], status['errors'])
 class BorgendTray(rumps.App):
 def __init__(self, backups):
 self.lock=Lock()
 self.backups=backups
 menu, state=self.__rebuild_menu()
 self.refresh_timer=None
-super().__init__(traynames[state], menu=menu, quit_button=None)
+super().__init__(trayname(state), menu=menu, quit_button=None)
 def __rebuild_menu(self):
 menu=[]
-state=backup.INACTIVE
+state=(backup.State.INACTIVE, backup.Errors.OK)
 for index in range(len(self.backups)):
 b=self.backups[index]
 title, this_state=make_title(self.statuses[index])
 # Python closures suck dog's balls...
 # first and the last program I write in Python until somebody
 # fixes this brain damage
 cbm=lambda sender, _b=b: self.__menu_select_backup(sender, _b)
 item=rumps.MenuItem(title, callback=cbm)
-if this_state==backup.SCHEDULED:
+if not this_state[1].ok():
+item.state=-1
+elif this_state[0]==backup.State.SCHEDULED or this_state[0]==backup.State.QUEUED:
 item.state=1
-elif this_state>=backup.BUSY:
-item.state=-1
 menu.append(item)
-state=backup.combine_state(state, this_state)
+state=combine_state(state, this_state)
 menu_log=rumps.MenuItem("Show log", callback=lambda _: showlog())
 menu.append(menu_log)
 if not settings['no_quit_menu_entry']:
 def refresh_ui(self):
 with self.lock:
 self.refresh_timer=None
 logger.debug('Rebuilding menu')
-menu, active=self.__rebuild_menu()
+menu, state=self.__rebuild_menu()
 self.menu.clear()
 self.menu.update(menu)
-self.title=traynames[active]
+self.title=trayname(state)
 def __status_callback(self, index, status, errorlog=None):
 logger.debug('Status callback: %s' % str(status))
 with self.lock:

Mercurial > repos > borgend / file comparison

comparison: ui.py

ui.py