Merge branch 'upload-error' into 'master'

upload: add user friendly error when upload service not found

See merge request poezio/poezio!12
This commit is contained in:
mathieui 2018-10-13 13:42:48 +02:00
commit 3562bd4fc7

View file

@ -21,6 +21,8 @@ import traceback
from os.path import expanduser from os.path import expanduser
from glob import glob from glob import glob
from slixmpp.plugins.xep_0363.http_upload import UploadServiceNotFound
from poezio.plugin import BasePlugin from poezio.plugin import BasePlugin
from poezio.core.structs import Completion from poezio.core.structs import Completion
from poezio.decorators import command_args_parser from poezio.decorators import command_args_parser
@ -44,6 +46,9 @@ class Plugin(BasePlugin):
async def async_upload(self, filename): async def async_upload(self, filename):
try: try:
url = await self.core.xmpp['xep_0363'].upload_file(filename) url = await self.core.xmpp['xep_0363'].upload_file(filename)
except UploadServiceNotFound:
self.api.information('HTTP Upload service not found.', 'Error')
return
except Exception: except Exception:
exception = traceback.format_exc() exception = traceback.format_exc()
self.api.information('Failed to upload file: %s' % exception, self.api.information('Failed to upload file: %s' % exception,