erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugin upload: fixed inversion of title and message body + better error message on failed upload

Browse source
This commit is contained in:
Goffi 2019-03-20 09:08:47 +01:00
commit 985bc5efb7
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sat/plugins/plugin_misc_upload.py
View file

@ -26,6 +26,7 @@ from sat.core import exceptions
from sat.tools import xml_tools
from twisted.internet import defer
from twisted.words.protocols.jabber import jid
from twisted.words.protocols.jabber import error as jabber_error
import os
import os.path
@ -91,11 +92,16 @@ class UploadPlugin(object):
return {"progress": progress_id}
def uploadEb(fail):
msg = unicode(fail)
if (isinstance(fail.value, jabber_error.StanzaError)
and fail.value.condition == 'not-acceptable'):
reason = fail.value.text
else:
reason = unicode(fail.value)
msg = D_(u"Can't upload file: {reason}").format(reason=reason)
log.warning(msg)
return {
"xmlui": xml_tools.note(
u"Can't upload file", msg, C.XMLUI_DATA_LVL_WARNING
msg, D_(u"Can't upload file"), C.XMLUI_DATA_LVL_WARNING
).toXml()
}