libervia-backend: src/memory/sqlite.py annotate

annotate src/memory/sqlite.py @ 1072:d123d61976c8

bridge (D-Bus): frontend side now use a 120 s timeout for async calls

author	Goffi <goffi@goffi.org>
date	Sun, 15 Jun 2014 00:18:28 +0200
parents	9378c80e3408
children	1baa116501fa

rev	line source
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	1 #!/usr/bin/python
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	2 # -- coding: utf-8 --
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	3
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	4 # SAT: a jabber client
811 1fe00f0c9a91 dates update Goffi <goffi@goffi.org> parents: 771 diff changeset	5 # Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Jérôme Poisson (goffi@goffi.org)
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	6
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	7 # This program is free software: you can redistribute it and/or modify
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	8 # it under the terms of the GNU Affero General Public License as published by
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	9 # the Free Software Foundation, either version 3 of the License, or
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	10 # (at your option) any later version.
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	11
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	12 # This program is distributed in the hope that it will be useful,
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	15 # GNU Affero General Public License for more details.
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	16
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	17 # You should have received a copy of the GNU Affero General Public License
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 593 diff changeset	18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	19
771 bfabeedbf32e core: i18n refactoring: Goffi <goffi@goffi.org> parents: 681 diff changeset	20 from sat.core.i18n import _
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	21 from sat.core.constants import Const as C
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	22 from sat.core import exceptions
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	23 from sat.core.log import getLogger
301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	24 log = getLogger(__name__)
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	25 from sat.memory.crypto import BlockCipher, PasswordHasher
1045 65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	26 from sat.tools.config import fixConfigOption
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	27 from twisted.enterprise import adbapi
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	28 from twisted.internet import defer
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	29 from collections import OrderedDict
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	30 from time import time
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	31 import re
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	32 import os.path
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	33 import cPickle as pickle
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	34 import hashlib
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	35
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	36 CURRENT_DB_VERSION = 2
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	37
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	38 # XXX: DATABASE schemas are used in the following way:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	39 # - 'current' key is for the actual database schema, for a new base
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	40 # - x(int) is for update needed between x-1 and x. All number are needed between y and z to do an update
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	41 # e.g.: if CURRENT_DB_VERSION is 6, 'current' is the actuel DB, and to update from version 3, numbers 4, 5 and 6 are needed
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	42 # a 'current' data dict can contains the keys:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	43 # - 'CREATE': it contains an Ordered dict with table to create as keys, and a len 2 tuple as value, where value[0] are the columns definitions and value[1] are the table constraints
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	44 # - 'INSERT': it contains an Ordered dict with table where values have to be inserted, and many tuples containing values to insert in the order of the rows (#TODO: manage named columns)
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	45 # an update data dict (the ones with a number) can contains the keys 'create', 'delete', 'cols create', 'cols delete', 'cols modify', 'insert' or 'specific'. See Updater.generateUpdateData for more infos. This method can be used to autogenerate update_data, to ease the work of the developers.
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	46
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	47 DATABASE_SCHEMAS = {
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	48 "current": {'CREATE': OrderedDict((
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	49 ('profiles', (("id INTEGER PRIMARY KEY ASC", "name TEXT"),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	50 ("UNIQUE (name)",))),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	51 ('message_types', (("type TEXT PRIMARY KEY",),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	52 tuple())),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	53 ('history', (("id INTEGER PRIMARY KEY ASC", "profile_id INTEGER", "source TEXT", "dest TEXT", "source_res TEXT", "dest_res TEXT", "timestamp DATETIME", "message TEXT", "type TEXT", "extra BLOB"),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	54 ("FOREIGN KEY(profile_id) REFERENCES profiles(id) ON DELETE CASCADE", "FOREIGN KEY(type) REFERENCES message_types(type)"))),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	55 ('param_gen', (("category TEXT", "name TEXT", "value TEXT"),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	56 ("PRIMARY KEY (category,name)",))),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	57 ('param_ind', (("category TEXT", "name TEXT", "profile_id INTEGER", "value TEXT"),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	58 ("PRIMARY KEY (category,name,profile_id)", "FOREIGN KEY(profile_id) REFERENCES profiles(id) ON DELETE CASCADE"))),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	59 ('private_gen', (("namespace TEXT", "key TEXT", "value TEXT"),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	60 ("PRIMARY KEY (namespace, key)",))),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	61 ('private_ind', (("namespace TEXT", "key TEXT", "profile_id INTEGER", "value TEXT"),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	62 ("PRIMARY KEY (namespace, key, profile_id)", "FOREIGN KEY(profile_id) REFERENCES profiles(id) ON DELETE CASCADE"))),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	63 ('private_gen_bin', (("namespace TEXT", "key TEXT", "value BLOB"),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	64 ("PRIMARY KEY (namespace, key)",))),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	65 ('private_ind_bin', (("namespace TEXT", "key TEXT", "profile_id INTEGER", "value BLOB"),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	66 ("PRIMARY KEY (namespace, key, profile_id)", "FOREIGN KEY(profile_id) REFERENCES profiles(id) ON DELETE CASCADE")))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	67 )),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	68 'INSERT': OrderedDict((
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	69 ('message_types', (("'chat'",), ("'error'",), ("'groupchat'",), ("'headline'",), ("'normal'",))),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	70 )),
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	71 },
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	72 2: {'specific': 'update2raw_v2'
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	73 },
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	74 1: {'cols create': {'history': ('extra BLOB',)}
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	75 },
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	76 }
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	77
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	78
588 beaf6bec2fcd Remove every old-style class. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	79 class SqliteStorage(object):
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	80 """This class manage storage with Sqlite database"""
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	81
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	82 def __init__(self, db_filename, sat_version):
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	83 """Connect to the given database
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	84 @param db_filename: full path to the Sqlite database"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	85 self.initialized = defer.Deferred() # triggered when memory is fully initialised and ready
e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	86 self.profiles = {} # we keep cache for the profiles (key: profile name, value: profile id)
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	87
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	88 log.info(_("Connecting database"))
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	89 new_base = not os.path.exists(db_filename) # do we have to create the database ?
936 6404df5305e3 memory: be sure that local_dir exists before creating a new database souliane <souliane@mailoo.org> parents: 934 diff changeset	90 if new_base: # the dir may not exist if it's not the XDG recommended one
6404df5305e3 memory: be sure that local_dir exists before creating a new database souliane <souliane@mailoo.org> parents: 934 diff changeset	91 dir_ = os.path.dirname(db_filename)
6404df5305e3 memory: be sure that local_dir exists before creating a new database souliane <souliane@mailoo.org> parents: 934 diff changeset	92 if not os.path.exists(dir_):
6404df5305e3 memory: be sure that local_dir exists before creating a new database souliane <souliane@mailoo.org> parents: 934 diff changeset	93 os.makedirs(dir_, 0700)
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	94 self.dbpool = adbapi.ConnectionPool("sqlite3", db_filename, check_same_thread=False)
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	95
624 70988f08d0ad core: fixed bad database creation on first run in sqlite storage Goffi <goffi@goffi.org> parents: 609 diff changeset	96 # init_defer is the initialisation deferred, initialisation is ok when all its callbacks have been done
934 34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	97 # XXX: foreign_keys activation doesn't seem to work, probably because of the multi-threading
34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	98 # All the requests that need to use this feature should be run with runInteraction instead,
34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	99 # so you can set the PRAGMA as it is done in self.deleteProfile
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	100 init_defer = self.dbpool.runOperation("PRAGMA foreign_keys = ON").addErrback(lambda x: log.error(_("Can't activate foreign keys")))
624 70988f08d0ad core: fixed bad database creation on first run in sqlite storage Goffi <goffi@goffi.org> parents: 609 diff changeset	101
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	102 def getNewBaseSql():
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	103 log.info(_("The database is new, creating the tables"))
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	104 database_creation = ["PRAGMA user_version=%d" % CURRENT_DB_VERSION]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	105 database_creation.extend(Updater.createData2Raw(DATABASE_SCHEMAS['current']['CREATE']))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	106 database_creation.extend(Updater.insertData2Raw(DATABASE_SCHEMAS['current']['INSERT']))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	107 return database_creation
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	108
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	109 def getUpdateSql():
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	110 updater = Updater(self.dbpool, sat_version)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	111 return updater.checkUpdates()
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	112
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	113 def commitStatements(statements):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	114
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	115 if statements is None:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	116 return defer.succeed(None)
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	117 log.debug("===== COMMITING STATEMENTS =====\n%s\n============\n\n" % '\n'.join(statements))
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	118 d = self.dbpool.runInteraction(self._updateDb, tuple(statements))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	119 return d
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	120
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	121 init_defer.addCallback(lambda ignore: getNewBaseSql() if new_base else getUpdateSql())
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	122 init_defer.addCallback(commitStatements)
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	123
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	124 def fillProfileCache(ignore):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	125 d = self.dbpool.runQuery("SELECT name,id FROM profiles").addCallback(self._profilesCache)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	126 d.chainDeferred(self.initialized)
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	127
624 70988f08d0ad core: fixed bad database creation on first run in sqlite storage Goffi <goffi@goffi.org> parents: 609 diff changeset	128 init_defer.addCallback(fillProfileCache)
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	129
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	130 def _updateDb(self, interaction, statements):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	131 for statement in statements:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	132 interaction.execute(statement)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	133
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	134 #Profiles
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	135 def _profilesCache(self, profiles_result):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	136 """Fill the profiles cache
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	137 @param profiles_result: result of the sql profiles query"""
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	138 for profile in profiles_result:
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	139 name, id_ = profile
e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	140 self.profiles[name] = id_
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	141
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	142 def getProfilesList(self):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	143 """"Return list of all registered profiles"""
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	144 return self.profiles.keys()
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	145
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	146 def hasProfile(self, profile_name):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	147 """return True if profile_name exists
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	148 @param profile_name: name of the profile to check"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	149 return profile_name in self.profiles
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	150
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	151 def createProfile(self, name):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	152 """Create a new profile
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	153 @param name: name of the profile
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	154 @return: deferred triggered once profile is actually created"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	155
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	156 def getProfileId(ignore):
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	157 return self.dbpool.runQuery("SELECT (id) FROM profiles WHERE name = ?", (name, ))
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	158
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	159 def profile_created(profile_id):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	160 _id = profile_id[0][0]
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	161 self.profiles[name] = _id # we synchronise the cache
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	162
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	163 d = self.dbpool.runQuery("INSERT INTO profiles(name) VALUES (?)", (name, ))
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	164 d.addCallback(getProfileId)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	165 d.addCallback(profile_created)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	166 return d
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	167
420 acd908528ef7 core: profile creation/deletion through database Goffi <goffi@goffi.org> parents: 416 diff changeset	168 def deleteProfile(self, name):
acd908528ef7 core: profile creation/deletion through database Goffi <goffi@goffi.org> parents: 416 diff changeset	169 """Delete profile
acd908528ef7 core: profile creation/deletion through database Goffi <goffi@goffi.org> parents: 416 diff changeset	170 @param name: name of the profile
acd908528ef7 core: profile creation/deletion through database Goffi <goffi@goffi.org> parents: 416 diff changeset	171 @return: deferred triggered once profile is actually deleted"""
acd908528ef7 core: profile creation/deletion through database Goffi <goffi@goffi.org> parents: 416 diff changeset	172 def deletionError(failure):
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	173 log.error(_("Can't delete profile [%s]") % name)
420 acd908528ef7 core: profile creation/deletion through database Goffi <goffi@goffi.org> parents: 416 diff changeset	174 return failure
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	175
934 34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	176 def delete(txn):
34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	177 del self.profiles[name]
34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	178 txn.execute("PRAGMA foreign_keys = ON")
34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	179 txn.execute("DELETE FROM profiles WHERE name = ?", (name,))
34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	180 return None
34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	181
34dd9287dfe5 plugin account: bug fix profile deletion from the database + unsubscribe the contacts souliane <souliane@mailoo.org> parents: 853 diff changeset	182 d = self.dbpool.runInteraction(delete)
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	183 d.addCallback(lambda ignore: log.info(_("Profile [%s] deleted") % name))
593 70bae685d05c core: added forgotten errback in sqlite's deleteProfile Goffi <goffi@goffi.org> parents: 592 diff changeset	184 d.addErrback(deletionError)
420 acd908528ef7 core: profile creation/deletion through database Goffi <goffi@goffi.org> parents: 416 diff changeset	185 return d
acd908528ef7 core: profile creation/deletion through database Goffi <goffi@goffi.org> parents: 416 diff changeset	186
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	187 #Params
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	188 def loadGenParams(self, params_gen):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	189 """Load general parameters
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	190 @param params_gen: dictionary to fill
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	191 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	192
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	193 def fillParams(result):
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	194 for param in result:
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	195 category, name, value = param
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	196 params_gen[(category, name)] = value
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	197 log.debug(_("loading general parameters from database"))
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	198 return self.dbpool.runQuery("SELECT category,name,value FROM param_gen").addCallback(fillParams)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	199
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	200 def loadIndParams(self, params_ind, profile):
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	201 """Load individual parameters
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	202 @param params_ind: dictionary to fill
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	203 @param profile: a profile which must exist
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	204 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	205
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	206 def fillParams(result):
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	207 for param in result:
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	208 category, name, value = param
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 420 diff changeset	209 params_ind[(category, name)] = value
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	210 log.debug(_("loading individual parameters from database"))
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	211 d = self.dbpool.runQuery("SELECT category,name,value FROM param_ind WHERE profile_id=?", (self.profiles[profile], ))
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	212 d.addCallback(fillParams)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	213 return d
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	214
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	215 def getIndParam(self, category, name, profile):
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	216 """Ask database for the value of one specific individual parameter
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	217 @param category: category of the parameter
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	218 @param name: name of the parameter
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	219 @param profile: %(doc_profile)s
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	220 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	221 d = self.dbpool.runQuery("SELECT value FROM param_ind WHERE category=? AND name=? AND profile_id=?", (category, name, self.profiles[profile]))
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	222 d.addCallback(self.__getFirstResult)
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	223 return d
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	224
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	225 def setGenParam(self, category, name, value):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	226 """Save the general parameters in database
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	227 @param category: category of the parameter
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	228 @param name: name of the parameter
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	229 @param value: value to set
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	230 @return: deferred"""
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	231 d = self.dbpool.runQuery("REPLACE INTO param_gen(category,name,value) VALUES (?,?,?)", (category, name, value))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	232 d.addErrback(lambda ignore: log.error(_("Can't set general parameter (%(category)s/%(name)s) in database" % {"category": category, "name": name})))
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	233 return d
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	234
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	235 def setIndParam(self, category, name, value, profile):
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	236 """Save the individual parameters in database
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	237 @param category: category of the parameter
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	238 @param name: name of the parameter
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	239 @param value: value to set
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	240 @param profile: a profile which must exist
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	241 @return: deferred"""
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	242 d = self.dbpool.runQuery("REPLACE INTO param_ind(category,name,profile_id,value) VALUES (?,?,?,?)", (category, name, self.profiles[profile], value))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	243 d.addErrback(lambda ignore: log.error(_("Can't set individual parameter (%(category)s/%(name)s) for [%(profile)s] in database" % {"category": category, "name": name, "profile": profile})))
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: diff changeset	244 return d
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	245
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	246 #History
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	247 def addToHistory(self, from_jid, to_jid, message, _type='chat', extra=None, timestamp=None, profile=None):
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	248 """Store a new message in history
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	249 @param from_jid: full source JID
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	250 @param to_jid: full dest JID
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	251 @param message: message
512 862c0d6ab974 core, bridge, quick_frontend: MUC private messages history management: Goffi <goffi@goffi.org> parents: 480 diff changeset	252 @param _type: message type (see RFC 6121 §5.2.2)
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	253 @param extra: dictionary (keys and values are unicode) of extra message data
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	254 @param timestamp: timestamp in seconds since epoch, or None to use current time
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	255 """
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 512 diff changeset	256 assert(profile)
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	257 if extra is None:
ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	258 extra = {}
839 f8681a7fd834 memory (sqlite): the result of pickle.dumps in addToHistory must be encoded for the special characters to be stored. souliane <souliane@mailoo.org> parents: 811 diff changeset	259 extra_ = pickle.dumps({k: v.encode('utf-8') for k, v in extra.items()}, 0).decode('utf-8')
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	260 d = self.dbpool.runQuery("INSERT INTO history(source, source_res, dest, dest_res, timestamp, message, type, extra, profile_id) VALUES (?,?,?,?,?,?,?,?,?)",
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	261 (from_jid.userhost(), from_jid.resource, to_jid.userhost(), to_jid.resource, timestamp or time(),
839 f8681a7fd834 memory (sqlite): the result of pickle.dumps in addToHistory must be encoded for the special characters to be stored. souliane <souliane@mailoo.org> parents: 811 diff changeset	262 message, _type, extra_, self.profiles[profile]))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	263 d.addErrback(lambda ignore: log.error(_("Can't save following message in history: from [%(from_jid)s] to [%(to_jid)s] ==> [%(message)s]" %
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	264 {"from_jid": from_jid.full(), "to_jid": to_jid.full(), "message": message})))
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	265 return d
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	266
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 512 diff changeset	267 def getHistory(self, from_jid, to_jid, limit=0, between=True, profile=None):
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	268 """Store a new message in history
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	269 @param from_jid: source JID (full, or bare for catchall
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	270 @param to_jid: dest JID (full, or bare for catchall
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	271 @param size: maximum number of messages to get, or 0 for unlimited
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	272 """
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 512 diff changeset	273 assert(profile)
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	274
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	275 def sqliteToList(query_result):
448 17c7e48bf68f core: - history management improved Goffi <goffi@goffi.org> parents: 441 diff changeset	276 query_result.reverse()
17c7e48bf68f core: - history management improved Goffi <goffi@goffi.org> parents: 441 diff changeset	277 result = []
17c7e48bf68f core: - history management improved Goffi <goffi@goffi.org> parents: 441 diff changeset	278 for row in query_result:
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	279 timestamp, source, source_res, dest, dest_res, message, type_, extra_raw = row
ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	280 try:
ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	281 extra = pickle.loads(str(extra_raw or ""))
ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	282 except EOFError:
ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	283 extra = {}
448 17c7e48bf68f core: - history management improved Goffi <goffi@goffi.org> parents: 441 diff changeset	284 result.append((timestamp, "%s/%s" % (source, source_res) if source_res else source,
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	285 "%s/%s" % (dest, dest_res) if dest_res else dest,
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	286 message, type_, extra))
448 17c7e48bf68f core: - history management improved Goffi <goffi@goffi.org> parents: 441 diff changeset	287 return result
512 862c0d6ab974 core, bridge, quick_frontend: MUC private messages history management: Goffi <goffi@goffi.org> parents: 480 diff changeset	288
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	289 query_parts = ["SELECT timestamp, source, source_res, dest, dest_res, message, type, extra FROM history WHERE profile_id=? AND"]
538 2c4016921403 core, frontends, bridgen plugins: fixed methods which were unproperly managing multi-profiles Goffi <goffi@goffi.org> parents: 512 diff changeset	290 values = [self.profiles[profile]]
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	291
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	292 def test_jid(type_, _jid):
512 862c0d6ab974 core, bridge, quick_frontend: MUC private messages history management: Goffi <goffi@goffi.org> parents: 480 diff changeset	293 values.append(_jid.userhost())
862c0d6ab974 core, bridge, quick_frontend: MUC private messages history management: Goffi <goffi@goffi.org> parents: 480 diff changeset	294 if _jid.resource:
862c0d6ab974 core, bridge, quick_frontend: MUC private messages history management: Goffi <goffi@goffi.org> parents: 480 diff changeset	295 values.append(_jid.resource)
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	296 return '(%s=? AND %s_res=?)' % (type_, type_)
ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	297 return '%s=?' % (type_, )
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	298
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	299 if between:
681 66633443bcd7 memory: fixed getHistory behavior when parameter between=True: souliane <souliane@mailoo.org> parents: 669 diff changeset	300 query_parts.append("((%s AND %s) OR (%s AND %s))" % (test_jid('source', from_jid),
66633443bcd7 memory: fixed getHistory behavior when parameter between=True: souliane <souliane@mailoo.org> parents: 669 diff changeset	301 test_jid('dest', to_jid),
66633443bcd7 memory: fixed getHistory behavior when parameter between=True: souliane <souliane@mailoo.org> parents: 669 diff changeset	302 test_jid('source', to_jid),
66633443bcd7 memory: fixed getHistory behavior when parameter between=True: souliane <souliane@mailoo.org> parents: 669 diff changeset	303 test_jid('dest', from_jid)))
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	304 else:
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	305 query_parts.append("%s AND %s" % (test_jid('source', from_jid),
e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	306 test_jid('dest', to_jid)))
448 17c7e48bf68f core: - history management improved Goffi <goffi@goffi.org> parents: 441 diff changeset	307
17c7e48bf68f core: - history management improved Goffi <goffi@goffi.org> parents: 441 diff changeset	308 query_parts.append("ORDER BY timestamp DESC")
17c7e48bf68f core: - history management improved Goffi <goffi@goffi.org> parents: 441 diff changeset	309
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	310 if limit:
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	311 query_parts.append("LIMIT ?")
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	312 values.append(limit)
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	313
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	314 d = self.dbpool.runQuery(" ".join(query_parts), values)
669 ffb716804580 core, bridge: extra parameter is saved in history: Goffi <goffi@goffi.org> parents: 624 diff changeset	315 return d.addCallback(sqliteToList)
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	316
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	317 #Private values
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	318 def loadGenPrivates(self, private_gen, namespace):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	319 """Load general private values
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	320 @param private_gen: dictionary to fill
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	321 @param namespace: namespace of the values
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	322 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	323
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	324 def fillPrivates(result):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	325 for private in result:
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	326 key, value = private
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	327 private_gen[key] = value
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	328 log.debug(_("loading general private values [namespace: %s] from database") % (namespace, ))
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	329 d = self.dbpool.runQuery("SELECT key,value FROM private_gen WHERE namespace=?", (namespace, )).addCallback(fillPrivates)
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	330 return d.addErrback(lambda x: log.debug(_("No data present in database for namespace %s") % namespace))
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 423 diff changeset	331
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	332 def loadIndPrivates(self, private_ind, namespace, profile):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	333 """Load individual private values
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	334 @param privates_ind: dictionary to fill
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	335 @param namespace: namespace of the values
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	336 @param profile: a profile which must exist
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	337 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	338
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	339 def fillPrivates(result):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	340 for private in result:
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	341 key, value = private
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	342 private_ind[key] = value
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	343 log.debug(_("loading individual private values [namespace: %s] from database") % (namespace, ))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	344 d = self.dbpool.runQuery("SELECT key,value FROM private_ind WHERE namespace=? AND profile_id=?", (namespace, self.profiles[profile]))
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	345 d.addCallback(fillPrivates)
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	346 return d.addErrback(lambda x: log.debug(_("No data present in database for namespace %s") % namespace))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	347
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	348 def setGenPrivate(self, namespace, key, value):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	349 """Save the general private value in database
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	350 @param category: category of the privateeter
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	351 @param key: key of the private value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	352 @param value: value to set
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	353 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	354 d = self.dbpool.runQuery("REPLACE INTO private_gen(namespace,key,value) VALUES (?,?,?)", (namespace, key, value))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	355 d.addErrback(lambda ignore: log.error(_("Can't set general private value (%(key)s) [namespace:%(namespace)s] in database" %
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	356 {"namespace": namespace, "key": key})))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	357 return d
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	358
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	359 def setIndPrivate(self, namespace, key, value, profile):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	360 """Save the individual private value in database
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	361 @param namespace: namespace of the value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	362 @param key: key of the private value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	363 @param value: value to set
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	364 @param profile: a profile which must exist
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	365 @return: deferred"""
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	366 d = self.dbpool.runQuery("REPLACE INTO private_ind(namespace,key,profile_id,value) VALUES (?,?,?,?)", (namespace, key, self.profiles[profile], value))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	367 d.addErrback(lambda ignore: log.error(_("Can't set individual private value (%(key)s) [namespace: %(namespace)s] for [%(profile)s] in database" %
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	368 {"namespace": namespace, "key": key, "profile": profile})))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	369 return d
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	370
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	371 def delGenPrivate(self, namespace, key):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	372 """Delete the general private value from database
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	373 @param category: category of the privateeter
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	374 @param key: key of the private value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	375 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	376 d = self.dbpool.runQuery("DELETE FROM private_gen WHERE namespace=? AND key=?", (namespace, key))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	377 d.addErrback(lambda ignore: log.error(_("Can't delete general private value (%(key)s) [namespace:%(namespace)s] in database" %
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	378 {"namespace": namespace, "key": key})))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	379 return d
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	380
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	381 def delIndPrivate(self, namespace, key, profile):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	382 """Delete the individual private value from database
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	383 @param namespace: namespace of the value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	384 @param key: key of the private value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	385 @param profile: a profile which must exist
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	386 @return: deferred"""
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	387 d = self.dbpool.runQuery("DELETE FROM private_ind WHERE namespace=? AND key=? AND profile=?)", (namespace, key, self.profiles[profile]))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	388 d.addErrback(lambda ignore: log.error(_("Can't delete individual private value (%(key)s) [namespace: %(namespace)s] for [%(profile)s] in database" %
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	389 {"namespace": namespace, "key": key, "profile": profile})))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	390 return d
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	391
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	392 def loadGenPrivatesBinary(self, private_gen, namespace):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	393 """Load general private binary values
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	394 @param private_gen: dictionary to fill
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	395 @param namespace: namespace of the values
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	396 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	397
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	398 def fillPrivates(result):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	399 for private in result:
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	400 key, value = private
436 5e9d28ca5109 core: sqlite persistentBinaryDict storage fix Goffi <goffi@goffi.org> parents: 432 diff changeset	401 private_gen[key] = pickle.loads(str(value))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	402 log.debug(_("loading general private binary values [namespace: %s] from database") % (namespace, ))
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	403 d = self.dbpool.runQuery("SELECT key,value FROM private_gen_bin WHERE namespace=?", (namespace, )).addCallback(fillPrivates)
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	404 return d.addErrback(lambda x: log.debug(_("No binary data present in database for namespace %s") % namespace))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	405
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	406 def loadIndPrivatesBinary(self, private_ind, namespace, profile):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	407 """Load individual private binary values
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	408 @param privates_ind: dictionary to fill
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	409 @param namespace: namespace of the values
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	410 @param profile: a profile which must exist
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	411 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	412
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	413 def fillPrivates(result):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	414 for private in result:
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	415 key, value = private
436 5e9d28ca5109 core: sqlite persistentBinaryDict storage fix Goffi <goffi@goffi.org> parents: 432 diff changeset	416 private_ind[key] = pickle.loads(str(value))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	417 log.debug(_("loading individual private binary values [namespace: %s] from database") % (namespace, ))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	418 d = self.dbpool.runQuery("SELECT key,value FROM private_ind_bin WHERE namespace=? AND profile_id=?", (namespace, self.profiles[profile]))
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	419 d.addCallback(fillPrivates)
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	420 return d.addErrback(lambda x: log.debug(_("No binary data present in database for namespace %s") % namespace))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	421
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	422 def setGenPrivateBinary(self, namespace, key, value):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	423 """Save the general private binary value in database
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	424 @param category: category of the privateeter
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	425 @param key: key of the private value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	426 @param value: value to set
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	427 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	428 d = self.dbpool.runQuery("REPLACE INTO private_gen_bin(namespace,key,value) VALUES (?,?,?)", (namespace, key, pickle.dumps(value, 0)))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	429 d.addErrback(lambda ignore: log.error(_("Can't set general private binary value (%(key)s) [namespace:%(namespace)s] in database" %
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	430 {"namespace": namespace, "key": key})))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	431 return d
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	432
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	433 def setIndPrivateBinary(self, namespace, key, value, profile):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	434 """Save the individual private binary value in database
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	435 @param namespace: namespace of the value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	436 @param key: key of the private value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	437 @param value: value to set
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	438 @param profile: a profile which must exist
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	439 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	440 d = self.dbpool.runQuery("REPLACE INTO private_ind_bin(namespace,key,profile_id,value) VALUES (?,?,?,?)", (namespace, key, self.profiles[profile], pickle.dumps(value, 0)))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	441 d.addErrback(lambda ignore: log.error(_("Can't set individual binary private value (%(key)s) [namespace: %(namespace)s] for [%(profile)s] in database" %
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	442 {"namespace": namespace, "key": key, "profile": profile})))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	443 return d
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	444
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	445 def delGenPrivateBinary(self, namespace, key):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	446 """Delete the general private binary value from database
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	447 @param category: category of the privateeter
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	448 @param key: key of the private value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	449 @return: deferred"""
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	450 d = self.dbpool.runQuery("DELETE FROM private_gen_bin WHERE namespace=? AND key=?", (namespace, key))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	451 d.addErrback(lambda ignore: log.error(_("Can't delete general private binary value (%(key)s) [namespace:%(namespace)s] in database" %
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	452 {"namespace": namespace, "key": key})))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	453 return d
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	454
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	455 def delIndPrivateBinary(self, namespace, key, profile):
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	456 """Delete the individual private binary value from database
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	457 @param namespace: namespace of the value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	458 @param key: key of the private value
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	459 @param profile: a profile which must exist
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	460 @return: deferred"""
31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	461 d = self.dbpool.runQuery("DELETE FROM private_ind_bin WHERE namespace=? AND key=? AND profile=?)", (namespace, key, self.profiles[profile]))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	462 d.addErrback(lambda ignore: log.error(_("Can't delete individual private binary value (%(key)s) [namespace: %(namespace)s] for [%(profile)s] in database" %
592 e5a875a3311b Fix pep8 support in src/memory. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	463 {"namespace": namespace, "key": key, "profile": profile})))
432 31e8c48b5f5d core: - memory refactoring (moved memory.py and sqlite.py from tools to memory) Goffi <goffi@goffi.org> parents: 425 diff changeset	464 return d
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	465 ##Helper methods##
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	466
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	467 def __getFirstResult(self, result):
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	468 """Return the first result of a database query
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	469 Useful when we are looking for one specific value"""
416 32dc8b18c2ae core: param loading/purging on profile connection/disconnection Goffi <goffi@goffi.org> parents: 413 diff changeset	470 return None if not result else result[0][0]
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	471
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	472
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	473 class Updater(object):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	474 stmnt_regex = re.compile(r"(?:[\w ]+(?:$[\w, ]+$)?)+")
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	475 clean_regex = re.compile(r"^ +\|(?<= ) +\|(?<=,) +\| +$")
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	476 CREATE_SQL = "CREATE TABLE %s (%s)"
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	477 INSERT_SQL = "INSERT INTO %s VALUES (%s)"
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	478 DROP_SQL = "DROP TABLE %s"
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	479 ALTER_SQL = "ALTER TABLE %s ADD COLUMN %s"
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	480 RENAME_TABLE_SQL = "ALTER TABLE %s RENAME TO %s"
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	481
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	482 CONSTRAINTS = ('PRIMARY', 'UNIQUE', 'CHECK', 'FOREIGN')
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	483 TMP_TABLE = "tmp_sat_update"
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	484
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	485 def __init__(self, dbpool, sat_version):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	486 self._sat_version = sat_version
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	487 self.dbpool = dbpool
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	488
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	489 def getLocalVersion(self):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	490 """ Get local database version
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	491 @return: version (int)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	492
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	493 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	494 return self.dbpool.runQuery("PRAGMA user_version").addCallback(lambda ret: int(ret[0][0]))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	495
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	496 def _setLocalVersion(self, version):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	497 """ Set local database version
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	498 @param version: version (int)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	499 @return: deferred
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	500
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	501 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	502 return self.dbpool.runOperation("PRAGMA user_version=%d" % version)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	503
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	504 def getLocalSchema(self):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	505 """ return raw local schema
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	506 @return: list of strings with CREATE sql statements for local database
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	507
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	508 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	509 d = self.dbpool.runQuery("select sql from sqlite_master where type = 'table'")
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	510 d.addCallback(lambda result: [row[0] for row in result])
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	511 return d
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	512
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	513 @defer.inlineCallbacks
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	514 def checkUpdates(self):
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	515 """ Check if a database schema/content update is needed, according to DATABASE_SCHEMAS
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	516 @return: deferred which fire a list of SQL update statements, or None if no update is needed
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	517
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	518 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	519 local_version = yield self.getLocalVersion()
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	520 raw_local_sch = yield self.getLocalSchema()
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	521 local_sch = self.rawStatements2data(raw_local_sch)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	522 current_sch = DATABASE_SCHEMAS['current']['CREATE']
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	523 local_hash = self.statementHash(local_sch)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	524 current_hash = self.statementHash(current_sch)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	525
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	526 # Force the update if the schemas are unchanged but a specific update is needed
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	527 force_update = local_hash == current_hash and local_version < CURRENT_DB_VERSION \
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	528 and 'specific' in DATABASE_SCHEMAS[CURRENT_DB_VERSION]
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	529
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	530 if local_hash == current_hash and not force_update:
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	531 if local_version != CURRENT_DB_VERSION:
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	532 log.warning(_("Your local schema is up-to-date, but database versions mismatch, fixing it..."))
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	533 yield self._setLocalVersion(CURRENT_DB_VERSION)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	534 else:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	535 # an update is needed
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	536
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	537 if local_version == CURRENT_DB_VERSION:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	538 # Database mismatch and we have the latest version
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	539 if self._sat_version.endswith('D'):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	540 # we are in a development version
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	541 update_data = self.generateUpdateData(local_sch, current_sch, False)
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	542 log.warning(_("There is a schema mismatch, but as we are on a dev version, database will be updated"))
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	543 update_raw = yield self.update2raw(update_data, True)
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	544 defer.returnValue(update_raw)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	545 else:
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	546 log.error(_(u"schema version is up-to-date, but local schema differ from expected current schema"))
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	547 update_data = self.generateUpdateData(local_sch, current_sch, True)
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	548 update_raw = yield self.update2raw(update_data)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	549 log.warning(_(u"Here are the commands that should fix the situation, use at your own risk (do a backup before modifying database), you can go to SàT's MUC room at sat@chat.jabberfr.org for help\n### SQL###\n%s\n### END SQL ###\n") % u'\n'.join("%s;" % statement for statement in update_raw))
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	550 raise exceptions.DatabaseError("Database mismatch")
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	551 else:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	552 # Database is not up-to-date, we'll do the update
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	553 if force_update:
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	554 log.info(_("Database content needs a specific processing, local database will be updated"))
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	555 else:
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	556 log.info(_("Database schema has changed, local database will be updated"))
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	557 update_raw = []
1019 6a16ec17a458 better PEP-8 compliance souliane <souliane@mailoo.org> parents: 993 diff changeset	558 for version in xrange(local_version + 1, CURRENT_DB_VERSION + 1):
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	559 try:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	560 update_data = DATABASE_SCHEMAS[version]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	561 except KeyError:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	562 raise exceptions.InternalError("Missing update definition (version %d)" % version)
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	563 update_raw_step = yield self.update2raw(update_data)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	564 update_raw.extend(update_raw_step)
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	565 update_raw.append("PRAGMA user_version=%d" % CURRENT_DB_VERSION)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	566 defer.returnValue(update_raw)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	567
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	568 @staticmethod
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	569 def createData2Raw(data):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	570 """ Generate SQL statements from statements data
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	571 @param data: dictionary with table as key, and statements data in tuples as value
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	572 @return: list of strings with raw statements
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	573
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	574 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	575 ret = []
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	576 for table in data:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	577 defs, constraints = data[table]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	578 assert isinstance(defs, tuple)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	579 assert isinstance(constraints, tuple)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	580 ret.append(Updater.CREATE_SQL % (table, ', '.join(defs + constraints)))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	581 return ret
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	582
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	583 @staticmethod
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	584 def insertData2Raw(data):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	585 """ Generate SQL statements from statements data
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	586 @param data: dictionary with table as key, and statements data in tuples as value
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	587 @return: list of strings with raw statements
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	588
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	589 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	590 ret = []
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	591 for table in data:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	592 values_tuple = data[table]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	593 assert isinstance(values_tuple, tuple)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	594 for values in values_tuple:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	595 assert isinstance(values, tuple)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	596 ret.append(Updater.INSERT_SQL % (table, ', '.join(values)))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	597 return ret
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	598
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	599 def statementHash(self, data):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	600 """ Generate hash of template data
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	601 useful to compare schemas
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	602
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	603 @param data: dictionary of "CREATE" statement, with tables names as key,
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	604 and tuples of (col_defs, constraints) as values
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	605 @return: hash as string
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	606 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	607 hash_ = hashlib.sha1()
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	608 tables = data.keys()
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	609 tables.sort()
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	610
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	611 def stmnts2str(stmts):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	612 return ','.join([self.clean_regex.sub('',stmt) for stmt in sorted(stmts)])
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	613
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	614 for table in tables:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	615 col_defs, col_constr = data[table]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	616 hash_.update("%s:%s:%s" % (table, stmnts2str(col_defs), stmnts2str(col_constr)))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	617 return hash_.digest()
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	618
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	619 def rawStatements2data(self, raw_statements):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	620 """ separate "CREATE" statements into dictionary/tuples data
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	621 @param raw_statements: list of CREATE statements as strings
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	622 @return: dictionary with table names as key, and a (col_defs, constraints) tuple
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	623
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	624 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	625 schema_dict = {}
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	626 for create_statement in raw_statements:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	627 if not create_statement.startswith("CREATE TABLE "):
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	628 log.warning("Unexpected statement, ignoring it")
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	629 continue
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	630 _create_statement = create_statement[13:]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	631 table, raw_col_stats = _create_statement.split(' ',1)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	632 if raw_col_stats[0] != '(' or raw_col_stats[-1] != ')':
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	633 log.warning("Unexpected statement structure, ignoring it")
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	634 continue
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	635 col_stats = [stmt.strip() for stmt in self.stmnt_regex.findall(raw_col_stats[1:-1])]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	636 col_defs = []
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	637 constraints = []
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	638 for col_stat in col_stats:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	639 name = col_stat.split(' ',1)[0]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	640 if name in self.CONSTRAINTS:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	641 constraints.append(col_stat)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	642 else:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	643 col_defs.append(col_stat)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	644 schema_dict[table] = (tuple(col_defs), tuple(constraints))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	645 return schema_dict
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	646
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	647 def generateUpdateData(self, old_data, new_data, modify=False):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	648 """ Generate data for automatic update between two schema data
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	649 @param old_data: data of the former schema (which must be updated)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	650 @param new_data: data of the current schema
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	651 @param modify: if True, always use "cols modify" table, else try to ALTER tables
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	652 @return: update data, a dictionary with:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	653 - 'create': dictionary of tables to create
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	654 - 'delete': tuple of tables to delete
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	655 - 'cols create': dictionary of columns to create (table as key, tuple of columns to create as value)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	656 - 'cols delete': dictionary of columns to delete (table as key, tuple of columns to delete as value)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	657 - 'cols modify': dictionary of columns to modify (table as key, tuple of old columns to transfert as value). With this table, a new table will be created, and content from the old table will be transfered to it, only cols specified in the tuple will be transfered.
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	658
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	659 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	660
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	661 create_tables_data = {}
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	662 create_cols_data = {}
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	663 modify_cols_data = {}
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	664 delete_cols_data = {}
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	665 old_tables = set(old_data.keys())
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	666 new_tables = set(new_data.keys())
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	667
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	668 def getChanges(set_olds, set_news):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	669 to_create = set_news.difference(set_olds)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	670 to_delete = set_olds.difference(set_news)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	671 to_check = set_news.intersection(set_olds)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	672 return tuple(to_create), tuple(to_delete), tuple(to_check)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	673
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	674 tables_to_create, tables_to_delete, tables_to_check = getChanges(old_tables, new_tables)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	675
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	676 for table in tables_to_create:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	677 create_tables_data[table] = new_data[table]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	678
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	679 for table in tables_to_check:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	680 old_col_defs, old_constraints = old_data[table]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	681 new_col_defs, new_constraints = new_data[table]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	682 for obj in old_col_defs, old_constraints, new_col_defs, new_constraints:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	683 if not isinstance(obj, tuple):
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	684 raise exceptions.InternalError("Columns definitions must be tuples")
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	685 defs_create, defs_delete, ignore = getChanges(set(old_col_defs), set(new_col_defs))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	686 constraints_create, constraints_delete, ignore = getChanges(set(old_constraints), set(new_constraints))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	687 created_col_names = set([name.split(' ',1)[0] for name in defs_create])
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	688 deleted_col_names = set([name.split(' ',1)[0] for name in defs_delete])
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	689 if (created_col_names.intersection(deleted_col_names or constraints_create or constraints_delete) or
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	690 (modify and (defs_create or constraints_create or defs_delete or constraints_delete))):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	691 # we have modified columns, we need to transfer table
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	692 # we determinate which columns are in both schema so we can transfer them
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	693 old_names = set([name.split(' ',1)[0] for name in old_col_defs])
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	694 new_names = set([name.split(' ',1)[0] for name in new_col_defs])
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	695 modify_cols_data[table] = tuple(old_names.intersection(new_names));
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	696 else:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	697 if defs_create:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	698 create_cols_data[table] = (defs_create)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	699 if defs_delete or constraints_delete:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	700 delete_cols_data[table] = (defs_delete)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	701
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	702 return {'create': create_tables_data,
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	703 'delete': tables_to_delete,
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	704 'cols create': create_cols_data,
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	705 'cols delete': delete_cols_data,
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	706 'cols modify': modify_cols_data
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	707 }
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	708
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	709 @defer.inlineCallbacks
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	710 def update2raw(self, update, dev_version=False):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	711 """ Transform update data to raw SQLite statements
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	712 @param upadte: update data as returned by generateUpdateData
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	713 @param dev_version: if True, update will be done in dev mode: no deletion will be done, instead a message will be shown. This prevent accidental lost of data while working on the code/database.
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	714 @return: list of string with SQL statements needed to update the base
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	715
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	716 """
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	717 ret = self.createData2Raw(update.get('create', {}))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	718 drop = []
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	719 for table in update.get('delete', tuple()):
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	720 drop.append(self.DROP_SQL % table)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	721 if dev_version:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	722 if drop:
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	723 log.info("Dev version, SQL NOT EXECUTED:\n--\n%s\n--\n" % "\n".join(drop))
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	724 else:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	725 ret.extend(drop)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	726
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	727 cols_create = update.get('cols create', {})
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	728 for table in cols_create:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	729 for col_def in cols_create[table]:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	730 ret.append(self.ALTER_SQL % (table, col_def))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	731
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	732 cols_delete = update.get('cols delete', {})
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	733 for table in cols_delete:
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 936 diff changeset	734 log.info("Following columns in table [%s] are not needed anymore, but are kept for dev version: %s" % (table, ", ".join(cols_delete[table])))
853 c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	735
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	736 cols_modify = update.get('cols modify', {})
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	737 for table in cols_modify:
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	738 ret.append(self.RENAME_TABLE_SQL % (table, self.TMP_TABLE))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	739 main, extra = DATABASE_SCHEMAS['current']['CREATE'][table]
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	740 ret.append(self.CREATE_SQL % (table, ', '.join(main + extra)))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	741 common_cols = ', '.join(cols_modify[table])
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	742 ret.append("INSERT INTO %s (%s) SELECT %s FROM %s" % (table, common_cols, common_cols, self.TMP_TABLE))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	743 ret.append(self.DROP_SQL % self.TMP_TABLE)
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	744
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	745 insert = update.get('insert', {})
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	746 ret.extend(self.insertData2Raw(insert))
c2f6ada7858f core (sqlite): automatic database update: Goffi <goffi@goffi.org> parents: 839 diff changeset	747
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	748 specific = update.get('specific', None)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	749 if specific:
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	750 cmds = yield getattr(self, specific)()
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	751 ret.extend(cmds)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	752 defer.returnValue(ret)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	753
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	754 def update2raw_v2(self):
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	755 """Update the database from v1 to v2 (add passwords encryptions):
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	756 - the XMPP password value is re-used for the profile password (new parameter)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	757 - the profile password is stored hashed
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	758 - the XMPP password is stored encrypted, with the profile password as key
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	759 - as there are no other stored passwords yet, it is enough, otherwise we
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	760 would need to encrypt the other passwords as it's done for XMPP password
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	761 """
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	762 xmpp_pass_path = ('Connection', 'Password')
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	763
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	764 def encrypt_values(values):
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	765 ret = []
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	766 list_ = []
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	767
1065 9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	768 def prepare_queries(result, xmpp_password):
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	769 try:
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	770 id_ = result[0][0]
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	771 except IndexError:
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	772 log.error("Profile of id %d is referenced in 'param_ind' but it doesn't exist!" % profile_id)
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	773 return
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	774
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	775 sat_password = xmpp_password
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	776 d1 = PasswordHasher.hash(sat_password)
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	777 personal_key = BlockCipher.getRandomKey(base64=True)
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	778 d2 = BlockCipher.encrypt(sat_password, personal_key)
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	779 d3 = BlockCipher.encrypt(personal_key, xmpp_password)
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	780
1065 9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	781 def gotValues(res):
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	782 sat_cipher, personal_cipher, xmpp_cipher = res[0][1], res[1][1], res[2][1]
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	783 ret.append("INSERT INTO param_ind(category,name,profile_id,value) VALUES ('%s','%s',%s,'%s')" %
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	784 (C.PROFILE_PASS_PATH[0], C.PROFILE_PASS_PATH[1], id_, sat_cipher))
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	785
1065 9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	786 ret.append("INSERT INTO private_ind(namespace,key,profile_id,value) VALUES ('%s','%s',%s,'%s')" %
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	787 (C.MEMORY_CRYPTO_NAMESPACE, C.MEMORY_CRYPTO_KEY, id_, personal_cipher))
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	788
1065 9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	789 ret.append("REPLACE INTO param_ind(category,name,profile_id,value) VALUES ('%s','%s',%s,'%s')" %
9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	790 (xmpp_pass_path[0], xmpp_pass_path[1], id_, xmpp_cipher))
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	791
1065 9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	792 return defer.DeferredList([d1, d2, d3]).addCallback(gotValues)
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	793
1065 9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	794 for profile_id, xmpp_password in values:
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	795 d = self.dbpool.runQuery("SELECT id FROM profiles WHERE id=?", (profile_id,))
1065 9378c80e3408 memory (sqlite): fixes upgrade to database v2 souliane <souliane@mailoo.org> parents: 1047 diff changeset	796 d.addCallback(prepare_queries, xmpp_password)
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	797 list_.append(d)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	798
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	799 d_list = defer.DeferredList(list_)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	800 d_list.addCallback(lambda dummy: ret)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	801 return d_list
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	802
1045 65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	803 def updateLiberviaConf(values):
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	804 try:
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	805 profile_id = values[0][0]
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	806 except IndexError:
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	807 return # no profile called "libervia"
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	808
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	809 def cb(selected):
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	810 try:
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	811 password = selected[0][0]
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	812 except IndexError:
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	813 log.error("Libervia profile exists but no password is set! Update Libervia configuration will be skipped.")
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	814 return
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	815 fixConfigOption('libervia', 'passphrase', password, False)
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	816 d = self.dbpool.runQuery("SELECT value FROM param_ind WHERE category=? AND name=? AND profile_id=?", xmpp_pass_path + (profile_id,))
1047 5f7f913c05ac memory: synchronize the upgrade to database v2 to be sure libervia's profile password is read to be written in the config file before its encryption souliane <souliane@mailoo.org> parents: 1045 diff changeset	817 return d.addCallback(cb)
1045 65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	818
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	819 d = self.dbpool.runQuery("SELECT id FROM profiles WHERE name='libervia'")
65fffdcb97f1 memory: auto-update configuration file with libervia's passphrase when migrating the database souliane <souliane@mailoo.org> parents: 1030 diff changeset	820 d.addCallback(updateLiberviaConf)
1047 5f7f913c05ac memory: synchronize the upgrade to database v2 to be sure libervia's profile password is read to be written in the config file before its encryption souliane <souliane@mailoo.org> parents: 1045 diff changeset	821 d.addCallback(lambda dummy: self.dbpool.runQuery("SELECT profile_id,value FROM param_ind WHERE category=? AND name=?", xmpp_pass_path))
1030 15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	822 d.addCallback(encrypt_values)
15f43b54d697 core, memory, bridge: added profile password + password encryption: souliane <souliane@mailoo.org> parents: 1019 diff changeset	823 return d

Mercurial > libervia-backend

annotate src/memory/sqlite.py @ 1072:d123d61976c8