hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[httpupload] Add File object

Browse Source
This commit is contained in:
Philipp Hörist
2017-02-27 18:50:21 +01:00
parent 2cc6f200db
commit 0faed4c358
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
httpupload/httpupload.py
View File

@@ -179,15 +179,15 @@ class Base(object):
return False return False
def on_file_dialog_ok(self, widget, jid, chat_control): def on_file_dialog_ok(self, widget, jid, chat_control):
path_to_file = widget.get_filename() path = widget.get_filename()
widget.destroy() widget.destroy()
if not path_to_file or not os.path.exists(path_to_file): if not path or not os.path.exists(path):
return return
invalid_file = False invalid_file = False
if os.path.isfile(path_to_file): if os.path.isfile(path):
stat = os.stat(path_to_file) stat = os.stat(path)
if stat[6] == 0: if stat[6] == 0:
invalid_file = True invalid_file = True
msg = _('File is empty') msg = _('File is empty')
@@ -200,20 +200,26 @@ class Base(object):
return return
encrypted = self.encryption_activated(jid) encrypted = self.encryption_activated(jid)
filesize = os.path.getsize(path_to_file) size = os.path.getsize(path)
key, iv = None, None
if encrypted: if encrypted:
filesize += TAGSIZE key = os.urandom(32)
iv = os.urandom(16)
size += TAGSIZE
mime_type = mimetypes.MimeTypes().guess_type(path_to_file)[0] mime = mimetypes.MimeTypes().guess_type(path)[0]
if not mime_type: if not mime:
mime_type = 'application/octet-stream' # fallback mime type mime = 'application/octet-stream' # fallback mime type
log.info("Detected MIME type of file: ", mime_type) log.info("Detected MIME type of file: ", mime)
progress_messages = Queue(8) progress_messages = Queue(8)
progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'),
progress_messages, self.plugin, parent=chat_control.parent_win.window) progress_messages, self.plugin, parent=chat_control.parent_win.window)
self.request_slot(path_to_file, filesize, mime_type, encrypted) file = File(path=path, size=size, mime=mime, encrypted=encrypted,
key=key, iv=iv, control=chat_control,
progress=progress_window)
self.request_slot(file)
def upload_file(stanza): def upload_file(stanza):
slot = stanza.getTag("slot") slot = stanza.getTag("slot")
@@ -342,21 +348,29 @@ class Base(object):
default_response=Gtk.ResponseType.OK, default_response=Gtk.ResponseType.OK,
transient_for=chat_control.parent_win.window) transient_for=chat_control.parent_win.window)
def request_slot(self, path_to_file, filesize, mime_type, encrypted): def request_slot(self, file):
iq = nbxmpp.Iq(typ='get', to=self.component) iq = nbxmpp.Iq(typ='get', to=self.component)
id_ = gajim.get_an_id() id_ = gajim.get_an_id()
iq.setID(id_) iq.setID(id_)
request = iq.setTag(name="request", namespace=NS_HTTPUPLOAD) request = iq.setTag(name="request", namespace=NS_HTTPUPLOAD)
request.addChild('filename', payload=os.path.basename(path_to_file)) request.addChild('filename', payload=os.path.basename(file.path))
request.addChild('size', payload=filesize) request.addChild('size', payload=file.size)
request.addChild('content-type', payload=mime_type) request.addChild('content-type', payload=file.mime)
log.info("Sending request for slot") log.info("Sending request for slot")
IQ_CALLBACK[id_] = \ IQ_CALLBACK[id_] = lambda stanza: self.received_slot(stanza, file)
lambda stanza: self.upload_file(
stanza, path_to_file, filesize, mime_type, encrypted)
self.conn.send(iq) self.conn.send(iq)
class File:
def __init__(self, **kwargs):
for k, v in kwargs.items():
setattr(self, k, v)
self.stream = None
self.put = None
self.get = None
class StreamFileWithProgress: class StreamFileWithProgress:
def __init__(self, path, mode, callback=None, def __init__(self, path, mode, callback=None,
encrypted_upload=False, key=None, iv=None, *args): encrypted_upload=False, key=None, iv=None, *args):