Commit 86aacfc3 authored by Philipp Hörist's avatar Philipp Hörist

Merge branch 'httpupload_max_file_size' into 'gtk3'

[httpupload] Use 'max-file-size' information

See merge request !44
parents 4e3c9841 21f94126
......@@ -72,13 +72,23 @@ class HTTPUploadPlugin(GajimPlugin):
del IQ_CALLBACK[id_]
def handle_agent_info_received(self, event):
if (NS_HTTPUPLOAD in event.features and
if (NS_HTTPUPLOAD not in event.features or not
app.jid_is_transport(event.jid)):
account = event.conn.name
interface = self.get_interface(account)
interface.enabled = True
interface.component = event.jid
interface.update_button_states(True)
return
account = event.conn.name
interface = self.get_interface(account)
interface.enabled = True
interface.component = event.jid
interface.update_button_states(True)
try:
for form in event.data:
tmp = form.getField("max-file-size").getValue()
interface.max_file_size = int(tmp)
except AttributeError:
interface.max_file_size = None
log.warning("%s does not provide maximum file size" % account)
def handle_outgoing_stanza(self, event):
message = event.msg_iq.getTagData('body')
......@@ -183,14 +193,23 @@ class Base(object):
return
invalid_file = False
stat = os.stat(path)
if os.path.isfile(path):
stat = os.stat(path)
if stat[6] == 0:
invalid_file = True
msg = _('File is empty')
else:
invalid_file = True
msg = _('File does not exist')
if self.max_file_size is not None and \
stat.st_size > self.max_file_size:
invalid_file = True
msg = _('File is too large, maximum allowed file size is: %s') % \
GLib.format_size_full(self.max_file_size,
GLib.FormatSizeFlags.IEC_UNITS)
if invalid_file:
ErrorDialog(_('Could not open file'), msg,
transient_for=chat_control.parent_win.window)
......@@ -248,12 +267,24 @@ class Base(object):
IQ_CALLBACK[id_] = lambda stanza: self.received_slot(stanza, file)
app.connections[self.account].connection.send(iq)
@staticmethod
def get_slot_error_message(stanza):
tmp = stanza.getTag('error').getTag('file-too-large')
if tmp is not None:
max_file_size = int(tmp.getTag('max-file-size').getData())
return _('File is too large, maximum allowed file size is: %s') % \
GLib.format_size_full(max_file_size,
GLib.FormatSizeFlags.IEC_UNITS)
return stanza.getErrorMsg()
def received_slot(self, stanza, file):
log.info("Received slot")
if stanza.getType() == 'error':
file.progress.close_dialog()
ErrorDialog(_('Could not request upload slot'),
stanza.getErrorMsg(),
self.get_slot_error_message(stanza),
transient_for=file.control.parent_win.window)
log.error(stanza)
return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment