Commits

commits@gajim.org

17632 discussions

gajim-plugins: SQL refactoring
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset a904a90544cb in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=a904a90544cb description: SQL refactoring diffstat: omemo/omemo/encryption.py | 84 +-------------------- omemo/omemo/liteaxolotlstore.py | 2 + omemo/omemo/liteidentitykeystore.py | 5 - omemo/omemo/liteprekeystore.py | 4 - omemo/omemo/litesessionstore.py | 5 - omemo/omemo/litesignedprekeystore.py | 6 +- omemo/omemo/sql.py | 144 +++++++++++++++++++++++++++++++++++ 7 files changed, 148 insertions(+), 102 deletions(-) diffs (truncated from 336 to 300 lines): diff -r 30150e936a8c -r a904a90544cb omemo/omemo/encryption.py --- a/omemo/omemo/encryption.py Sat Jul 23 14:10:36 2016 +0200 +++ b/omemo/omemo/encryption.py Sat Jul 23 15:16:14 2016 +0200 @@ -18,8 +18,6 @@ # the Gajim-OMEMO plugin. If not, see <http://www.gnu.org/licenses/>. # -from .db_helpers import table_exists, user_version - class EncryptionState(): """ Used to store if OMEMO is enabled or not between gajim restarts """ @@ -28,7 +26,7 @@ """ :type dbConn: Connection """ - self.dbConn = migrate(dbConn) + self.dbConn = dbConn def activate(self, jid): q = """INSERT OR REPLACE INTO encryption_state (jid, encryption) @@ -54,83 +52,3 @@ if result is None: return False return result[0] == 1 - - -def migrate(dbConn): - """ Creates the encryption_state table and migrates it if needed. - """ - if user_version(dbConn) == 0: - create_table = """ CREATE TABLE encryption_state ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - jid TEXT UNIQUE, - encryption INTEGER, - timestamp NUMERIC DEFAULT CURRENT_TIMESTAMP - ); - """ - - if table_exists(dbConn, 'encryption_state'): - # Given a database which already has `encryption_state` and has - # `user_version` 0, we assume the database needs migration and - # migrate it to add an `ID INTEGER AUTOINCREMENT` column - migrate_sql = """ - BEGIN TRANSACTION; - ALTER TABLE encryption_state RENAME TO encryption_state_back; - %s - INSERT INTO encryption_state(jid, encryption, timestamp) - SELECT jid, encryption, timestamp FROM encryption_state_back; - DROP TABLE encryption_state_back; - PRAGMA user_version=1; - END TRANSACTION ; - """ % (create_table) - dbConn.executescript(migrate_sql) - else: - # The database has `user_version` 0 and has no `encryption_state - # table, so crate it! - dbConn.executescript(""" BEGIN TRANSACTION; - %s - PRAGMA user_version=1; - END TRANSACTION; - """ % (create_table)) - # Find all double entrys and delete them - if user_version(dbConn) < 2: - delete_dupes = """ DELETE FROM identities WHERE _id not in ( - SELECT MIN(_id) - FROM identities - GROUP BY - recipient_id, public_key - ); - """ - - dbConn.executescript(""" BEGIN TRANSACTION; - %s - PRAGMA user_version=2; - END TRANSACTION; - """ % (delete_dupes)) - - if user_version(dbConn) < 3: - # Create a UNIQUE INDEX so every public key/recipient_id tuple - # can only be once in the db - add_index = """ CREATE UNIQUE INDEX IF NOT EXISTS - public_key_index - ON identities (public_key, recipient_id); - """ - - dbConn.executescript(""" BEGIN TRANSACTION; - %s - PRAGMA user_version=3; - END TRANSACTION; - """ % (add_index)) - - if user_version(dbConn) < 4: - # Adds column "active" to the sessions table - add_active = """ ALTER TABLE sessions - ADD COLUMN active INTEGER DEFAULT 1; - """ - - dbConn.executescript(""" BEGIN TRANSACTION; - %s - PRAGMA user_version=4; - END TRANSACTION; - """ % (add_active)) - - return dbConn diff -r 30150e936a8c -r a904a90544cb omemo/omemo/liteaxolotlstore.py --- a/omemo/omemo/liteaxolotlstore.py Sat Jul 23 14:10:36 2016 +0200 +++ b/omemo/omemo/liteaxolotlstore.py Sat Jul 23 15:16:14 2016 +0200 @@ -27,6 +27,7 @@ from .litesessionstore import LiteSessionStore from .litesignedprekeystore import LiteSignedPreKeyStore from .encryption import EncryptionState +from .sql import SQLDatabase log = logging.getLogger('gajim.plugin_system.omemo') @@ -42,6 +43,7 @@ raise AssertionError('Expected a sqlite3.Connection got ' + str(connection)) + self.sql = SQLDatabase(connection) self.identityKeyStore = LiteIdentityKeyStore(connection) self.preKeyStore = LitePreKeyStore(connection) self.signedPreKeyStore = LiteSignedPreKeyStore(connection) diff -r 30150e936a8c -r a904a90544cb omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Sat Jul 23 14:10:36 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Sat Jul 23 15:16:14 2016 +0200 @@ -33,11 +33,6 @@ :type dbConn: Connection """ self.dbConn = dbConn - dbConn.execute( - "CREATE TABLE IF NOT EXISTS identities (" + - "_id INTEGER PRIMARY KEY AUTOINCREMENT, recipient_id TEXT," + - "registration_id INTEGER, public_key BLOB, private_key BLOB," + - "next_prekey_id INTEGER, timestamp INTEGER, trust INTEGER);") def getIdentityKeyPair(self): q = "SELECT public_key, private_key FROM identities " + \ diff -r 30150e936a8c -r a904a90544cb omemo/omemo/liteprekeystore.py --- a/omemo/omemo/liteprekeystore.py Sat Jul 23 14:10:36 2016 +0200 +++ b/omemo/omemo/liteprekeystore.py Sat Jul 23 15:16:14 2016 +0200 @@ -28,10 +28,6 @@ :type dbConn: Connection """ self.dbConn = dbConn - dbConn.execute("CREATE TABLE IF NOT EXISTS prekeys(" + - "_id INTEGER PRIMARY KEY AUTOINCREMENT," + - "prekey_id INTEGER UNIQUE, sent_to_server BOOLEAN, " + - " record BLOB);") def loadPreKey(self, preKeyId): q = "SELECT record FROM prekeys WHERE prekey_id = ?" diff -r 30150e936a8c -r a904a90544cb omemo/omemo/litesessionstore.py --- a/omemo/omemo/litesessionstore.py Sat Jul 23 14:10:36 2016 +0200 +++ b/omemo/omemo/litesessionstore.py Sat Jul 23 15:16:14 2016 +0200 @@ -27,11 +27,6 @@ :type dbConn: Connection """ self.dbConn = dbConn - dbConn.execute("CREATE TABLE IF NOT EXISTS sessions (" + - "_id INTEGER PRIMARY KEY AUTOINCREMENT," + - "recipient_id TEXT," + "device_id INTEGER," + - "record BLOB," + "timestamp INTEGER, " + - "UNIQUE(recipient_id, device_id));") def loadSession(self, recipientId, deviceId): q = "SELECT record FROM sessions WHERE recipient_id = ? AND device_id = ?" diff -r 30150e936a8c -r a904a90544cb omemo/omemo/litesignedprekeystore.py --- a/omemo/omemo/litesignedprekeystore.py Sat Jul 23 14:10:36 2016 +0200 +++ b/omemo/omemo/litesignedprekeystore.py Sat Jul 23 15:16:14 2016 +0200 @@ -28,10 +28,6 @@ :type dbConn: Connection """ self.dbConn = dbConn - dbConn.execute( - "CREATE TABLE IF NOT EXISTS signed_prekeys (" + - "_id INTEGER PRIMARY" + " KEY AUTOINCREMENT," + - "prekey_id INTEGER UNIQUE, timestamp INTEGER, record BLOB);") def loadSignedPreKey(self, signedPreKeyId): q = "SELECT record FROM signed_prekeys WHERE prekey_id = ?" @@ -83,4 +79,4 @@ cursor = self.dbConn.cursor() cursor.execute(q) result = cursor.fetchone() - return result[0] + return result[0] is not None diff -r 30150e936a8c -r a904a90544cb omemo/omemo/sql.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/omemo/sql.py Sat Jul 23 15:16:14 2016 +0200 @@ -0,0 +1,144 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2015 Tarek Galal <tare2.galal(a)gmail.com> +# +# This file is part of Gajim-OMEMO plugin. +# +# The Gajim-OMEMO plugin is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) any +# later version. +# +# Gajim-OMEMO is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# the Gajim-OMEMO plugin. If not, see <http://www.gnu.org/licenses/>. +# +from .db_helpers import user_version + + +class SQLDatabase(): + """ SQL Database """ + + def __init__(self, dbConn): + """ + :type dbConn: Connection + """ + self.dbConn = dbConn + self.createDb() + self.migrateDb() + + def createDb(self): + if user_version(self.dbConn) == 0: + + # Creates + # IdentityKeyStore + # PreKeyStore + # SignedPreKeyStore + # SessionStore + # EncryptionStore + + create_tables = ''' + CREATE TABLE IF NOT EXISTS identities ( + _id INTEGER PRIMARY KEY AUTOINCREMENT, recipient_id TEXT, + registration_id INTEGER, public_key BLOB, private_key BLOB, + next_prekey_id INTEGER, timestamp INTEGER, trust INTEGER); + + CREATE UNIQUE INDEX IF NOT EXISTS + public_key_index ON identities (public_key, recipient_id); + + CREATE TABLE IF NOT EXISTS prekeys( + _id INTEGER PRIMARY KEY AUTOINCREMENT, + prekey_id INTEGER UNIQUE, sent_to_server BOOLEAN, + record BLOB); + + CREATE TABLE IF NOT EXISTS signed_prekeys ( + _id INTEGER PRIMARY KEY AUTOINCREMENT, + prekey_id INTEGER UNIQUE, + timestamp NUMERIC DEFAULT CURRENT_TIMESTAMP, record BLOB); + + CREATE TABLE IF NOT EXISTS sessions ( + _id INTEGER PRIMARY KEY AUTOINCREMENT, + recipient_id TEXT, device_id INTEGER, + record BLOB, timestamp INTEGER, active INTEGER DEFAULT 1, + UNIQUE(recipient_id, device_id)); + + CREATE TABLE IF NOT EXISTS encryption_state ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + jid TEXT UNIQUE, + encryption INTEGER, + timestamp NUMERIC DEFAULT CURRENT_TIMESTAMP + ); + ''' + + create_db_sql = """ + BEGIN TRANSACTION; + %s + PRAGMA user_version=5; + END TRANSACTION; + """ % (create_tables) + self.dbConn.executescript(create_db_sql) + + def migrateDb(self): + """ Migrates the DB + """ + + # Find all double entrys and delete them + if user_version(self.dbConn) < 2: + delete_dupes = """ DELETE FROM identities WHERE _id not in ( + SELECT MIN(_id) + FROM identities + GROUP BY + recipient_id, public_key + ); + """ + + self.dbConn.executescript(""" BEGIN TRANSACTION; + %s + PRAGMA user_version=2; + END TRANSACTION; + """ % (delete_dupes)) + + if user_version(self.dbConn) < 3: + # Create a UNIQUE INDEX so every public key/recipient_id tuple + # can only be once in the db + add_index = """ CREATE UNIQUE INDEX IF NOT EXISTS + public_key_index

1 0

gajim: Added some more files for automatic appveyor builds
by Gajim 07 Aug '16

07 Aug '16

changeset 7f8b3cc6cf0b in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7f8b3cc6cf0b description: Added some more files for automatic appveyor builds diffstat: download.ps1 | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diffs (27 lines): diff -r d8fa71d64d8c -r 7f8b3cc6cf0b download.ps1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/download.ps1 Sun Aug 07 18:24:20 2016 +0200 @@ -0,0 +1,23 @@ +# Download the file to a specific location +$clnt = new-object System.Net.WebClient +$url = "http://www.funkroom.net/files/site-packages.zip" +$file = "c:\site-packages.zip" +$clnt.DownloadFile($url,$file) + +# Unzip the file to specified location +$shell_app=new-object -com shell.application +$zip_file = $shell_app.namespace($file) +$destination = $shell_app.namespace("C:\Python34\Lib\site-packages") +$destination.Copyhere($zip_file.items()) + +# Download gettext +$url = "https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.19.8.…" +$file = "c:\gettext0.19.8.1-iconv1.14-static-32.zip" +$clnt.DownloadFile($url,$file) + +# Unzip the file to specified location +$shell_app=new-object -com shell.application +$zip_file = $shell_app.namespace($file) +New-Item -ItemType directory -Path C:\gettext +$destination = $shell_app.namespace("C:\gettext") +$destination.Copyhere($zip_file.items())

1 0

gajim: Add changes so Appveyor can do nightly builds for Windows
by Gajim 07 Aug '16

07 Aug '16

changeset d8fa71d64d8c in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d8fa71d64d8c description: Add changes so Appveyor can do nightly builds for Windows diffstat: appveyor.yml | 41 +++++++++++ build.bat | 8 +- gajim.nsi | 2 +- setup_win32.py | 206 ++++++++++++++++++++++++++++---------------------------- 4 files changed, 149 insertions(+), 108 deletions(-) diffs (truncated from 333 to 300 lines): diff -r da01065cf9c4 -r d8fa71d64d8c appveyor.yml --- a/appveyor.yml Fri Jun 24 20:12:37 2016 +0200 +++ b/appveyor.yml Sun Aug 07 16:13:58 2016 +0200 @@ -0,0 +1,41 @@ +environment: + + matrix: + + - PYTHON: "C:\\Python34" + + +install: + + - hg clone http://hg.gajim.org/gajim-plugins c:\projects\gajim-plugins + - hg clone http://hg.gajim.org/python-nbxmpp c:\projects\python-nbxmpp + - cd c:\\projects\\python-nbxmpp\\ + - python setup.py install + - ps: c:\\projects\\gajim\\download.ps1 + - set PATH=C:\\MinGW\\bin;C:\\Program Files (x86)\\gettext-iconv\\bin;%PATH% + - "%PYTHON%\\python.exe -m pip install --upgrade pip" + - "%PYTHON%\\python.exe -m pip install protobuf" + - ps: Add-Content C:\Python34\Lib\site-packages\google\__init__.py " " + - "%PYTHON%\\python.exe -m pip install pycrypto" + - "%PYTHON%\\python.exe -m pip install cx_freeze" + - "%PYTHON%\\python.exe -m pip install pypiwin32" + - "%PYTHON%\\python.exe -m pip install pyopenssl" + - "%PYTHON%\\python.exe -m pip install --global-option=build_ext --global-option --compiler=mingw32 python-axolotl" + - cd c:\\projects\\gajim\\ + - build.bat + + +build: off + +# artifacts: +# - path: gajim_built\Gajim.exe +# - name: MyApp + +on_finish: + - ps: Push-AppveyorArtifact gajim_built\Gajim.exe -FileName "Gajim-16.10.1-$($env:APPVEYOR_REPO_COMMIT).exe" + + +#on_success: +# You can use this step to upload your artifacts to a public website. +# See Appveyor's documentation for more details. Or you can simply +# access your wheels from the Appveyor "artifacts" tab for your build. \ No newline at end of file diff -r da01065cf9c4 -r d8fa71d64d8c build.bat --- a/build.bat Fri Jun 24 20:12:37 2016 +0200 +++ b/build.bat Sun Aug 07 16:13:58 2016 +0200 @@ -4,8 +4,8 @@ hg archive gajim_built xcopy ..\gajim-plugins\plugin_installer gajim_built\plugins\plugin_installer /e /i -copy msgfmt.exe gajim_built -copy msvcr100.dll gajim_built +rem copy C:\Python34\Lib\site-packages\gnome\msgfmt.exe gajim_built +rem copy C:\Windows\System32\msvcr100.dll gajim_built cd gajim_built @@ -17,8 +17,8 @@ rmdir build rename exe.win32-3.4 build -REM for snarl plugin -xcopy ..\win32com build\win32com /e /i +rem REM for snarl plugin +rem xcopy ..\win32com build\win32com /e /i "C:\Program Files (x86)\NSIS\makensis" gajim.nsi diff -r da01065cf9c4 -r d8fa71d64d8c gajim.nsi --- a/gajim.nsi Fri Jun 24 20:12:37 2016 +0200 +++ b/gajim.nsi Sun Aug 07 16:13:58 2016 +0200 @@ -149,7 +149,7 @@ File "THANKS.artists" File /r "build" SetOutPath "$INSTDIR\build" - File "msvcr100.dll" +; File "msvcr100.dll" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" diff -r da01065cf9c4 -r d8fa71d64d8c setup_win32.py --- a/setup_win32.py Fri Jun 24 20:12:37 2016 +0200 +++ b/setup_win32.py Sun Aug 07 16:13:58 2016 +0200 @@ -1,135 +1,136 @@ -## setup_win32.py (run me as python setup_win32.py py2exe -O2) -## -## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## +# setup_win32.py (run me as python setup_win32.py py2exe -O2) +# +# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +# +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. +# -from cx_Freeze import setup, Executable -import glob + import sys import os import site +from cx_Freeze import setup, Executable -site_dir = site.getsitepackages()[1] -include_dll_path = os.path.join(site_dir, "gnome") +SITEDIR = site.getsitepackages()[1] +INCLUDE_DLL_PATH = os.path.join(SITEDIR, "gnome") sys.path.append('src') # Collect the list of missing dll when cx_freeze builds the app -missing_dll = ['libgtk-3-0.dll', + +MISSING_DLL = ['libgtk-3-0.dll', 'libgdk-3-0.dll', 'libatk-1.0-0.dll', - 'libcairo-gobject-2.dll', 'libgdk_pixbuf-2.0-0.dll', 'libjpeg-8.dll', 'libpango-1.0-0.dll', 'libpangocairo-1.0-0.dll', 'libpangoft2-1.0-0.dll', 'libpangowin32-1.0-0.dll', - 'libgnutls-26.dll', + 'libgnutls-28.dll', 'libp11-kit-0.dll', - 'libaerial-0.dll', -'libgstrtp-1.0-0.dll', -'libcurl-4.dll', -'libgstrtsp-1.0-0.dll', -'libdb-4.8.dll', -'libgstrtspserver-1.0-0.dll', -'libfarstream-0.2-2.dll', -'libgstsdp-1.0-0.dll', -'libfftw3.dll', -'libgsttag-1.0-0.dll', -'libfluidsynth-1.dll', -'libgsturidownloader-1.0-0.dll', -'libgraphene-1.0-0.dll', -'libgstvalidate-1.0-0.dll', -'libgssdp-1.0-3.dll', -'libgstvalidate-default-overrides-1.0-0.dll', -'libgstallocators-1.0-0.dll', -'libgstvideo-1.0-0.dll', -'libgstapp-1.0-0.dll', -'libgupnp-1.0-4.dll', -'libgstaudio-1.0-0.dll', -'libgupnp-igd-1.0-4.dll', -'libgstbadbase-1.0-0.dll', -'libidn-11.dll', -'libgstbadvideo-1.0-0.dll', -'libjack.dll', -'libgstbase-1.0-0.dll', -'libjasper-1.dll', -'libgstbasecamerabinsrc-1.0-0.dll', -'libnice-10.dll', -'libgstcheck-1.0-0.dll', -'libnotify-4.dll', -'libgstcodecparsers-1.0-0.dll', -'libopenexr-2.dll', -'libgstcontroller-1.0-0.dll', -'libopenjp2.dll', -'libgstfft-1.0-0.dll', -'liborc-0.4-0.dll', -'libgstgl-1.0-0.dll', -'liborc-test-0.4-0.dll', -'libgstinsertbin-1.0-0.dll', -'libproxy.dll', -'libgstmpegts-1.0-0.dll', -'librsvg-2-2.dll', -'libgstnet-1.0-0.dll', -'libsoup-2.4-1.dll', -'libgstpbutils-1.0-0.dll', -'libsqlite3-0.dll', -'libgstphotography-1.0-0.dll', -'libvisual-0.4-0.dll', -'libgstreamer-1.0-0.dll', -'libwebp-5.dll', -'libgstriff-1.0-0.dll', -] + 'libgstrtp-1.0-0.dll', + 'libgstrtsp-1.0-0.dll', + 'libgstrtspserver-1.0-0.dll', + 'libfarstream-0.2-5.dll', + 'libgstsdp-1.0-0.dll', + 'libgsttag-1.0-0.dll', + 'libgssdp-1.0-3.dll', + 'libgstvideo-1.0-0.dll', + 'libgstapp-1.0-0.dll', + 'libgupnp-1.0-4.dll', + 'libgstaudio-1.0-0.dll', + 'libgupnp-igd-1.0-4.dll', + 'libgstbase-1.0-0.dll', + 'libnice-10.dll', + 'librsvg-2-2.dll', + 'libvisual-0.4-0.dll', + 'libwebp-5.dll', + 'libgstriff-1.0-0.dll', + 'libepoxy-0.dll', + 'libharfbuzz-0.dll', + 'libtiff-5.dll', + 'libjasper-1.dll', + 'libgstpbutils-1.0-0.dll', + 'liborc-0.4-0.dll', + 'libgstnet-1.0-0.dll', + 'libsoup-2.4-1.dll', + 'liborc-test-0.4-0.dll', + 'libavcodec-57.dll', + 'libavutil-55.dll', + 'libswresample-2.dll', + 'libavformat-57.dll', + 'libavfilter-6.dll', + 'libgssapi-3.dll', + 'libopenssl.dll', + 'libsqlite3-0.dll', + 'libproxy.dll', + 'libstdc++.dll', + 'libgstfft-1.0-0.dll'] + # We need to add all the libraries too (for themes, etc..) -gtk_libs = { - 'etc': ['dbus-1', 'fonts', 'gtk-3.0', 'pango'], - 'lib': ['aspell-0.60', 'enchant', 'farstream-0.2', 'gdbus-2.0', 'gdk-pixbuf-2.0', 'gio', 'girepository-1.0', 'gobject-introspection', 'gstreamer-1.0', 'gtk-3.0', 'libcanberra-0.30'], - 'share': ['dbus-1', 'enchant', 'farstream', 'fonts', 'gir-1.0', 'glib-2.0', 'gobject-introspection-1.0', 'gst-plugins-bad', 'gst-plugins-base', 'gstreamer-1.0', 'gupnp-av', 'gupnp-dlna-2.0', 'icons', 'ssl', 'themes', 'xml'], +GTK_LIBS = { + 'etc': ['dbus-1', 'fonts', 'gtk-3.0', 'pango'], + 'lib': ['farstream-0.2', 'gdbus-2.0', + 'gdk-pixbuf-2.0', 'gio', 'girepository-1.0', + 'gstreamer-1.0', 'gtk-3.0'], + 'share': ['dbus-1', 'farstream', 'fonts', + 'glib-2.0', + 'gst-plugins-base', 'gstreamer-1.0', 'gupnp-av', + 'gupnp-dlna-2.0', 'icons', 'ssl', 'themes', 'xml'] } + +# share 'gobject-introspection-1.0' +# , 'enchant' 'gir-1.0', + + +#lib 'gobject-introspection' +# 'aspell-0.60', 'enchant', 'gst-plugins-bad', + + # Create the list of includes as cx_freeze likes -include_files = [] -for dll in missing_dll: - include_files.append((os.path.join(include_dll_path, dll), dll)) - +INCLUDE_FILES = [] +for dll in MISSING_DLL: + INCLUDE_FILES.append((os.path.join(INCLUDE_DLL_PATH, dll), dll)) + # Let's add gtk libraries folders and files -for folder in gtk_libs: - for lib in gtk_libs[folder]: +for folder in GTK_LIBS: + for lib in GTK_LIBS[folder]: folder_lib = os.path.join(folder, lib) - include_files.append((os.path.join(include_dll_path, folder_lib), folder_lib)) -# Let's add gtk locales that we support in Gajim + INCLUDE_FILES.append((os.path.join(INCLUDE_DLL_PATH, folder_lib), + folder_lib)) + +#Let's add gtk locales that we support in Gajim for language in next(os.walk('po'))[1]: target_dir = os.path.join('share', 'locale', language)

1 0

gajim: add new event for gc after message stanza is built so it ...
by Gajim 07 Aug '16

07 Aug '16

changeset da01065cf9c4 in /home/hg/repos/gajim author: lovetox branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=da01065cf9c4 description: add new event for gc after message stanza is built so it can be modified by plugins diffstat: src/common/connection.py | 36 +++++++++++++++++++++++-------- src/common/connection_handlers_events.py | 7 ++++++ 2 files changed, 33 insertions(+), 10 deletions(-) diffs (94 lines): diff -r 26510f3ca340 -r da01065cf9c4 src/common/connection.py --- a/src/common/connection.py Sun Aug 07 11:59:16 2016 +0100 +++ b/src/common/connection.py Fri Jun 24 20:12:37 2016 +0200 @@ -814,6 +814,8 @@ self._nec_message_outgoing) gajim.ged.register_event_handler('gc-message-outgoing', ged.OUT_CORE, self._nec_gc_message_outgoing) + gajim.ged.register_event_handler('gc-stanza-message-outgoing', ged.OUT_CORE, + self._nec_gc_stanza_message_outgoing) gajim.ged.register_event_handler('stanza-message-outgoing', ged.OUT_CORE, self._nec_stanza_message_outgoing) # END __init__ @@ -830,6 +832,8 @@ self._nec_message_outgoing) gajim.ged.remove_event_handler('gc-message-outgoing', ged.OUT_CORE, self._nec_gc_message_outgoing) + gajim.ged.remove_event_handler('gc-stanza-message-outgoing', ged.OUT_CORE, + self._nec_gc_stanza_message_outgoing) gajim.ged.remove_event_handler('stanza-message-outgoing', ged.OUT_CORE, self._nec_stanza_message_outgoing) @@ -2736,16 +2740,16 @@ if obj.correction_msg.getTag('replace'): obj.correction_msg.delChild('replace') obj.correction_msg.setTag('replace', attrs={'id': id_}, - namespace=nbxmpp.NS_CORRECT) + namespace=nbxmpp.NS_CORRECT) id2 = self.connection.getAnID() obj.correction_msg.setID(id2) obj.correction_msg.setBody(obj.message) if obj.xhtml: obj.correction_msg.setXHTML(xhtml) - obj.msg_id = self.connection.send(obj.correction_msg) - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=None, chatstate=None, - automatic_message=obj.automatic_message, msg_id=obj.msg_id)) + gajim.nec.push_incoming_event(GcStanzaMessageOutgoingEvent( + None, conn=self, automatic_message=obj.automatic_message, + jid=obj.jid, message=obj.message, + correction_msg=obj.correction_msg)) if obj.callback: obj.callback(obj.correction_msg, obj.message) return @@ -2753,16 +2757,28 @@ from common.rst_xhtml_generator import create_xhtml obj.xhtml = create_xhtml(obj.message) msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat', - xhtml=obj.xhtml) + xhtml=obj.xhtml) if obj.label is not None: msg_iq.addChild(node=obj.label) - obj.msg_id = self.connection.send(msg_iq) - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=None, chatstate=None, - automatic_message=obj.automatic_message, msg_id=obj.msg_id)) + gajim.nec.push_incoming_event(GcStanzaMessageOutgoingEvent( + None, conn=self, msg_iq=msg_iq, + automatic_message=obj.automatic_message, + jid=obj.jid, message=obj.message, correction_msg=None)) if obj.callback: obj.callback(msg_iq, obj.message) + def _nec_gc_stanza_message_outgoing(self, obj): + if obj.conn.name != self.name: + return + if obj.correction_msg: + obj.msg_id = self.connection.send(obj.correction_msg) + else: + obj.msg_id = self.connection.send(obj.msg_iq) + gajim.nec.push_incoming_event(MessageSentEvent( + None, conn=self, jid=obj.jid, message=obj.message, keyID=None, + chatstate=None, automatic_message=obj.automatic_message, + msg_id=obj.msg_id)) + def send_gc_subject(self, jid, subject): if not gajim.account_is_connected(self.name): return diff -r 26510f3ca340 -r da01065cf9c4 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Aug 07 11:59:16 2016 +0100 +++ b/src/common/connection_handlers_events.py Fri Jun 24 20:12:37 2016 +0200 @@ -2688,6 +2688,13 @@ def generate(self): return True +class GcStanzaMessageOutgoingEvent(nec.NetworkOutgoingEvent): + name='gc-stanza-message-outgoing' + base_network_events = [] + + def generate(self): + return True + class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'gc-message-outgoing' base_network_events = []

1 0

gajim: Fix version comparisons in plugin loader, warn about inco...
by Gajim 07 Aug '16

07 Aug '16

changeset 29bba5077cf9 in /home/hg/repos/gajim author: Linus Heckemann <git(a)sphalerite.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=29bba5077cf9 description: Fix version comparisons in plugin loader, warn about incompatible plugins diffstat: src/plugins/pluginmanager.py | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diffs (60 lines): diff -r 41bf4a5998d3 -r 29bba5077cf9 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Aug 06 23:46:57 2016 +0200 +++ b/src/plugins/pluginmanager.py Sun Aug 07 11:53:49 2016 +0100 @@ -32,6 +32,7 @@ import zipfile from shutil import rmtree import configparser +import pkg_resources from common import gajim from common import nec @@ -450,28 +451,28 @@ conf.read_file(conf_file) conf_file.close() - try: - min_v = conf.get('info', 'min_gajim_version') - except Exception: - min_v = None - try: - max_v = conf.get('info', 'max_gajim_version') - except Exception: - max_v = None + min_v = conf.get('info', 'min_gajim_version', fallback=None) + max_v = conf.get('info', 'max_gajim_version', fallback=None) - gajim_v = gajim.config.get('version') - gajim_v = gajim_v.split('-', 1)[0] - gajim_v = gajim_v.split('.') + gajim_v = pkg_resources.parse_version(gajim.config.get('version')) - if min_v: - min_v = min_v.split('.') - if gajim_v < min_v: - continue - if max_v: - max_v = max_v.split('.') - if gajim_v > max_v: - continue - + if min_v and gajim_v < pkg_resources.parse_version(min_v): + log.warning(('Plugin {plugin} not loaded, newer version of' + 'gajim required: {gajim_v} < {min_v}').format( + plugin=elem_name, + gajim_v=gajim_v, + min_v=min_v + )) + continue + if max_v and gajim_v > pkg_resources.parse_version(max_v): + log.warning(('Plugin {plugin} not loaded, plugin incompatible ' + 'with current version of gajim: ' + '{gajim_v} > {max_v}').format( + plugin=elem_name, + gajim_v=gajim_v, + max_v=max_v + )) + continue module = None

1 0

gajim: Warn about plugin load failures rather than merely debug-...
by Gajim 07 Aug '16

07 Aug '16

changeset 26510f3ca340 in /home/hg/repos/gajim author: Linus Heckemann <git(a)sphalerite.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=26510f3ca340 description: Warn about plugin load failures rather than merely debug-logging them diffstat: src/plugins/pluginmanager.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 29bba5077cf9 -r 26510f3ca340 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Aug 07 11:53:49 2016 +0100 +++ b/src/plugins/pluginmanager.py Sun Aug 07 11:59:16 2016 +0100 @@ -482,7 +482,11 @@ try: module = __import__(module_name) except Exception as error: - log.debug(str(error)) + log.warning( + "While trying to load {plugin}, exception occurred: {error}" + .format(plugin=elem_name, error=str(error)) + ) + continue if module is None: continue

1 0

gajim: made Link Mauve's patch python 3 ready
by Gajim 06 Aug '16

06 Aug '16

changeset 41bf4a5998d3 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=41bf4a5998d3 description: made Link Mauve's patch python 3 ready diffstat: src/common/proxy65_manager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 06207bfa2cd8 -r 41bf4a5998d3 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Tue Aug 02 14:09:22 2016 +0100 +++ b/src/common/proxy65_manager.py Sat Aug 06 23:46:57 2016 +0200 @@ -88,7 +88,7 @@ port = item.getAttr('port') try: port = int(port) - except ValueError, TypeError: + except (ValueError, TypeError) as e: port = 1080 if not host or not jid: self.proxies[proxy]._on_connect_failure()

1 0

gajim-plugins: fast image decryption for windows
by Gajim Plugins 05 Aug '16

05 Aug '16

changeset 375c67fd9a1c in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=375c67fd9a1c description: fast image decryption for windows diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 37 +++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 17 deletions(-) diffs (92 lines): diff -r 7e92f69b2f36 -r 375c67fd9a1c url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Sun Jul 17 18:33:55 2016 +0200 +++ b/url_image_preview/manifest.ini Tue Jul 26 18:17:42 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.7.4 +version: 0.7.5 description: Url image preview in chatbox.<br/> Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. authors = Denis Fomin <fominde(a)gmail.com> diff -r 7e92f69b2f36 -r 375c67fd9a1c url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Sun Jul 17 18:33:55 2016 +0200 +++ b/url_image_preview/url_image_preview.py Tue Jul 26 18:17:42 2016 +0200 @@ -24,19 +24,20 @@ log = logging.getLogger('gajim.plugin_system.url_image_preview') -if os.name != 'nt': - try: + +try: + if os.name == 'nt': + from cryptography.hazmat.backends.openssl import backend + else: from cryptography.hazmat.backends import default_backend - from cryptography.hazmat.primitives.ciphers import Cipher - from cryptography.hazmat.primitives.ciphers import algorithms - from cryptography.hazmat.primitives.ciphers.modes import GCM - decryption_available = True - except Exception as e: - log.debug(e) - decryption_available = False -else: + from cryptography.hazmat.primitives.ciphers import Cipher + from cryptography.hazmat.primitives.ciphers import algorithms + from cryptography.hazmat.primitives.ciphers.modes import GCM + decryption_available = True +except Exception as e: + log.debug('Cryptography Import Error: ' + str(e)) + log.debug('Decryption/Encryption disabled') decryption_available = False - log.info('Cryptography not available on Windows for now') ACCEPTED_MIME_TYPES = ('image/png', 'image/jpeg', 'image/gif', 'image/raw', 'image/svg+xml') @@ -47,8 +48,8 @@ def init(self): self.config_dialog = UrlImagePreviewPluginConfigDialog(self) self.events_handlers = {} - self.events_handlers['message-received'] = (ged.PRECORE, - self.handle_message_received) + self.events_handlers['message-received'] = ( + ged.PRECORE, self.handle_message_received) self.gui_extension_points = { 'chat_control_base': (self.connect_with_chat_control, self.disconnect_from_chat_control), @@ -106,6 +107,10 @@ self.plugin = plugin self.chat_control = chat_control self.textview = self.chat_control.conv_textview + if os.name == 'nt': + self.backend = backend + else: + self.backend = default_backend() def print_special_text(self, special_text, other_tags, graphics=True, iter_=None): @@ -210,7 +215,8 @@ mem = aes_decrypt(key, iv, mem) log.info("After decrypt image") except Exception: - log.error('Could not decrypt image for URL (exception raised): %s' % url) + log.error('Could not decrypt image for URL (exception raised): %s' + % url) raise if not mem or not len(mem): log.error('Could not decrypt image for URL: %s' % url) @@ -221,11 +227,10 @@ # Use AES128 GCM with the given key and iv to decrypt the payload. data = payload[:-16] tag = payload[-16:] - backend = default_backend() decryptor = Cipher( algorithms.AES(key), GCM(iv, tag=tag), - backend=backend).decryptor() + backend=self.backend).decryptor() return decryptor.update(data) + decryptor.finalize() def _update_img(self, (mem, alt), url, file_mime, repl_start, repl_end, decrypted=False):

1 0

gajim: Make the port optional in <streamhost/>
by Gajim 05 Aug '16

05 Aug '16

changeset 06207bfa2cd8 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=06207bfa2cd8 description: Make the port optional in <streamhost/> XEP-0065 section 9.2 says “The "port" attribute specifies the port to connect to. This attribute MAY be present. The value MUST be a valid port number in decimal form. If not specified, the port value is "1080" (in accordance with RFC 1928).” This fixes a traceback when a streamhost is advertised with the default port. diffstat: src/common/proxy65_manager.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 1d8d3d27d84f -r 06207bfa2cd8 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Mon Jul 18 22:15:24 2016 +0200 +++ b/src/common/proxy65_manager.py Tue Aug 02 14:09:22 2016 +0100 @@ -84,9 +84,13 @@ for item in query.getChildren(): if item.getName() == 'streamhost': host = item.getAttr('host') + jid = item.getAttr('jid') port = item.getAttr('port') - jid = item.getAttr('jid') - if not host or not port or not jid: + try: + port = int(port) + except ValueError, TypeError: + port = 1080 + if not host or not jid: self.proxies[proxy]._on_connect_failure() self.proxies[proxy].resolve_result(host, port, jid) # we can have only one streamhost

1 0

gajim: Make the port optional in <streamhost/>
by Gajim 05 Aug '16

05 Aug '16

changeset b1567f3877c9 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b1567f3877c9 description: Make the port optional in <streamhost/> XEP-0065 section 9.2 says “The "port" attribute specifies the port to connect to. This attribute MAY be present. The value MUST be a valid port number in decimal form. If not specified, the port value is "1080" (in accordance with RFC 1928).” This fixes a traceback when a streamhost is advertised with the default port. diffstat: src/common/proxy65_manager.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (19 lines): diff -r f769137e5867 -r b1567f3877c9 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Sun Jul 17 00:41:34 2016 +0200 +++ b/src/common/proxy65_manager.py Tue Aug 02 14:09:22 2016 +0100 @@ -84,9 +84,13 @@ for item in query.getChildren(): if item.getName() == 'streamhost': host = item.getAttr('host') + jid = item.getAttr('jid') port = item.getAttr('port') - jid = item.getAttr('jid') - if not host or not port or not jid: + try: + port = int(port) + except ValueError, TypeError: + port = 1080 + if not host or not jid: self.proxies[proxy]._on_connect_failure() self.proxies[proxy].resolve_result(host, port, jid) # we can have only one streamhost

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits