component file sharing: add/parse affiliation when possible

This commit is contained in:
Goffi 2020-07-17 13:00:10 +02:00
commit d7844a98b4

View file

@ -417,7 +417,8 @@ class XEP_0329(object):
size = os.path.getsize(path)
mime_type = mimetypes.guess_type(path, strict=False)[0]
file_elt = self._jf.buildFileElement(
name=name, size=size, mime_type=mime_type, modified=os.path.getmtime(path)
client=client, name=name, size=size, mime_type=mime_type,
modified=os.path.getmtime(path)
)
query_elt.addChild(file_elt)
@ -590,16 +591,32 @@ class XEP_0329(object):
query_elt = iq_result_elt.addElement((NS_FIS, "query"))
query_elt["node"] = node_path
if not self.host.trigger.point(
"XEP-0329_compGetFilesFromNode", client, iq_elt, owner, node_path, files_data
"XEP-0329_compGetFilesFromNode",
client,
iq_elt,
iq_result_elt,
owner,
node_path,
files_data
):
return
for file_data in files_data:
if file_data['type'] == C.FILE_TYPE_DIRECTORY:
directory_elt = query_elt.addElement("directory")
directory_elt['name'] = file_data['name']
self.host.trigger.point(
"XEP-0329_compGetFilesFromNode_build_directory",
client,
file_data,
directory_elt,
owner,
node_path,
)
else:
file_elt = self._jf.buildFileElementFromDict(
file_data, modified=file_data.get("modified", file_data["created"])
client,
file_data,
modified=file_data.get("modified", file_data["created"])
)
query_elt.addChild(file_elt)
client.send(iq_result_elt)
@ -609,7 +626,7 @@ class XEP_0329(object):
client, iq_elt, self._compGetRootNodesCb, self._compGetFilesFromNodeCb
)
def _parseResult(self, iq_elt):
def _parseResult(self, iq_elt, client):
query_elt = next(iq_elt.elements(NS_FIS, "query"))
files = []
@ -617,7 +634,7 @@ class XEP_0329(object):
if elt.name == "file":
# we have a file
try:
file_data = self._jf.parseFileElement(elt)
file_data = self._jf.parseFileElement(client, elt)
except exceptions.DataError:
continue
file_data["type"] = C.FILE_TYPE_FILE
@ -625,6 +642,12 @@ class XEP_0329(object):
# we have a directory
file_data = {"name": elt["name"], "type": C.FILE_TYPE_DIRECTORY}
self.host.trigger.point(
"XEP-0329_parseResult_directory",
client,
elt,
file_data,
)
else:
log.warning(
_(f"unexpected element, ignoring: {elt.toXml()}")
@ -665,7 +688,7 @@ class XEP_0329(object):
if path:
query_elt["node"] = path
d = iq_elt.send()
d.addCallback(self._parseResult)
d.addCallback(self._parseResult, client)
return d
def _localSharesGet(self, profile):