libtransport.git Changeset - c0a01941fc10

Changeset - c0a01941fc10

Parent rev.

Child rev.

[Not reviewed]

0 5 0

HanzZ - 14 years ago 2011-05-19 17:53:31
hanzz.k@gmail.com

initial support for private storage

5 files changed with 37 insertions and 1 deletions:

include/transport/sqlite3backend.h

include/transport/storagebackend.h

include/transport/usermanager.h

src/sqlite3backend.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/transport/sqlite3backend.h

➞

Show inline comments

@@ @@ -81,12 +81,14 @@ class SQLite3Backend : public StorageBackend @@
 		long addBuddy(long userId, const BuddyInfo &buddyInfo);
 		void updateBuddy(long userId, const BuddyInfo &buddyInfo);
 		void removeBuddy(long id) {}
 		void getUserSetting(long userId, const std::string &variable, int &type, std::string &value);
 		void beginTransaction();
 		void commitTransaction();
 	private:
 		bool exec(const std::string &query);
@@ @@ -94,12 +96,14 @@ class SQLite3Backend : public StorageBackend @@
 		Config *m_config;
 		std::string m_prefix;
 		// statements
 		sqlite3_stmt *m_setUser;
 		sqlite3_stmt *m_getUser;
 		sqlite3_stmt *m_getUserSetting;
 		sqlite3_stmt *m_setUserSetting;
 		sqlite3_stmt *m_removeUser;
 		sqlite3_stmt *m_removeUserBuddies;
 		sqlite3_stmt *m_removeUserSettings;
 		sqlite3_stmt *m_removeUserBuddiesSettings;
 		sqlite3_stmt *m_addBuddy;
 		sqlite3_stmt *m_updateBuddy;

include/transport/storagebackend.h

➞

Show inline comments

@@ @@ -105,12 +105,14 @@ class StorageBackend @@
 		virtual bool getBuddies(long id, std::list<BuddyInfo> &roster) = 0;
 		virtual long addBuddy(long userId, const BuddyInfo &buddyInfo) = 0;
 		virtual void updateBuddy(long userId, const BuddyInfo &buddyInfo) = 0;
 		virtual void removeBuddy(long id) = 0;
 		virtual void getUserSetting(long userId, const std::string &variable, int &type, std::string &value) = 0;
 		virtual void beginTransaction() = 0;
 		virtual void commitTransaction() = 0;
 		/// onStorageError
 		boost::signal<void (const std::string &statement, const std::string &error)> onStorageError;

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -26,12 +26,13 @@ @@
 namespace Transport {
 class User;
 class Component;
 class StorageBackend;
 class StorageResponder;
 /// Manages online XMPP Users.
 /// This class handles presences and creates User classes when new user connects.
 /// It also removes the User class once the last user's resource disconnected.
 class UserManager {
@@ @@ -77,9 +78,10 @@ class UserManager { @@
 		long m_onlineBuddies;
 		User *m_cachedUser;
 		std::map<std::string, User *> m_users;
 		Component *m_component;
 		StorageBackend *m_storageBackend;
 		StorageResponder *m_storageResponder;
 };
+}

src/sqlite3backend.cpp

➞

Show inline comments

@@ @@ -82,12 +82,14 @@ SQLite3Backend::~SQLite3Backend(){ @@
 		FINALIZE_STMT(m_removeUserSettings);
 		FINALIZE_STMT(m_removeUserBuddiesSettings);
 		FINALIZE_STMT(m_addBuddy);
 		FINALIZE_STMT(m_updateBuddy);
 		FINALIZE_STMT(m_getBuddies);
 		FINALIZE_STMT(m_getBuddiesSettings);
 		FINALIZE_STMT(m_getUserSetting);
 		FINALIZE_STMT(m_setUserSetting);
 		sqlite3_close(m_db);
+	}
+}
 bool SQLite3Backend::connect() {
 	if (sqlite3_open(CONFIG_STRING(m_config, "database.database").c_str(), &m_db)) {
@@ @@ -107,12 +109,14 @@ bool SQLite3Backend::connect() { @@
 	PREP_STMT(m_removeUserBuddiesSettings, "DELETE FROM " + m_prefix + "buddies_settings WHERE user_id=?");
 	PREP_STMT(m_addBuddy, "INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)");
 	PREP_STMT(m_updateBuddy, "UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?");
 	PREP_STMT(m_getBuddies, "SELECT id uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=? ORDER BY id ASC");
 	PREP_STMT(m_getBuddiesSettings, "SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=? ORDER BY buddy_id ASC");
 	PREP_STMT(m_getUserSetting, "SELECT type, value FROM " + m_prefix + "users_settings WHERE user_id=? AND var=?");
 	PREP_STMT(m_setUserSetting, "INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES (?,?,?,?)");
 	return true;
+}
 bool SQLite3Backend::createDatabase() {
 	int not_exist = exec("CREATE TABLE " + m_prefix + "buddies ("
@@ @@ -154,13 +158,13 @@ bool SQLite3Backend::createDatabase() { @@
 		exec("CREATE UNIQUE INDEX IF NOT EXISTS jid ON " + m_prefix + "users (jid);");
 		exec("CREATE TABLE " + m_prefix + "users_settings ("
 					"  user_id int(10) NOT NULL,"
 					"  var varchar(50) NOT NULL,"
 					"  type int(4) NOT NULL,"
-					"  value varchar(255) NOT NULL,"
+					"  value varchar(4095) NOT NULL,"
 					"  PRIMARY KEY (user_id, var)"
 					");");
 		exec("CREATE INDEX IF NOT EXISTS user_id03 ON " + m_prefix + "users_settings (user_id);");
 		exec("CREATE TABLE IF NOT EXISTS " + m_prefix + "db_version ("
@@ @@ -352,12 +356,30 @@ bool SQLite3Backend::removeUser(long id) { @@
 		return false;
+	}
 	return true;
+}
 void SQLite3Backend::getUserSetting(long id, const std::string &variable, int &type, std::string &value) {
 	BEGIN(m_getUserSetting);
 	BIND_INT(m_getUserSetting, id);
 	BIND_STR(m_getUserSetting, variable);
 	if(sqlite3_step(m_setUser) != SQLITE_ROW) {
 		BEGIN(m_setUserSetting);
 		BIND_INT(m_setUserSetting, id);
 		BIND_STR(m_setUserSetting, variable);
 		BIND_INT(m_setUserSetting, type);
 		BIND_STR(m_setUserSetting, value);
 		EXECUTE_STATEMENT(m_setUserSetting, "m_setUserSetting");
+	}
 	else {
 		type = GET_INT(m_getUserSetting);
 		value = GET_STR(m_getUserSetting);
+	}
+}
 void SQLite3Backend::beginTransaction() {
 	exec("BEGIN TRANSACTION;");
+}
 void SQLite3Backend::commitTransaction() {
 	exec("COMMIT TRANSACTION;");

src/usermanager.cpp

➞

Show inline comments

@@ @@ -21,28 +21,34 @@ @@
 #include "transport/usermanager.h"
 #include "transport/user.h"
 #include "transport/transport.h"
 #include "transport/storagebackend.h"
 #include "transport/conversationmanager.h"
 #include "transport/rostermanager.h"
 #include "storageresponder.h"
 namespace Transport {
 UserManager::UserManager(Component *component, StorageBackend *storageBackend) {
 	m_cachedUser = NULL;
 	m_onlineBuddies = 0;
 	m_component = component;
 	m_storageBackend = storageBackend;
 	m_storageResponder = new StorageResponder(component->getIQRouter(), m_storageBackend, this);
 	m_storageResponder->start();
 	component->onUserPresenceReceived.connect(bind(&UserManager::handlePresence, this, _1));
 	m_component->getStanzaChannel()->onMessageReceived.connect(bind(&UserManager::handleMessageReceived, this, _1));
 	m_component->getStanzaChannel()->onPresenceReceived.connect(bind(&UserManager::handleGeneralPresenceReceived, this, _1));
 // 	component->onDiscoInfoResponse.connect(bind(&UserManager::handleDiscoInfoResponse, this, _1, _2, _3));
+}
 UserManager::~UserManager(){
 	m_storageResponder->stop();
 	delete m_storageResponder;
+}
 void UserManager::addUser(User *user) {
 	m_users[user->getJID().toBare().toString()] = user;
 	onUserCreated(user);
+}

0 comments (0 inline, 0 general)