Mercurial > libervia-backend
view sat_frontends/primitivus/progress.py @ 2927:69e4716d6268
plugins (jingle) file transfer: use initial "from" attribute as local jid instead of client.jid:
while client.jid is fine in a client context, for components it's not the right jid to use: it is the jid of the component itself while the file transfer/jingle session entity may be established with this jid + a local part (e.g. if client is files.example.net, session may be established with louise@files.example.net, in which case "from" is louise@files.example.net, while client.jid will be files.example.net).
As a consequence, using client.jid was causing trouble with components.
This patch fixes it for jingle and plugins linked to file transfer by keeping a "local_jid" variable in the session, where the jid from the original "from" attribute is used.
author | Goffi <goffi@goffi.org> |
---|---|
date | Sun, 28 Apr 2019 08:55:13 +0200 |
parents | 003b8b4b56a7 |
children | 9d0df638c8b4 |
line wrap: on
line source
#!/usr/bin/env python2 # -*- coding: utf-8 -*- # Primitivus: a SAT frontend # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. from sat.core.i18n import _ import urwid from urwid_satext import sat_widgets from sat_frontends.quick_frontend import quick_widgets class Progress(urwid.WidgetWrap, quick_widgets.QuickWidget): PROFILES_ALLOW_NONE = True def __init__(self, host, target, profiles): assert target is None and profiles is None quick_widgets.QuickWidget.__init__(self, host, target) self.host = host self.progress_list = urwid.SimpleListWalker([]) self.progress_dict = {} listbox = urwid.ListBox(self.progress_list) buttons = [] 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") 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") column = urwid.Columns([mess_wid, progr_wid]) 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"] 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"]) 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" pbar.set_completion(pbar.done) self.updateNotBar() return 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"] self.progress_list.remove(wid) 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() def updateNotBar(self): if not self.progress_dict: self.host.setProgress(None) return 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) self.host.setProgress(av_progress)