code style reformatting using black

This commit is contained in:
Goffi 2018-06-27 20:14:46 +02:00
commit 744cb0c503

View file

@ -34,54 +34,58 @@ class Progress(urwid.WidgetWrap, quick_widgets.QuickWidget):
self.progress_dict = {}
listbox = urwid.ListBox(self.progress_list)
buttons = []
buttons.append(sat_widgets.CustomButton(_('Clear progress list'), self._onClear))
buttons.append(sat_widgets.CustomButton(_("Clear progress list"), self._onClear))
max_len = max([button.getSize() for button in buttons])
buttons_wid = urwid.GridFlow(buttons,max_len,1,0,'center')
buttons_wid = urwid.GridFlow(buttons, max_len, 1, 0, "center")
main_wid = sat_widgets.FocusFrame(listbox, footer=buttons_wid)
urwid.WidgetWrap.__init__(self, main_wid)
def add(self, progress_id, message, profile):
mess_wid = urwid.Text(message)
progr_wid = urwid.ProgressBar('progress_normal', 'progress_complete')
progr_wid = urwid.ProgressBar("progress_normal", "progress_complete")
column = urwid.Columns([mess_wid, progr_wid])
self.progress_dict[(progress_id, profile)] = {'full':column,'progress':progr_wid,'state':'init'}
self.progress_dict[(progress_id, profile)] = {
"full": column,
"progress": progr_wid,
"state": "init",
}
self.progress_list.append(column)
self.progressCB(self.host.loop, (progress_id, message, profile))
def progressCB(self, loop, data):
progress_id, message, profile = data
data = self.host.bridge.progressGet(progress_id, profile)
pbar = self.progress_dict[(progress_id, profile)]['progress']
pbar = self.progress_dict[(progress_id, profile)]["progress"]
if data:
if self.progress_dict[(progress_id, profile)]['state'] == 'init':
#first answer, we must construct the bar
self.progress_dict[(progress_id, profile)]['state'] = 'progress'
pbar.done = float(data['size'])
if self.progress_dict[(progress_id, profile)]["state"] == "init":
# first answer, we must construct the bar
self.progress_dict[(progress_id, profile)]["state"] = "progress"
pbar.done = float(data["size"])
pbar.set_completion(float(data['position']))
pbar.set_completion(float(data["position"]))
self.updateNotBar()
else:
if self.progress_dict[(progress_id, profile)]['state'] == 'progress':
self.progress_dict[(progress_id, profile)]['state'] = 'done'
if self.progress_dict[(progress_id, profile)]["state"] == "progress":
self.progress_dict[(progress_id, profile)]["state"] = "done"
pbar.set_completion(pbar.done)
self.updateNotBar()
return
loop.set_alarm_in(0.2,self.progressCB, (progress_id, message, profile))
loop.set_alarm_in(0.2, self.progressCB, (progress_id, message, profile))
def _removeBar(self, progress_id, profile):
wid = self.progress_dict[(progress_id, profile)]['full']
wid = self.progress_dict[(progress_id, profile)]["full"]
self.progress_list.remove(wid)
del(self.progress_dict[(progress_id, profile)])
del (self.progress_dict[(progress_id, profile)])
def _onClear(self, button):
to_remove = []
for progress_id, profile in self.progress_dict:
if self.progress_dict[(progress_id, profile)]['state'] == 'done':
to_remove.append((progress_id, profile))
for progress_id, profile in to_remove:
self._removeBar(progress_id, profile)
self.updateNotBar()
to_remove = []
for progress_id, profile in self.progress_dict:
if self.progress_dict[(progress_id, profile)]["state"] == "done":
to_remove.append((progress_id, profile))
for progress_id, profile in to_remove:
self._removeBar(progress_id, profile)
self.updateNotBar()
def updateNotBar(self):
if not self.progress_dict:
@ -90,9 +94,8 @@ class Progress(urwid.WidgetWrap, quick_widgets.QuickWidget):
progress = 0
nb_bars = 0
for progress_id, profile in self.progress_dict:
pbar = self.progress_dict[(progress_id, profile)]['progress']
progress += pbar.current/pbar.done*100
nb_bars+=1
av_progress = progress/float(nb_bars)
pbar = self.progress_dict[(progress_id, profile)]["progress"]
progress += pbar.current / pbar.done * 100
nb_bars += 1
av_progress = progress / float(nb_bars)
self.host.setProgress(av_progress)