libervia-desktop: src/cagou/plugins/plugin_wid

comparison src/cagou/plugins/plugin_wid_chat.py @ 78:46d962910801

chat: file upload first draft: - added a icon to upload files - only do a basic upload with list file browser for now - use the new progressFinished and progressError listeners

author	Goffi <goffi@goffi.org>
date	Thu, 22 Dec 2016 19:03:06 +0100
parents	4a1e1012337e
children	c711be670ecd

comparison

equal deleted inserted replaced

-:bc170ccca744
+:46d962910801
 from sat.core import log as logging
 log = logging.getLogger(__name__)
 from sat.core.i18n import _
 from cagou.core.constants import Const as C
+from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.gridlayout import GridLayout
 from kivy.uix.stacklayout import StackLayout
 from kivy.uix.scrollview import ScrollView
 from kivy.uix.textinput import TextInput
 from kivy.uix.label import Label
 def update(self, update_dict):
 if 'avatar' in update_dict:
 self.avatar.source = update_dict['avatar']
+class MessageInputBox(BoxLayout):
+pass
 class MessageInputWidget(TextInput):
 def _key_down(self, key, repeat=False):
 displayed_str, internal_str, internal_action, scale = key
 if internal_action == 'enter':
 class MessagesWidget(GridLayout):
 pass
+class FileUploader(BoxLayout):
+def __init__(self, parent_chat, **kwargs):
+self.parent_chat = parent_chat
+super(FileUploader, self).__init__(orientation='vertical', **kwargs)
 class Chat(quick_chat.QuickChat, cagou_widget.CagouWidget):
+message_input = properties.ObjectProperty()
 def __init__(self, host, target, type_=C.CHAT_ONE2ONE, nick=None, occupants=None, subject=None, profiles=None):
 quick_chat.QuickChat.__init__(self, host, target, type_, nick, occupants, subject, profiles=profiles)
 cagou_widget.CagouWidget.__init__(self)
 self.header_input.hint_text = u"{}".format(target)
 scroll_view = ScrollView(size_hint=(1,0.8), scroll_y=0, do_scroll_x=False)
 self.messages_widget = MessagesWidget()
 scroll_view.add_widget(self.messages_widget)
 self.add_widget(scroll_view)
-message_input = MessageInputWidget()
+self.add_widget(MessageInputBox())
-message_input.bind(on_text_validate=self.onSend)
+self.host.addListener('progressError', self.onProgressError, profiles)
-self.add_widget(message_input)
+self.host.addListener('progressFinished', self.onProgressFinished, profiles)
+self._waiting_pids = {}  # waiting progress ids
 self.postInit()
 @classmethod
 def factory(cls, plugin_info, target, profiles):
 profiles = list(profiles)
 mess_type = C.MESS_TYPE_GROUPCHAT if self.type == C.CHAT_GROUP else C.MESS_TYPE_CHAT, # TODO: put this in QuickChat
 profile_key=self.profile
 )
 input_widget.text = ''
+def onProgressFinished(self, progress_id, metadata, profile):
+try:
+callback = self._waiting_pids.pop(progress_id)
+except KeyError:
+return
+callback(metadata, profile)
+def onProgressError(self, progress_id, err_msg, profile):
+try:
+del self._waiting_pids[progress_id]
+except KeyError:
+return
+# TODO: display message to user
+log.warning(u"Can't upload file: {}".format(err_msg))
+def onUploadButton(self):
+G.host.showExtraUI(FileUploader(self))
+def fileUploadDone(self, metadata, profile):
+log.debug("file uploaded: {}".format(metadata))
+G.host.messageSend(
+self.target,
+{'': metadata['url']},
+mess_type = C.MESS_TYPE_GROUPCHAT if self.type == C.CHAT_GROUP else C.MESS_TYPE_CHAT,
+profile_key=profile
+)
+def fileUploadCb(self, progress_data):
+try:
+progress_id = progress_data['progress']
+except KeyError:
+xmlui = progress_data['xmlui']
+G.host.showUI(xmlui)
+else:
+self._waiting_pids[progress_id] = self.fileUploadDone
+def onUploadOK(self, file_chooser):
+if file_chooser.selection:
+file_path = file_chooser.selection[0]
+G.host.bridge.fileUpload(
+file_path,
+"",
+"",
+{"ignore_tls_errors": C.BOOL_TRUE},  # FIXME: should not be the default
+self.profile,
+callback = self.fileUploadCb
+)
+G.host.closeUI()
+def onUploadCancel(self, file_chooser):
+G.host.closeUI()
 def _mucJoinCb(self, joined_data):
 joined, room_jid_s, occupants, user_nick, subject, profile = joined_data
 self.host.mucRoomJoinedHandler(*joined_data[1:])
 jid_ = jid.JID(room_jid_s)
 self.changeWidget(jid_)
 def discoEb(failure):
 log.warning(u"Disco failure, ignore this text: {}".format(failure))
 G.host.bridge.discoInfos(jid_.domain, self.profile, callback=discoCb, errback=discoEb)
+def _onDelete(self):
+self.host.removeListener('progressFinished', self.onProgressFinished)
+self.host.removeListener('progressError', self.onProgressError)
+return super(Chat, self).onDelete()
 def onDelete(self, force=False):
 if force==True:
-return super(Chat, self).onDelete()
+return self._onDelete()
 if len(list(G.host.widgets.getWidgets(self.__class__, self.target, profiles=self.profiles))) > 1:
 # we don't keep duplicate widgets
-return super(Chat, self).onDelete()
+return self._onDelete()
 return False
 PLUGIN_INFO["factory"] = Chat.factory
 quick_widgets.register(quick_chat.QuickChat, Chat)

Mercurial > libervia-desktop

comparison src/cagou/plugins/plugin_wid_chat.py @ 78:46d962910801