Commits August 2017

commits@gajim.org

1 participants
94 discussions

[Git][gajim/gajim][master] 2 commits: Correctly destroy all windows on quit()
by Philipp Hörist 10 Aug '17

10 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: a25a38ed by Philipp Hörist at 2017-08-10T11:04:21+02:00 Correctly destroy all windows on quit() Not all Dialogs have a window instance, some inherit Gtk.Window - - - - - 5a7a6766 by Philipp Hörist at 2017-08-10T11:07:57+02:00 Fix rare bug in scroll_to_end() - - - - - 2 changed files: - gajim/gtkgui_helpers.py - gajim/roster_window.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -334,6 +334,10 @@ def scroll_to_end(widget): bool: The return value is False so it can be used with GLib.idle_add. """ adj_v = widget.get_vadjustment() + if adj_v is None: + # This can happen when the Widget is already destroyed when called + # from GLib.idle_add + return False max_scroll_pos = adj_v.get_upper() - adj_v.get_page_size() adj_v.set_value(max_scroll_pos) ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2395,7 +2395,10 @@ class RosterWindow: if isinstance(w, dict): self.close_all_from_dict(w) else: - w.window.destroy() + try: + w.window.destroy() + except AttributeError: + w.destroy() def close_all(self, account, force=False): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/174e88024dcee6ea7a225c9fb62ce824c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/174e88024dcee6ea7a225c9fb62ce824c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Remove old XML Console
by Philipp Hörist 10 Aug '17

10 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: e6f1d294 by Philipp Hörist at 2017-08-10T02:13:20+02:00 Remove old XML Console - - - - - 512e6d2c by Philipp Hörist at 2017-08-10T02:13:20+02:00 Redesign XML Console - Use modern GTK Widgets (HeaderBar, ActionBar, Switch) - Add an option to filter Stream Management stanzas - Add a generic Option Dialog that we can reuse later - - - - - 174e8802 by Philipp Hörist at 2017-08-10T10:57:17+02:00 Merge branch 'xmlconsole' into 'master' Redesign XML Console See merge request !115 - - - - - 3 changed files: - data/style/gajim.css - gajim/app_actions.py - gajim/dialogs.py Changes: ===================================== data/style/gajim.css ===================================== --- a/data/style/gajim.css +++ b/data/style/gajim.css @@ -29,3 +29,14 @@ popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } #ServerInfoGrid > list > row { padding: 10px 20px 10px 10px; } #ServerInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } #ServerInfoGrid > list > row.activatable:active { box-shadow: none; } + +/* Generic Options Dialog */ +#OptionsDialog list > row { border-bottom: 1px solid; border-color: @theme_unfocused_bg_color; } +#OptionsDialog list > row:last-child { border-bottom: 0px} +#OptionsDialog list > row { padding: 10px; } +#OptionsDialog list > row.activatable:active { box-shadow: none; } + +/* Generic Popover Menu with Buttons */ +.PopoverButtonListbox { margin-top: 10px; margin-bottom: 10px; } +.PopoverButtonListbox > row { padding: 10px 20px 10px 20px; } +.PopoverButtonListbox row.activatable:active { box-shadow: none; background-color: @theme_selected_bg_color } ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -175,7 +175,7 @@ class AppActions(): def on_xml_console(self, action, param): account = param.get_string() if 'xml_console' in gajim.interface.instances[account]: - gajim.interface.instances[account]['xml_console'].window.present() + gajim.interface.instances[account]['xml_console'].present() else: gajim.interface.instances[account]['xml_console'] = \ dialogs.XMLConsoleWindow(account) ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3347,102 +3347,266 @@ class SingleMessageWindow: self.save_pos() self.window.destroy() -class XMLConsoleWindow: + +class XMLConsoleWindow(Gtk.Window): def __init__(self, account): + Gtk.Window.__init__(self) self.account = account + self.set_default_size(600, 600) + self.connect("destroy", self.on_destroy) - self.xml = gtkgui_helpers.get_gtk_builder('xml_console_window.ui') - self.window = self.xml.get_object('xml_console_window') - self.input_textview = self.xml.get_object('input_textview') - self.stanzas_log_textview = self.xml.get_object('stanzas_log_textview') - self.input_tv_buffer = self.input_textview.get_buffer() - self.parent = self.stanzas_log_textview.get_parent() - buffer_ = self.stanzas_log_textview.get_buffer() - - self.tagIn = buffer_.create_tag('incoming') - color = gajim.config.get('inmsgcolor') - self.tagIn.set_property('foreground', color) - self.tagInPresence = buffer_.create_tag('incoming_presence') - self.tagInPresence.set_property('foreground', color) - self.tagInMessage = buffer_.create_tag('incoming_message') - self.tagInMessage.set_property('foreground', color) - self.tagInIq = buffer_.create_tag('incoming_iq') - self.tagInIq.set_property('foreground', color) - - self.tagOut = buffer_.create_tag('outgoing') - color = gajim.config.get('outmsgcolor') - self.tagOut.set_property('foreground', color) - self.tagOutPresence = buffer_.create_tag('outgoing_presence') - self.tagOutPresence.set_property('foreground', color) - self.tagOutMessage = buffer_.create_tag('outgoing_message') - self.tagOutMessage.set_property('foreground', color) - self.tagOutIq = buffer_.create_tag('outgoing_iq') - self.tagOutIq.set_property('foreground', color) - buffer_.create_tag('') # Default tag + headerbar = Gtk.HeaderBar() + headerbar.set_title(_('XML Console')) + headerbar.set_show_close_button(True) + self.set_titlebar(headerbar) - self.enabled = True - self.xml.get_object('enable_checkbutton').set_active(True) + switch = Gtk.Switch() + switch.set_active(True) + switch.connect("notify::active", self.on_enable) + headerbar.pack_start(switch) - if len(gajim.connections) > 1: - title = _('XML Console for %s') % self.account - else: - title = _('XML Console') + headerbar.set_decoration_layout(':minimize,close') + + self.enabled = True + self.presence = True + self.message = True + self.iq = True + self.stream = True + self.incoming = True + self.outgoing = True + + self.textview = Gtk.TextView() + self.textview.set_size_request(-1, 400) + self.textview.set_editable(False) + self.textview.set_cursor_visible(False) + self.textview.set_hexpand(True) + + self.scrolled = Gtk.ScrolledWindow() + self.scrolled.add(self.textview) + + self.input = Gtk.TextView() + self.input.show() + self.input.set_vexpand(True) + + self.scrolled_input = Gtk.ScrolledWindow() + self.scrolled_input.set_size_request(-1, 150) + self.scrolled_input.add(self.input) + self.scrolled_input.set_no_show_all(True) + + self.paned = Gtk.VPaned() + self.paned.set_vexpand(True) + self.paned.pack1(self.scrolled, True, False) + self.paned.pack2(self.scrolled_input, False, False) + self.paned.set_position(self.paned.get_property('max-position')) + + self.actionbar = Gtk.ActionBar() + + icon = gtkgui_helpers.get_icon_pixmap('edit-clear-all-symbolic') + image = Gtk.Image() + image.set_from_pixbuf(icon) + button = Gtk.Button() + button.set_tooltip_text(_('Clear')) + button.connect('clicked', self.on_clear) + button.set_image(image) + self.actionbar.pack_start(button) + + icon = gtkgui_helpers.get_icon_pixmap('applications-system-symbolic') + image = Gtk.Image() + image.set_from_pixbuf(icon) + button = Gtk.Button() + button.set_tooltip_text(_('Filter')) + button.connect('clicked', self.on_filter_options) + button.set_image(image) + self.actionbar.pack_start(button) + + icon = gtkgui_helpers.get_icon_pixmap('document-edit-symbolic') + image = Gtk.Image() + image.set_from_pixbuf(icon) + button = Gtk.ToggleButton() + button.set_tooltip_text(_('XML Input')) + button.set_active(False) + button.connect('toggled', self.on_input) + button.set_image(image) + self.actionbar.pack_start(button) + + icon = gtkgui_helpers.get_icon_pixmap('emblem-ok-symbolic') + image = Gtk.Image() + image.set_from_pixbuf(icon) + button = Gtk.Button() + button.set_tooltip_text(_('Send')) + button.connect('clicked', self.on_send) + button.set_image(image) + self.actionbar.pack_end(button) + + listbox = Gtk.ListBox() + context = listbox.get_style_context() + context.add_class('PopoverButtonListbox') + + label = Gtk.Label(label='Message') + listbox.add(label) + + label = Gtk.Label(label='Presence') + listbox.add(label) + + label = Gtk.Label(label='Iq') + listbox.add(label) + listbox.show_all() + listbox.set_selection_mode(Gtk.SelectionMode.NONE) + listbox.connect('row-activated', self.on_row_activated) + + popover = Gtk.Popover() + popover.add(listbox) + + self.menubutton = Gtk.MenuButton() + self.menubutton.set_direction(Gtk.ArrowType.UP) + self.menubutton.set_popover(popover) + self.menubutton.set_tooltip_text(_('Presets')) + self.menubutton.set_no_show_all(True) + + self.actionbar.pack_start(self.menubutton) + + box = Gtk.Box.new(Gtk.Orientation.VERTICAL, 0) + box.add(self.paned) + box.add(self.actionbar) + + self.add(box) + + self.connect('key_press_event', self.on_key_press_event) + + self.create_tags() + self.show_all() - self.window.set_title(title) - self.window.show_all() gajim.ged.register_event_handler('stanza-received', ged.GUI1, self._nec_stanza_received) gajim.ged.register_event_handler('stanza-sent', ged.GUI1, self._nec_stanza_sent) - self.xml.connect_signals(self) + def create_tags(self): + buffer_ = self.textview.get_buffer() + in_color = gajim.config.get('inmsgcolor') + out_color = gajim.config.get('outmsgcolor') + + tags = ['presence', 'message', 'stream', 'iq'] + + tag = buffer_.create_tag('incoming') + tag.set_property('foreground', in_color) + tag = buffer_.create_tag('outgoing') + tag.set_property('foreground', out_color) + + for tag_name in tags: + buffer_.create_tag(tag_name) def on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: - self.window.destroy() + self.destroy() - def on_xml_console_window_destroy(self, widget): + def on_row_activated(self, listbox, row): + text = row.get_child().get_text() + input_text = None + if text == 'Presence': + input_text = ( + '<presence>\n' + '<show></show>\n' + '<status></status>\n' + '<priority></priority>\n' + '</presence>') + elif text == 'Message': + input_text = ( + '<message to="" type="">\n' + '<body></body>\n' + '</message>') + elif text == 'Iq': + input_text = ( + '<iq to="" type="">\n' + '<query xmlns=""></query>\n' + '</iq>') + + if input_text is not None: + buffer_ = self.input.get_buffer() + buffer_.set_text(input_text) + self.input.grab_focus() + + def on_send(self, *args): + if gajim.connections[self.account].connected <= 1: + # if offline or connecting + ErrorDialog(_('Connection not available'), + _('Please make sure you are connected with "%s".') % \ + self.account) + return + buffer_ = self.input.get_buffer() + begin_iter, end_iter = buffer_.get_bounds() + stanza = buffer_.get_text(begin_iter, end_iter, True) + if stanza: + gajim.connections[self.account].send_stanza(stanza) + buffer_.set_text('') + + def on_input(self, button, *args): + if button.get_active(): + self.paned.get_child2().show() + self.menubutton.show() + self.input.grab_focus() + else: + self.paned.get_child2().hide() + self.menubutton.hide() + + def on_filter_options(self, *args): + options = [ + SwitchOption('Presence', self.presence, + self.on_option, + 'presence'), + SwitchOption('Message', self.message, + self.on_option, + 'message'), + SwitchOption('Iq', self.iq, + self.on_option, + 'iq'), + SwitchOption('Stream\nManagement', self.stream, + self.on_option, + 'stream'), + SwitchOption('In', self.incoming, + self.on_option, + 'incoming'), + SwitchOption('Out', self.outgoing, + self.on_option, + 'outgoing')] + + OptionsDialog(self, 'Filter', options) + + def on_clear(self, *args): + buffer_ = self.textview.get_buffer().set_text('') + + def on_destroy(self, *args): del gajim.interface.instances[self.account]['xml_console'] gajim.ged.remove_event_handler('stanza-received', ged.GUI1, self._nec_stanza_received) gajim.ged.remove_event_handler('stanza-sent', ged.GUI1, self._nec_stanza_sent) - def on_clear_button_clicked(self, widget): - buffer_ = self.stanzas_log_textview.get_buffer() - buffer_.set_text('') - - def on_enable_checkbutton_toggled(self, widget): - self.enabled = widget.get_active() - - def on_in_stanza_checkbutton_toggled(self, widget): - active = widget.get_active() - self.tagIn.set_property('invisible', active) - self.tagInPresence.set_property('invisible', active) - self.tagInMessage.set_property('invisible', active) - self.tagInIq.set_property('invisible', active) - - def on_presence_stanza_checkbutton_toggled(self, widget): - active = widget.get_active() - self.tagInPresence.set_property('invisible', active) - self.tagOutPresence.set_property('invisible', active) - - def on_out_stanza_checkbutton_toggled(self, widget): - active = widget.get_active() - self.tagOut.set_property('invisible', active) - self.tagOutPresence.set_property('invisible', active) - self.tagOutMessage.set_property('invisible', active) - self.tagOutIq.set_property('invisible', active) + def on_enable(self, switch, param): + self.enabled = switch.get_active() + + def on_option(self, switch, param, *user_data): + kind = user_data[0] + setattr(self, kind, switch.get_active()) + value = not switch.get_active() + table = self.textview.get_buffer().get_tag_table() + tag = table.lookup(kind) + if kind in ('incoming', 'outgoing'): + if value: + tag.set_priority(table.get_size() - 1) + else: + tag.set_priority(0) + tag.set_property('invisible', value) - def on_message_stanza_checkbutton_toggled(self, widget): - active = widget.get_active() - self.tagInMessage.set_property('invisible', active) - self.tagOutMessage.set_property('invisible', active) + def _nec_stanza_received(self, obj): + if obj.conn.name != self.account: + return + self.print_stanza(obj.stanza_str, 'incoming') - def on_iq_stanza_checkbutton_toggled(self, widget): - active = widget.get_active() - self.tagInIq.set_property('invisible', active) - self.tagOutIq.set_property('invisible', active) + def _nec_stanza_sent(self, obj): + if obj.conn.name != self.account: + return + self.print_stanza(obj.stanza_str, 'outgoing') def print_stanza(self, stanza, kind): # kind must be 'incoming' or 'outgoing' @@ -3451,76 +3615,80 @@ class XMLConsoleWindow: if not stanza: return - at_the_end = gtkgui_helpers.at_the_end(self.parent) + at_the_end = gtkgui_helpers.at_the_end(self.scrolled) - buffer = self.stanzas_log_textview.get_buffer() - end_iter = buffer.get_end_iter() + buffer_ = self.textview.get_buffer() + end_iter = buffer_.get_end_iter() - type_ = '' - if stanza[1:9] == 'presence': + type_ = kind + if stanza.startswith('<presence'): type_ = 'presence' - elif stanza[1:8] == 'message': + elif stanza.startswith('<message'): type_ = 'message' - elif stanza[1:3] == 'iq': + elif stanza.startswith('<iq'): type_ = 'iq' + elif stanza.startswith('<r') or stanza.startswith('<a'): + type_ = 'stream' + + stanza = '\n{stanza}\n\n'.format( + kind=kind.capitalize(), + time=time.strftime('%c'), + stanza=stanza.replace('><', '>\n<')) + buffer_.insert_with_tags_by_name(end_iter, stanza, type_, kind) - if type_: - type_ = kind + '_' + type_ - else: - type_ = kind # 'incoming' or 'outgoing' - - if kind == 'incoming': - buffer.insert_with_tags_by_name(end_iter, '\n' % \ - time.strftime('%c'), type_) - elif kind == 'outgoing': - buffer.insert_with_tags_by_name(end_iter, '\n' % \ - time.strftime('%c'), type_) - end_iter = buffer.get_end_iter() - buffer.insert_with_tags_by_name(end_iter, stanza.replace('><', '>\n<') \ - + '\n\n', type_) if at_the_end: - GLib.idle_add(gtkgui_helpers.scroll_to_end, self.parent) + GLib.idle_add(gtkgui_helpers.scroll_to_end, self.scrolled) - def _nec_stanza_received(self, obj): - if obj.conn.name != self.account: - return - self.print_stanza(obj.stanza_str, 'incoming') - def _nec_stanza_sent(self, obj): - if obj.conn.name != self.account: - return - self.print_stanza(obj.stanza_str, 'outgoing') +class OptionsDialog(Gtk.Dialog): + def __init__(self, parent, title, options): + Gtk.Dialog.__init__(self, title, parent, + Gtk.DialogFlags.DESTROY_WITH_PARENT) + self.set_name('OptionsDialog') + self.set_resizable(False) + self.set_default_size(250, -1) - def on_send_button_clicked(self, widget): - if gajim.connections[self.account].connected <= 1: - # if offline or connecting - ErrorDialog(_('Connection not available'), - _('Please make sure you are connected with "%s".') % \ - self.account) - return - begin_iter, end_iter = self.input_tv_buffer.get_bounds() - stanza = self.input_tv_buffer.get_text(begin_iter, end_iter, True) - if stanza: - gajim.connections[self.account].send_stanza(stanza) - self.input_tv_buffer.set_text('') # we sent ok, clear the textview + self.remove(self.get_content_area()) - def on_presence_button_clicked(self, widget): - self.input_tv_buffer.set_text( - '<presence><show></show><status></status><priority></priority>' - '</presence>') + listbox = Gtk.ListBox() + listbox.set_hexpand(True) + listbox.set_selection_mode(Gtk.SelectionMode.NONE) - def on_iq_button_clicked(self, widget): - self.input_tv_buffer.set_text( - '<iq to="" type=""><query xmlns=""></query></iq>') + for option in options: + listbox.add(option) - def on_message_button_clicked(self, widget): - self.input_tv_buffer.set_text( - '<message to="" type=""><body></body></message>') + self.add(listbox) + + self.show_all() + listbox.connect('row-activated', self.on_row_activated) + + def on_row_activated(self, listbox, row): + row.get_child().set_switch_state() + + +class SwitchOption(Gtk.Grid): + def __init__(self, label, state, callback, *user_data): + Gtk.Grid.__init__(self) + self.set_column_spacing(6) + + label = Gtk.Label(label=label) + label.set_hexpand(True) + label.set_halign(Gtk.Align.START) + + self.switch = Gtk.Switch() + self.switch.set_active(state) + self.switch.connect("notify::active", callback, *user_data) + self.switch.set_hexpand(True) + self.switch.set_halign(Gtk.Align.END) + + self.add(label) + self.add(self.switch) + self.show_all() - def on_expander_activate(self, widget): - if not widget.get_expanded(): # it's the opposite! - # it's expanded!! - self.input_textview.grab_focus() + def set_switch_state(self): + state = self.switch.get_active() + self.switch.set_active(not state) + #Action that can be done with an incoming list of contacts TRANSLATED_ACTION = {'add': _('add'), 'modify': _('modify'), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fc4bc7eabb3e4091fa96e01190adcad7d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fc4bc7eabb3e4091fa96e01190adcad7d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] run tests with pyopenssl
by Yann Leboulanger 09 Aug '17

09 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: fc4bc7ea by Yann Leboulanger at 2017-08-09T22:28:43+02:00 run tests with pyopenssl - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config $(apt-cache depends gajim-default-nightly | grep Depends | sed "s/.*ends:\ //" | tr '\n' ' ') + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl $(apt-cache depends gajim-default-nightly | grep Depends | sed "s/.*ends:\ //" | tr '\n' ' ') - sudo apt-get build-dep -y -qq gajim-default-nightly stages: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fc4bc7eabb3e4091fa96e01190adcad7db… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/fc4bc7eabb3e4091fa96e01190adcad7db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] run tests with pyopenssl
by Yann Leboulanger 09 Aug '17

09 Aug '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 6ff534b0 by Yann Leboulanger at 2017-08-09T22:27:36+02:00 run tests with pyopenssl - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config libglib2.0-dev $(apt-cache depends gajim-nightly | grep Depends | sed "s/.*ends:\ //" | tr '\n' ' ') + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config libglib2.0-dev python-openssl $(apt-cache depends gajim-nightly | grep Depends | sed "s/.*ends:\ //" | tr '\n' ' ') - sudo apt-get build-dep -y -qq gajim-nightly stages: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6ff534b061f8c85444715d7a4910f2fb05… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6ff534b061f8c85444715d7a4910f2fb05… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Fix running tests
by Yann Leboulanger 09 Aug '17

09 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: b5c3b15c by Yann Leboulanger at 2017-08-09T21:05:45+02:00 Fix running tests - - - - - 9ec14d35 by Yann Leboulanger at 2017-08-09T22:04:47+02:00 add .gitlab-ci.yml - - - - - 44a29e7a by Yann Leboulanger at 2017-08-09T22:09:01+02:00 make tests run without gui - - - - - c66669cc by Yann Leboulanger at 2017-08-09T22:21:48+02:00 clean download folder - - - - - fa993335 by Yann Leboulanger at 2017-08-09T22:24:36+02:00 Merge branch 'master' into 'master' run tests in gitlab-ci on every commits See merge request !114 - - - - - 10 changed files: - + .gitlab-ci.yml - Makefile.am - gajim/gajim.py - test/integration/test_resolver.py - test/integration/test_roster.py - test/lib/__init__.py - test/lib/gajim_mocks.py - test/runtests.py - test/unit/test_gui_interface.py - test/unit/test_sessions.py Changes: ===================================== .gitlab-ci.yml ===================================== --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,42 @@ +before_script: + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config $(apt-cache depends gajim-default-nightly | grep Depends | sed "s/.*ends:\ //" | tr '\n' ' ') + - sudo apt-get build-dep -y -qq gajim-default-nightly + +stages: + - test + - build + +run-test: + stage: test + script: + - ./autogen.sh + - make test_nogui + +run-build: + stage: build + script: + - ./autogen.sh + - make dist + - export FN="gajim-default-"$(date +%F)".tar" + - mv gajim-*.tar.gz $FN.gz + - mkdir tmp_add_plugins + - mv $FN.gz tmp_add_plugins/ + - cd tmp_add_plugins/ + - tar xzf $FN.gz + - rm $FN.gz + - export GF=$(find . -maxdepth 1 -type d -name 'gajim-*') + - cd $GF/plugins/ + - curl -O https://ftp.gajim.org/plugins_1/plugin_installer.zip + - unzip plugin_installer.zip + - rm plugin_installer.zip + - cd ../.. + - tar czf ../$FN.gz gajim-* + - cd .. + - rm -rf tmp_add_plugins + - scp $FN.gz panoramix:/var/www/gajim/downloads/snap/ci/gajim-default-$CI_COMMIT_SHA.tar.gz + + artifacts: + name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" + expire_in: 1 week + paths: + - gajim-default-2???-??-??.tar.gz ===================================== Makefile.am ===================================== --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,10 @@ test: ${PYTHON} test/runtests.py .PHONY: test +test_nogui: + ${PYTHON} test/runtests.py -n +.PHONY: test_nogui + doc: epydoc --config=doc/epydoc.conf .PHONY: doc ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -105,7 +105,8 @@ class GajimApplication(Gtk.Application): self.rng_seed = None GLib.set_prgname('gajim') - GLib.set_application_name('Gajim') + if GLib.get_application_name() != 'Gajim': + GLib.set_application_name('Gajim') def do_startup(self): Gtk.Application.do_startup(self) @@ -400,5 +401,6 @@ class GajimApplication(Gtk.Application): self.lookup_action(account + action_name).set_enabled(True) -app = GajimApplication() -app.run(sys.argv) +if __name__ == '__main__': + app = GajimApplication() + app.run(sys.argv) ===================================== test/integration/test_resolver.py ===================================== --- a/test/integration/test_resolver.py +++ b/test/integration/test_resolver.py @@ -5,6 +5,8 @@ import time import lib lib.setup_env() +from gi.repository import GLib + from common import resolver from mock import Mock, expectParams @@ -28,41 +30,38 @@ class TestResolver(unittest.TestCase): def setUp(self): self.idlequeue_thread = IdleQueueThread() self.idlequeue_thread.start() + self.main_context = GLib.MainContext() + self.main_context.push_thread_default() + self.main_loop = GLib.MainLoop(self.main_context) self.iq = self.idlequeue_thread.iq self._reset() self.resolver = None def tearDown(self): + self.main_context.pop_thread_default() self.idlequeue_thread.stop_thread() self.idlequeue_thread.join() def _reset(self): - self.flag = False self.expect_results = False - self.nslookup = False self.resolver = None - def testLibAsyncNSResolver(self): + def testGioResolver(self): self._reset() - if not resolver.USE_LIBASYNCNS: - print('testLibAsyncResolver: libasyncns-python not installed') - return - self.resolver = resolver.LibAsyncNSResolver() + self.resolver = resolver.GioResolver() - for name, type, expect_results in TEST_LIST: + for name, type_, expect_results in TEST_LIST: self.expect_results = expect_results - self._runLANSR(name, type) - self.flag = False + self._runGR(name, type_) - def _runLANSR(self, name, type): + def _runGR(self, name, type_): self.resolver.resolve( host = name, - type = type, + type_ = type_, on_ready = self._myonready) - while not self.flag: - time.sleep(1) - self.resolver.process() + + self.main_loop.run() def _myonready(self, name, result_set): if __name__ == '__main__': @@ -73,28 +72,11 @@ class TestResolver(unittest.TestCase): pprint('res.resolved_hosts: %s' % self.resolver.resolved_hosts) pprint('') if self.expect_results: - self.assert_(len(result_set) > 0) + self.assertTrue(len(result_set) > 0) else: - self.assert_(result_set == []) - self.flag = True - if self.nslookup: - self._testNSLR() + self.assertTrue(result_set == []) + self.main_loop.quit() - def testNSLookupResolver(self): - self._reset() - self.nslookup = True - self.resolver = resolver.NSLookupResolver(self.iq) - self.test_list = TEST_LIST - self._testNSLR() - - def _testNSLR(self): - if self.test_list == []: - return - name, type, self.expect_results = self.test_list.pop() - self.resolver.resolve( - host = name, - type = type, - on_ready = self._myonready) if __name__ == '__main__': unittest.main() ===================================== test/integration/test_roster.py ===================================== --- a/test/integration/test_roster.py +++ b/test/integration/test_roster.py @@ -20,16 +20,16 @@ class TestRosterWindow(unittest.TestCase): def setUp(self): gajim.interface = MockInterface() - self.C_NAME = roster_window.C_NAME - self.C_TYPE = roster_window.C_TYPE - self.C_JID = roster_window.C_JID - self.C_ACCOUNT = roster_window.C_ACCOUNT + self.C_NAME = roster_window.Column.NAME + self.C_TYPE = roster_window.Column.TYPE + self.C_JID = roster_window.Column.JID + self.C_ACCOUNT = roster_window.Column.ACCOUNT # Add after creating RosterWindow # We want to test the filling explicitly gajim.contacts = contacts_module.LegacyContactsAPI() gajim.connections = {} - self.roster = roster_window.RosterWindow() + self.roster = roster_window.RosterWindow(gajim.app) for acc in contacts: gajim.connections[acc] = MockConnection(acc) ===================================== test/lib/__init__.py ===================================== --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -50,3 +50,5 @@ def setup_env(): if use_x: import gtkgui_helpers gtkgui_helpers.GUI_DIR = gajim_root + '/data/gui' + from gajim import GajimApplication + gajim.app = GajimApplication() ===================================== test/lib/gajim_mocks.py ===================================== --- a/test/lib/gajim_mocks.py +++ b/test/lib/gajim_mocks.py @@ -107,6 +107,8 @@ class MockInterface(Mock): self.msg_win_mgr = Mock() self.roster = Mock() gajim.ged = ged.GlobalEventsDispatcher() + import plugins + gajim.plugin_manager = plugins.PluginManager() self.remote_ctrl = None self.instances = {} @@ -126,7 +128,8 @@ class MockInterface(Mock): class MockLogger(Mock): def __init__(self): - Mock.__init__(self, {'write': None, 'get_transports_type': {}}) + Mock.__init__(self, {'insert_into_logs': None, + 'get_transports_type': {}}) self.cur = Mock() ===================================== test/runtests.py ===================================== --- a/test/runtests.py +++ b/test/runtests.py @@ -39,7 +39,6 @@ modules = ( 'unit.test_protocol_caps', 'unit.test_caps_cache', 'unit.test_contacts', 'unit.test_account', - 'unit.test_gui_interface', ) if use_x: @@ -47,6 +46,7 @@ if use_x: #'integration.test_gui_event_integration', 'integration.test_roster', 'integration.test_resolver', + 'unit.test_gui_interface', ) nb_errors = 0 ===================================== test/unit/test_gui_interface.py ===================================== --- a/test/unit/test_gui_interface.py +++ b/test/unit/test_gui_interface.py @@ -20,8 +20,7 @@ class TestInterface(unittest.TestCase): def test_instantiation(self): ''' Test that we can proper initialize and do not fail on globals ''' - interface = Interface() - interface.run() + gajim.app.run() def test_links_regexp_entire(self): sut = Interface() ===================================== test/unit/test_sessions.py ===================================== --- a/test/unit/test_sessions.py +++ b/test/unit/test_sessions.py @@ -153,7 +153,7 @@ class TestChatControlSession(unittest.TestCase): sess = self.conn.sessions[jid]['123'] # message was logged - calls = gajim.logger.mockGetNamedCalls('write') + calls = gajim.logger.mockGetNamedCalls('insert_into_logs') self.assertEqual(1, len(calls)) # no ChatControl was open and autopopup was off @@ -171,7 +171,7 @@ class TestChatControlSession(unittest.TestCase): jid = 'bct(a)necronomicorp.com' fjid = 'bct(a)necronomicorp.com/Gajim' msgtxt = 'testing two' - roster = RosterWindow() + roster = RosterWindow(gajim.app) sess = self.conn.sessions[jid]['123'] sess.control = MockChatControl(fjid, account_name) @@ -179,7 +179,7 @@ class TestChatControlSession(unittest.TestCase): self.receive_chat_msg(fjid, msgtxt) # message was logged - calls = gajim.logger.mockGetNamedCalls('write') + calls = gajim.logger.mockGetNamedCalls('insert_into_logs') self.assertEqual(2, len(calls)) # the message does not go into the event queue @@ -207,7 +207,7 @@ class TestChatControlSession(unittest.TestCase): #self.receive_chat_msg(fjid, msgtxt) ## message was logged - #calls = gajim.logger.mockGetNamedCalls('write') + #calls = gajim.logger.mockGetNamedCalls('insert_into_logs') #self.assertEqual(1, len(calls)) ## the message does not go into the event queue View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c57af6dade707439d6c87ddbf1502b89c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c57af6dade707439d6c87ddbf1502b89c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] clean download folder
by Yann Leboulanger 09 Aug '17

09 Aug '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: ea8d7a54 by Yann Leboulanger at 2017-08-09T22:21:05+02:00 clean download folder - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ run-build: - tar czf ../$FN.gz gajim-* - cd .. - rm -rf tmp_add_plugins - - scp $FN.gz panoramix:/var/www/gajim/downloads/snap/gajim-$CI_COMMIT_SHA.tar.gz + - scp $FN.gz panoramix:/var/www/gajim/downloads/snap/ci/gajim-$CI_COMMIT_SHA.tar.gz artifacts: name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ea8d7a545ef174481756667013e2ceae68… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ea8d7a545ef174481756667013e2ceae68… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] ability to run tests without gui
by Yann Leboulanger 09 Aug '17

09 Aug '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 0a28e0f0 by Yann Leboulanger at 2017-08-09T21:54:48+02:00 ability to run tests without gui - - - - - 6 changed files: - .gitlab-ci.yml - Makefile.am - src/common/connection_handlers_events.py - src/gtkgui_helpers.py - src/notify.py - test/runtests.py Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,8 @@ stages: run-test: stage: test script: - - make test + - ./autogen.sh + - make test_nogui run-build: stage: build ===================================== Makefile.am ===================================== --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,10 @@ test: python test/runtests.py .PHONY: test +test_nogui: + python test/runtests.py -n +.PHONY: test_nogui + doc: epydoc --config=doc/epydoc.conf .PHONY: doc ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -41,8 +41,6 @@ from nbxmpp.protocol import NS_CHATSTATES from common.jingle_transport import JingleTransportSocks5 from common.file_props import FilesProp -import gtkgui_helpers - if gajim.HAVE_PYOPENSSL: import OpenSSL.crypto @@ -2484,8 +2482,6 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.popup_title = _('New Message from %(nickname)s') % \ {'nickname': nick} - self.popup_image = gtkgui_helpers.get_icon_path(self.popup_image, 48) - if not gajim.config.get('notify_on_new_message') or \ not self.first_unread: self.do_popup = False @@ -2541,6 +2537,29 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.do_popup = False + def get_path_to_generic_or_avatar(generic, jid=None, suffix=None): + """ + Choose between avatar image and default image + + Returns full path to the avatar image if it exists, otherwise returns + full path to the image. generic must be with extension and suffix + without + """ + if jid: + # we want an avatar + puny_jid = helpers.sanitize_filename(jid) + path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid) + suffix + path_to_local_file = path_to_file + '_local' + for extension in ('.png', '.jpeg'): + path_to_local_file_full = path_to_local_file + extension + if os.path.exists(path_to_local_file_full): + return path_to_local_file_full + for extension in ('.png', '.jpeg'): + path_to_file_full = path_to_file + extension + if os.path.exists(path_to_file_full): + return path_to_file_full + return os.path.abspath(generic) + def handle_incoming_pres_event(self, pres_obj): if gajim.jid_is_transport(pres_obj.jid): return True @@ -2619,8 +2638,8 @@ class NotificationEvent(nec.NetworkIncomingEvent): iconset = gajim.config.get('iconset') img_path = os.path.join(helpers.get_iconset_path(iconset), '48x48', show_image) - self.popup_image = gtkgui_helpers.get_path_to_generic_or_avatar( - img_path, jid=self.jid, suffix=suffix) + self.popup_image_path = self.get_path_to_generic_or_avatar(img_path, + jid=self.jid, suffix=suffix) self.popup_timeout = gajim.config.get('notification_timeout') @@ -2666,6 +2685,7 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.popup_event_type = '' self.popup_msg_type = '' self.popup_image = '' + self.popup_image_path = '' self.popup_timeout = -1 self.do_command = False ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -642,28 +642,6 @@ def make_pixbuf_grayscale(pixbuf): pixbuf.saturate_and_pixelate(pixbuf2, 0.0, False) return pixbuf2 -def get_path_to_generic_or_avatar(generic, jid = None, suffix = None): - """ - Choose between avatar image and default image - - Returns full path to the avatar image if it exists, otherwise returns full - path to the image. generic must be with extension and suffix without - """ - if jid: - # we want an avatar - puny_jid = helpers.sanitize_filename(jid) - path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid) + suffix - path_to_local_file = path_to_file + '_local' - for extension in ('.png', '.jpeg'): - path_to_local_file_full = path_to_local_file + extension - if os.path.exists(path_to_local_file_full): - return path_to_local_file_full - for extension in ('.png', '.jpeg'): - path_to_file_full = path_to_file + extension - if os.path.exists(path_to_file_full): - return path_to_file_full - return os.path.abspath(generic) - def decode_filechooser_file_paths(file_paths): """ Decode as UTF-8 under Windows and ask sys.getfilesystemencoding() in POSIX ===================================== src/notify.py ===================================== --- a/src/notify.py +++ b/src/notify.py @@ -155,8 +155,16 @@ class Notification: def _nec_notification(self, obj): if obj.do_popup: + if obj.popup_image: + icon_path = gtkgui_helpers.get_icon_path(obj.popup_image, 48) + if icon_path: + image_path = icon_path + elif obj.popup_image_path: + image_path = obj.popup_image_path + else: + image_path = '' popup(obj.popup_event_type, obj.jid, obj.conn.name, - obj.popup_msg_type, path_to_image=obj.popup_image, + obj.popup_msg_type, path_to_image=image_path, title=obj.popup_title, text=obj.popup_text, timeout=obj.popup_timeout) ===================================== test/runtests.py ===================================== --- a/test/runtests.py +++ b/test/runtests.py @@ -39,7 +39,6 @@ modules = ( 'unit.test_protocol_caps', 'unit.test_caps_cache', 'unit.test_contacts', 'unit.test_account', - 'unit.test_gui_interface', ) if use_x: @@ -47,6 +46,7 @@ if use_x: #'integration.test_gui_event_integration', 'integration.test_roster', 'integration.test_resolver', + 'unit.test_gui_interface', ) nb_errors = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0a28e0f0665378263381d29a55d5d563ec… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0a28e0f0665378263381d29a55d5d563ec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_0.16] 2 commits: Add .gitlab-ci.yml
by Yann Leboulanger 08 Aug '17

08 Aug '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 200d58fe by Yann Leboulanger at 2017-08-08T21:20:05+02:00 Add .gitlab-ci.yml - - - - - 4612ba98 by Yann Leboulanger at 2017-08-08T21:43:04+02:00 Merge branch 'gajim_0.16' into 'gajim_0.16' Add .gitlab-ci.yml See merge request !113 - - - - - 1 changed file: - + .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,41 @@ +before_script: + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config libglib2.0-dev $(apt-cache depends gajim-nightly | grep Depends | sed "s/.*ends:\ //" | tr '\n' ' ') + - sudo apt-get build-dep -y -qq gajim-nightly + +stages: + - test + - build + +run-test: + stage: test + script: + - make test + +run-build: + stage: build + script: + - ./autogen.sh + - make dist + - export FN="gajim-"$(date +%F)".tar" + - mv gajim-*.tar.gz $FN.gz + - mkdir tmp_add_plugins + - mv $FN.gz tmp_add_plugins/ + - cd tmp_add_plugins/ + - tar xzf $FN.gz + - rm $FN.gz + - export GF=$(find . -maxdepth 1 -type d -name 'gajim-*') + - cd $GF/plugins/ + - curl -O https://ftp.gajim.org/plugins_0.16_zip/plugin_installer.zip + - unzip plugin_installer.zip + - rm plugin_installer.zip + - cd ../.. + - tar czf ../$FN.gz gajim-* + - cd .. + - rm -rf tmp_add_plugins + - scp $FN.gz panoramix:/var/www/gajim/downloads/snap/gajim-$CI_COMMIT_SHA.tar.gz + + artifacts: + name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" + expire_in: 1 week + paths: + - gajim-2???-??-??.tar.gz View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/74dea79668973d3c4e00fe776c0ba7122… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/74dea79668973d3c4e00fe776c0ba7122… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Retract nickname from pubsub correctly
by Philipp Hörist 08 Aug '17

08 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c57af6da by Philipp Hörist at 2017-08-08T19:58:20+02:00 Retract nickname from pubsub correctly - - - - - 2 changed files: - gajim/common/connection_handlers.py - gajim/profile_window.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -836,8 +836,7 @@ class ConnectionPEP(object): def retract_nickname(self): if not self.pep_supported: return - self.send_nickname(None) - # not all client support new XEP, so we still retract + self._pubsub_connection.send_pb_retract('', nbxmpp.NS_NICK, '0') def send_location(self, info): ===================================== gajim/profile_window.py ===================================== --- a/gajim/profile_window.py +++ b/gajim/profile_window.py @@ -382,6 +382,7 @@ class ProfileWindow: nick = vcard_['NICKNAME'] gajim.connections[self.account].send_nickname(nick) if nick == '': + gajim.connections[self.account].retract_nickname() nick = gajim.config.get_per('accounts', self.account, 'name') gajim.nicks[self.account] = nick gajim.connections[self.account].send_vcard(vcard_) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c57af6dade707439d6c87ddbf1502b89c3… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c57af6dade707439d6c87ddbf1502b89c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Use new DB API for logging status and errors
by Philipp Hörist 08 Aug '17

08 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 608655de by Philipp Hörist at 2017-08-08T14:41:55+02:00 Use new DB API for logging status and errors - - - - - 8c920b35 by Philipp Hörist at 2017-08-08T15:24:41+02:00 Move logging GC messages into connection_handlers - It should be where all other message received handlers are - Port to new DB API - - - - - 25a764a6 by Philipp Hörist at 2017-08-08T18:22:23+02:00 Port logging incoming messages to new DB API - - - - - f88e8d83 by Philipp Hörist at 2017-08-08T18:22:29+02:00 Remove old DB methods - - - - - c53e2b1b by Philipp Hörist at 2017-08-08T18:22:29+02:00 Dont try to insert if JID is already in DB - This is added because even an ignored INSERT raises the autoincrement value of the table. This means the jid id gets high really fast. - - - - - 10b08652 by Philipp Hörist at 2017-08-08T18:22:29+02:00 Refactor set_room_last_message_time() - Dont depend on get_jid_id(), this saves roundtrips - - - - - f3bdb596 by Philipp Hörist at 2017-08-08T18:53:25+02:00 Refactor remove_roster() - Execute as script to save roundtrips - - - - - 4 changed files: - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/logger.py - gajim/session.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -897,6 +897,8 @@ class ConnectionHandlersBase: self._nec_message_received) gajim.ged.register_event_handler('decrypted-message-received', ged.CORE, self._nec_decrypted_message_received) + gajim.ged.register_event_handler('gc-message-received', ged.CORE, + self._nec_gc_message_received) def cleanup(self): gajim.ged.remove_event_handler('iq-error-received', ged.CORE, @@ -911,6 +913,8 @@ class ConnectionHandlersBase: self._nec_message_received) gajim.ged.remove_event_handler('decrypted-message-received', ged.CORE, self._nec_decrypted_message_received) + gajim.ged.remove_event_handler('gc-message-received', ged.CORE, + self._nec_gc_message_received) def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: @@ -1059,7 +1063,13 @@ class ConnectionHandlersBase: if gajim.config.get('log_contact_status_changes') and \ gajim.config.should_log(self.name, obj.jid): - gajim.logger.write('status', obj.jid, obj.status, obj.show) + show = gajim.logger.convert_show_values_to_db_api_values(obj.show) + if show is not None: + gajim.logger.insert_into_logs(nbxmpp.JID(obj.jid).getStripped(), + time_time(), + KindConstant.STATUS, + message=obj.status, + show=show) def _nec_gc_presence_received(self, obj): if obj.conn.name != self.name: @@ -1151,6 +1161,24 @@ class ConnectionHandlersBase: conn=self, msg_obj=obj)) return True + def _nec_gc_message_received(self, obj): + if gajim.config.should_log(obj.conn.name, obj.jid) and not \ + obj.timestamp < obj.conn.last_history_time[obj.jid] and obj.msgtxt and \ + obj.nick: + # if not obj.nick, it means message comes from room itself + # usually it hold description and can be send at each connection + # so don't store it in logs + gajim.logger.insert_into_logs(obj.jid, + obj.timestamp, + KindConstant.GC_MSG, + message=obj.msgtxt, + contact_name=obj.nick, + additional_data=obj.additional_data) + # store in memory time of last message logged. + # this will also be saved in rooms_last_message_time table + # when we quit this muc + obj.conn.last_history_time[obj.jid] = obj.timestamp + # process and dispatch an error message def dispatch_error_message(self, msg, msgtxt, session, frm, tim): error_msg = msg.getErrorMsg() @@ -1162,8 +1190,12 @@ class ConnectionHandlersBase: subject = msg.getSubject() if session.is_loggable(): - gajim.logger.write('error', frm, error_msg, tim=tim, - subject=subject) + gajim.logger.insert_into_logs(nbxmpp.JID(frm).getStripped(), + tim, + KindConstant.ERROR, + message=error_msg, + subject=subject) + gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, fjid=frm, error_code=msg.getErrorCode(), error_msg=error_msg, msg=msgtxt, time_=tim, session=session, stanza=msg)) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -932,7 +932,15 @@ class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): if jid: # we know real jid, save it in db st += ' (%s)' % jid - gajim.logger.write('gcstatus', self.fjid, st, self.show) + show = gajim.logger.convert_show_values_to_db_api_values(self.show) + if show is not None: + fjid = nbxmpp.JID(self.fjid) + gajim.logger.insert_into_logs(fjid.getStripped(), + time_time(), + KindConstant.GCSTATUS, + contact_name=fjid.getResource(), + message=st, + show=show) if self.avatar_sha == '': # contact has no avatar puny_nick = helpers.sanitize_filename(self.nick) @@ -1137,7 +1145,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): base_network_events = ['raw-message-received'] def init(self): - self.additional_data = {} + self.additional_data = None def generate(self): self.conn = self.base_event.conn ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -122,8 +122,6 @@ class Logger: # db will be created in src/common/checks_paths.py return self.attach_cache_database() - gajim.ged.register_event_handler('gc-message-received', - ged.POSTCORE, self._nec_gc_message_received) @staticmethod def namedtuple_factory(cursor, row): @@ -328,7 +326,7 @@ class Logger: self.jids_already_in.append(jid) return jid_id - def convert_human_values_to_db_api_values(self, kind, show): + def convert_kind_values_to_db_api_values(self, kind): """ Convert from string style to constant ints for db """ @@ -349,25 +347,30 @@ class Logger: elif kind == 'error': kind_col = KindConstant.ERROR + return kind_col + + def convert_show_values_to_db_api_values(self, show): + """ + Convert from string style to constant ints for db + """ + if show == 'online': - show_col = ShowConstant.ONLINE + return ShowConstant.ONLINE elif show == 'chat': - show_col = ShowConstant.CHAT + return ShowConstant.CHAT elif show == 'away': - show_col = ShowConstant.AWAY + return ShowConstant.AWAY elif show == 'xa': - show_col = ShowConstant.XA + return ShowConstant.XA elif show == 'dnd': - show_col = ShowConstant.DND + return ShowConstant.DND elif show == 'offline': - show_col = ShowConstant.OFFLINE + return ShowConstant.OFFLINE elif show is None: - show_col = None + return ShowConstant.ONLINE else: # invisible in GC when someone goes invisible # it's a RFC violation .... but we should not crash - show_col = 'UNKNOWN' - - return kind_col, show_col + return None def convert_human_transport_type_to_db_api_values(self, type_): """ @@ -466,28 +469,6 @@ class Logger: if sub == SubscriptionConstant.BOTH: return 'both' - def commit_to_db(self, values, write_unread=False): - sql = '''INSERT INTO logs (jid_id, contact_name, time, kind, show, - message, subject, additional_data) VALUES (?, ?, ?, ?, ?, ?, ?, ?)''' - try: - self.cur.execute(sql, values) - except sqlite.OperationalError as e: - raise exceptions.PysqliteOperationalError(str(e)) - except sqlite.DatabaseError: - raise exceptions.DatabaseMalformed(LOG_DB_PATH) - message_id = None - if write_unread: - try: - self.con.commit() - message_id = self.cur.lastrowid - except sqlite.OperationalError as e: - print(str(e), file=sys.stderr) - else: - self._timeout_commit() - if message_id: - self.insert_unread_events(message_id, values[0]) - return message_id - def insert_unread_events(self, message_id, jid_id): """ Add unread message with id: message_id @@ -552,89 +533,6 @@ class Logger: all_messages.append((results, shown)) return all_messages - def write(self, kind, jid, message=None, show=None, tim=None, subject=None, - additional_data=None, mam_query=False): - """ - Write a row (status, gcstatus, message etc) to logs database - - kind can be status, gcstatus, gc_msg, (we only recv for those 3), - single_msg_recv, chat_msg_recv, chat_msg_sent, single_msg_sent we cannot - know if it is pm or normal chat message, we try to guess see - jid_is_from_pm() - - We analyze jid and store it as follows: - jids.jid text column will hold JID if TC-related, room_jid if GC-related, - ROOM_JID/nick if pm-related. - """ - - if additional_data is None: - additional_data = {} - if self.jids_already_in == []: # only happens if we just created the db - self.open_db() - - contact_name_col = None # holds nickname for kinds gcstatus, gc_msg - # message holds the message unless kind is status or gcstatus, - # then it holds status message - message_col = message - subject_col = subject - additional_data_col = json.dumps(additional_data) - if tim: - time_col = float(tim) - else: - time_col = float(time.time()) - - kind_col, show_col = self.convert_human_values_to_db_api_values(kind, - show) - - write_unread = False - try: - # now we may have need to do extra care for some values in columns - if kind == 'status': # we store (not None) time, jid, show, msg - # status for roster items - jid_id = self.get_jid_id(jid) - if show is None: # show is None (xmpp), but we say that 'online' - show_col = ShowConstant.ONLINE - - elif kind == 'gcstatus': - # status in ROOM (for pm status see status) - if show is None: # show is None (xmpp), but we say that 'online' - show_col = ShowConstant.ONLINE - jid, nick = jid.split('/', 1) - - # re-get jid_id for the new jid - jid_id = self.get_jid_id(jid, 'ROOM') - contact_name_col = nick - - elif kind == 'gc_msg': - if jid.find('/') != -1: # if it has a / - jid, nick = jid.split('/', 1) - else: - # it's server message f.e. error message - # when user tries to ban someone but he's not allowed to - nick = None - - # re-get jid_id for the new jid - jid_id = self.get_jid_id(jid, 'ROOM') - - contact_name_col = nick - else: - jid_id = self.get_jid_id(jid) - if kind == 'chat_msg_recv': - if not self.jid_is_from_pm(jid) and not mam_query: - # Save in unread table only if it's not a pm - write_unread = True - - if show_col == 'UNKNOWN': # unknown show, do not log - return - - values = (jid_id, contact_name_col, time_col, kind_col, show_col, - message_col, subject_col, additional_data_col) - return self.commit_to_db(values, write_unread) - - except (exceptions.DatabaseMalformed, - exceptions.PysqliteOperationalError) as error: - self.dispatch('DB_ERROR', error) - def get_last_conversation_lines(self, account, jid, pending): """ Get recent messages @@ -854,16 +752,21 @@ class Logger: return self.get_last_date_that_has_logs(account, jid) return row.time - def set_room_last_message_time(self, jid, time): + def set_room_last_message_time(self, jid, timestamp): """ - Set last time (in seconds since EPOCH) for which we had logs for that - room in rooms_last_message_time table + Set the timestamp of the last message we received in a room. + + :param jid: The jid + + :param timestamp: The timestamp in epoch """ - jid_id = self.get_jid_id(jid, 'ROOM') - # jid_id is unique in this table, create or update : - sql = 'REPLACE INTO rooms_last_message_time VALUES (%d, %d)' % \ - (jid_id, time) - self.simple_commit(sql) + self.insert_jid(jid, type_=JIDConstant.ROOM_TYPE) + + sql = '''REPLACE INTO rooms_last_message_time + VALUES ((SELECT jid_id FROM jids WHERE jid = ?), ?)''' + + self.con.execute(sql, (jid, timestamp)) + self._timeout_commit() def save_transport_type(self, jid, type_): """ @@ -1130,14 +1033,19 @@ class Logger: def remove_roster(self, account_jid): """ - Remove all entry from account_jid roster + Remove the roster of an account + + :param account_jid: The jid of the account """ - account_jid_id = self.get_jid_id(account_jid) - self.cur.execute('DELETE FROM roster_entry WHERE account_jid_id=?', - (account_jid_id,)) - self.cur.execute('DELETE FROM roster_group WHERE account_jid_id=?', - (account_jid_id,)) + jid_id = self.get_jid_id(account_jid) + + sql = ''' + DELETE FROM roster_entry WHERE account_jid_id = {jid_id}; + DELETE FROM roster_group WHERE account_jid_id = {jid_id}; + '''.format(jid_id=jid_id) + + self.con.executescript(sql) self._timeout_commit() def search_for_duplicate(self, jid, timestamp, msg): @@ -1181,10 +1089,13 @@ class Logger: :param type_: A JIDConstant """ - if kind == KindConstant.GC_MSG: + if jid in self.jids_already_in: + return + if kind in (KindConstant.GC_MSG, KindConstant.GCSTATUS): type_ = JIDConstant.ROOM_TYPE sql = 'INSERT OR IGNORE INTO jids (jid, type) VALUES (?, ?)' self.con.execute(sql, (jid, type_)) + self.jids_already_in.append(jid) self._timeout_commit() def insert_into_logs(self, jid, time_, kind, unread=True, **kwargs): @@ -1221,18 +1132,3 @@ class Logger: self._timeout_commit() return lastrowid - - def _nec_gc_message_received(self, obj): - tim_f = float(obj.timestamp) - tim_int = int(tim_f) - if gajim.config.should_log(obj.conn.name, obj.jid) and not \ - tim_int < obj.conn.last_history_time[obj.jid] and obj.msgtxt and \ - obj.nick: - # if not obj.nick, it means message comes from room itself - # usually it hold description and can be send at each connection - # so don't store it in logs - self.write('gc_msg', obj.fjid, obj.msgtxt, tim=obj.timestamp, additional_data=obj.additional_data) - # store in memory time of last message logged. - # this will also be saved in rooms_last_message_time table - # when we quit this muc - obj.conn.last_history_time[obj.jid] = tim_f ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -21,6 +21,8 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import nbxmpp + from common import helpers from common import events @@ -31,6 +33,7 @@ from common import contacts from common import ged from common.connection_handlers_events import ChatstateReceivedEvent, \ InformationEvent +from common.logger import KindConstant import message_control @@ -86,21 +89,13 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): if not obj.msgtxt and obj.chatstate is None: return - log_type = 'chat_msg' + log_type = KindConstant.CHAT_MSG_RECV + if obj.forwarded and obj.sent: + log_type = KindConstant.CHAT_MSG_SENT else: - log_type = 'single_msg' - end = '_recv' - if obj.forwarded and obj.sent: - end = '_sent' - log_type += end - - if self.is_loggable() and obj.msgtxt: - if obj.xhtml and gajim.config.get('log_xhtml_messages'): - msg_to_log = obj.xhtml - else: - msg_to_log = obj.msgtxt - obj.msg_log_id = gajim.logger.write(log_type, obj.fjid, - msg_to_log, tim=obj.timestamp, subject=obj.subject, additional_data=obj.additional_data) + log_type = KindConstant.SINGLE_MSG_RECV + if obj.forwarded and obj.sent: + log_type = KindConstant.SINGLE_MSG_SENT treat_as = gajim.config.get('treat_incoming_messages') if treat_as: @@ -111,6 +106,22 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): pm = True obj.mtype = 'pm' + if self.is_loggable() and obj.msgtxt: + if obj.xhtml and gajim.config.get('log_xhtml_messages'): + msg_to_log = obj.xhtml + else: + msg_to_log = obj.msgtxt + + jid = obj.fjid + if not pm: + jid = obj.jid + + obj.msg_log_id = gajim.logger.insert_into_logs( + jid, obj.timestamp, log_type, + message=msg_to_log, + subject=obj.subject, + additional_data=obj.additional_data) + # Handle chat states if contact and (not obj.forwarded or not obj.sent): if self.control and self.control.type_id == \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/635ce52856d4a71f4b2f9928e30bbe89d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/635ce52856d4a71f4b2f9928e30bbe89d… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2017