libtransport.git Changeset - bb1a8e4c36e2

Changeset - bb1a8e4c36e2

Parent rev.

Child rev.

[Not reviewed]

0 6 0

HanzZ - 14 years ago 2011-06-13 23:31:06
hanzz.k@gmail.com

Spectrum can work without database now :)

6 files changed with 39 insertions and 19 deletions:

include/transport/usermanager.h

spectrum/src/main.cpp

spectrum/src/sample.cfg

src/config.cpp

src/rostermanager.cpp

src/usermanager.cpp

0 comments (0 inline, 0 general)

include/transport/usermanager.h

➞

Show inline comments

@@ @@ -38,13 +38,13 @@ class RosterResponder; @@
 /// It also removes the User class once the last user's resource disconnected.
 class UserManager {
 	public:
 		/// Creates new UserManager.
 		/// \param component Component which's presence will be handled
 		/// \param storageBackend Storage backend used to fetch UserInfos
 		UserManager(Component *component, StorageBackend *storageBackend);
+		UserManager(Component *component, StorageBackend *storageBackend = NULL);
 		/// Destroys UserManager.
 		~UserManager();
 		/// Returns user according to his bare JID.
 		/// \param barejid bare JID of user

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -52,21 +52,27 @@ int main(int argc, char **argv) @@
+	}
 	Swift::SimpleEventLoop eventLoop;
 	Component transport(&eventLoop, &config, NULL);
 	Logger logger(&transport);
 	SQLite3Backend sql(&config);
 	logger.setStorageBackend(&sql);
 	if (!sql.connect()) {
 		std::cerr << "Can't connect to database.\n";
 	StorageBackend *storageBackend = NULL;
 	if (CONFIG_STRING(&config, "database.type") == "sqlite3") {
 		storageBackend = new SQLite3Backend(&config);
 		logger.setStorageBackend(storageBackend);
 		if (!storageBackend->connect()) {
 			std::cerr << "Can't connect to database.\n";
+		}
+	}
 	UserManager userManager(&transport, &sql);
 	UserRegistration userRegistration(&transport, &userManager, &sql);
 	logger.setUserRegistration(&userRegistration);
 	UserManager userManager(&transport, storageBackend);
 	if (storageBackend) {
 		UserRegistration userRegistration(&transport, &userManager, storageBackend);
 		logger.setUserRegistration(&userRegistration);
+	}
 	logger.setUserManager(&userManager);
 	NetworkPluginServer plugin(&transport, &config, &userManager);
 	transport.connect();
 	eventLoop.run();

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -11,8 +11,9 @@ backend=../../backends/libpurple/libpurple_backend @@
 #backend=../../backends/libircclient-qt/libircclient-qt_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=prpl-icq
 [database]
 type = sqlite3 # or "none" without database backend
 database = test.sql
 prefix=icq

src/config.cpp

➞

Show inline comments

 		("registration.enable_public_registration", value<bool>()->default_value(true), "True if users should be able to register.")
 		("registration.language", value<std::string>()->default_value("en"), "Default language for registration form")
 		("registration.instructions", value<std::string>()->default_value(""), "Instructions showed to user in registration form")
 		("registration.username_field", value<std::string>()->default_value(""), "Label for username field")
 		("registration.username_mask", value<std::string>()->default_value(""), "Username mask")
 		("registration.encoding", value<std::string>()->default_value("en"), "Default encoding in registration form")
 		("database.type", value<std::string>()->default_value("none"), "Database type.")
 		("database.database", value<std::string>()->default_value(""), "Database used to store data")
 		("database.prefix", value<std::string>()->default_value(""), "Prefix of tables in database")
+	;
     store(parse_config_file(ifs, opts), m_variables);
 	notify(m_variables);

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -158,13 +158,13 @@ void RosterManager::sendRIE() { @@
 void RosterManager::handleSubscription(Swift::Presence::ref presence) {
 	std::string legacyName = Buddy::JIDToLegacyName(presence->getTo());
+}
 void RosterManager::setStorageBackend(StorageBackend *storageBackend) {
 	if (m_rosterStorage) {
+	if (m_rosterStorage || !storageBackend) {
 		return;
+	}
 	m_rosterStorage = new RosterStorage(m_user, storageBackend);
 	std::list<BuddyInfo> roster;
 	storageBackend->getBuddies(m_user->getUserInfo().id, roster);

src/usermanager.cpp

➞

Show inline comments

@@ @@ -30,25 +30,30 @@ namespace Transport { @@
 UserManager::UserManager(Component *component, StorageBackend *storageBackend) {
 	m_cachedUser = NULL;
 	m_onlineBuddies = 0;
 	m_component = component;
 	m_storageBackend = storageBackend;
 	m_storageResponder = NULL;
 	m_storageResponder = new StorageResponder(component->getIQRouter(), m_storageBackend, this);
 	m_storageResponder->start();
 	if (m_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;
 	if (m_storageResponder) {
 		m_storageResponder->stop();
 		delete m_storageResponder;
+	}
+}
 void UserManager::addUser(User *user) {
 	m_users[user->getJID().toBare().toString()] = user;
 	onUserCreated(user);
+}
 			response->setTo(presence->getFrom());
 			response->setFrom(presence->getTo());
 			response->setType(Swift::Presence::Unavailable);
 			m_component->getStanzaChannel()->sendPresence(response);
 			UserInfo res;
 			bool registered = m_storageBackend->getUser(userkey, res);
 			if (registered) {
 				m_storageBackend->setUserOnline(res.id, false);
 			if (m_storageBackend) {
 				bool registered = m_storageBackend->getUser(userkey, res);
 				if (registered) {
 					m_storageBackend->setUserOnline(res.id, false);
+				}
+			}
 			return;
+		}
 		UserInfo res;
 		bool registered = m_storageBackend->getUser(userkey, res);
+		bool registered = m_storageBackend ? m_storageBackend->getUser(userkey, res) : false;
 		if (m_component->inServerMode()) {
 			if (!registered) {
 				res.password = "";
 				res.uin = presence->getFrom().getNode();
 				res.jid = userkey;
 				if (res.uin.find_last_of("%") != std::string::npos) {
 					res.uin.replace(res.uin.find_last_of("%"), 1, "@");
+				}
 				m_storageBackend->setUser(res);
 				registered = m_storageBackend->getUser(userkey, res);
 				if (m_storageBackend) {
 					m_storageBackend->setUser(res);
 					registered = m_storageBackend->getUser(userkey, res);
+				}
 				else {
 					registered = true;
+				}
+			}
 			res.password = m_component->getUserRegistryPassword(userkey);
+		}
 		if (!registered) {
 			// TODO: logging

0 comments (0 inline, 0 general)