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

[httpupload] Refactor FileChooserDialog

Browse Source
This commit is contained in:
Philipp Hörist
2017-02-26 23:28:53 +01:00
parent b0831d3546
commit d6ed9c4fd3
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
httpupload/httpupload.py
View File

@@ -122,8 +122,6 @@ class HttpuploadPlugin(GajimPlugin):
class Base(object): class Base(object):
def __init__(self, plugin): def __init__(self, plugin):
self.dlg = None
self.dialog_type = 'file'
self.plugin = plugin self.plugin = plugin
self.encrypted_upload = False self.encrypted_upload = False
self.enabled = False self.enabled = False
@@ -183,8 +181,9 @@ class Base(object):
log.info('Encryption is: False / OMEMO not found') log.info('Encryption is: False / OMEMO not found')
return False return False
def on_file_dialog_ok(self, widget, path_to_file=None): def on_file_dialog_ok(self, widget, jid, chat_control):
global jid_to_servers path_to_file = widget.get_filename()
widget.destroy()
try: try:
self.encrypted_upload = self.encryption_activated() self.encrypted_upload = self.encryption_activated()
@@ -192,20 +191,15 @@ class Base(object):
log.debug(e) log.debug(e)
self.encrypted_upload = False self.encrypted_upload = False
if not path_to_file: if not path_to_file or not os.path.exists(path_to_file):
path_to_file = self.dlg.get_filename()
if not path_to_file:
self.dlg.destroy()
return
self.dlg.destroy()
if not os.path.exists(path_to_file):
return return
if self.encrypted_upload: if self.encrypted_upload:
filesize = os.path.getsize(path_to_file) + TAGSIZE # in bytes filesize = os.path.getsize(path_to_file) + TAGSIZE # in bytes
else: else:
filesize = os.path.getsize(path_to_file) filesize = os.path.getsize(path_to_file)
invalid_file = False invalid_file = False
msg = ''
if os.path.isfile(path_to_file): if os.path.isfile(path_to_file):
stat = os.stat(path_to_file) stat = os.stat(path_to_file)
if stat[6] == 0: if stat[6] == 0:
@@ -215,7 +209,8 @@ class Base(object):
invalid_file = True invalid_file = True
msg = _('File does not exist') msg = _('File does not exist')
if invalid_file: if invalid_file:
ErrorDialog(_('Could not open file'), msg, transient_for=self.chat_control.parent_win.window) ErrorDialog(_('Could not open file'), msg,
transient_for=chat_control.parent_win.window)
return return
mime_type = mimetypes.MimeTypes().guess_type(path_to_file)[0] mime_type = mimetypes.MimeTypes().guess_type(path_to_file)[0]
@@ -225,6 +220,7 @@ class Base(object):
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=self.chat_control.parent_win.window) progress_messages, self.plugin, parent=self.chat_control.parent_win.window)
def upload_file(stanza): def upload_file(stanza):
slot = stanza.getTag("slot") slot = stanza.getTag("slot")
if not slot: if not slot:
@@ -372,13 +368,15 @@ class Base(object):
self.chat_control.msg_textview.grab_focus() self.chat_control.msg_textview.grab_focus()
def on_file_button_clicked(self, widget, jid, chat_control): def on_file_button_clicked(self, widget, jid, chat_control):
self.dialog_type = 'file' FileChooserDialog(
self.dlg = FileChooserDialog(on_response_ok=self.on_file_dialog_ok, on_response_cancel=None, on_response_ok=lambda widget: self.on_file_dialog_ok(widget, jid,
title_text = _('Choose file to send'), action = Gtk.FileChooserAction.OPEN, chat_control),
buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK), title_text=_('Choose file to send'),
default_response = Gtk.ResponseType.OK,) action=Gtk.FileChooserAction.OPEN,
self.dlg.set_transient_for(self.chat_control.parent_win.window) buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
Gtk.STOCK_OPEN, Gtk.ResponseType.OK),
default_response=Gtk.ResponseType.OK,
transient_for=chat_control.parent_win.window)
class StreamFileWithProgress: class StreamFileWithProgress:
def __init__(self, path, mode, callback=None, def __init__(self, path, mode, callback=None,