plugin XEP-0096: fix plugin following changes in plugin_misc_file

This commit is contained in:
Goffi 2020-12-11 17:48:19 +01:00
commit 510ab4d5aa

View file

@ -50,6 +50,8 @@ PLUGIN_INFO = {
class XEP_0096(object):
# TODO: call self._f.unregister when unloading order will be managing (i.e. when depenencies will be unloaded at the end)
name = PLUGIN_INFO[C.PI_NAME]
human_name = D_("Stream Initiation")
def __init__(self, host):
log.info(_("Plugin XEP_0096 initialization"))
@ -59,15 +61,16 @@ class XEP_0096(object):
self.host.plugins["XEP-0047"].NAMESPACE,
] # Stream methods managed
self._f = self.host.plugins["FILE"]
self._f.register(
NS_SI_FT, self.sendFile, priority=0, method_name="Stream Initiation"
)
self._f.register(self)
self._si = self.host.plugins["XEP-0095"]
self._si.registerSIProfile(SI_PROFILE_NAME, self._transferRequest)
host.bridge.addMethod(
"siSendFile", ".plugin", in_sign="sssss", out_sign="s", method=self._sendFile
"siSendFile", ".plugin", in_sign="sssss", out_sign="s", method=self._fileSend
)
async def canHandleFileSend(self, client, peer_jid, filepath):
return await self.host.hasFeature(client, NS_SI_FT, peer_jid)
def unload(self):
self._si.unregisterSIProfile(SI_PROFILE_NAME)
@ -279,13 +282,13 @@ class XEP_0096(object):
)
data["stream_object"].close()
def _sendFile(self, peer_jid_s, filepath, name, desc, profile=C.PROF_KEY_NONE):
def _fileSend(self, peer_jid_s, filepath, name, desc, profile=C.PROF_KEY_NONE):
client = self.host.getClient(profile)
return self.sendFile(
return self.fileSend(
client, jid.JID(peer_jid_s), filepath, name or None, desc or None
)
def sendFile(self, client, peer_jid, filepath, name=None, desc=None, extra=None):
def fileSend(self, client, peer_jid, filepath, name=None, desc=None, extra=None):
"""Send a file using XEP-0096
@param peer_jid(jid.JID): recipient