libtransport.git Changeset - b2fd4a456335

Changeset - b2fd4a456335

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-08-16 21:51:19
hanzz.k@gmail.com

parse unregistered config options and working [purple] options parsing

4 files changed with 27 insertions and 1 deletions:

backends/libpurple/main.cpp

include/transport/config.h

spectrum/src/sample.cfg

src/config.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -222,24 +222,33 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 											&contents, &length, NULL);
+			}
 			if (ret) {
 				purple_buddy_icons_set_account_icon(account, (guchar *) contents, length);
+			}
 			purple_account_set_password(account, password.c_str());
 			purple_account_set_enabled(account, "spectrum", TRUE);
 			purple_account_set_bool(account, "custom_smileys", FALSE);
 			purple_account_set_bool(account, "direct_connect", FALSE);
 			for (std::map<std::string,std::string>::const_iterator it = config->getUnregistered().begin();
 				it != config->getUnregistered().end(); it++) {
 				if ((*it).first.find("purple.") == 0) {
 					std::string key = (*it).first.substr((*it).first.find(".") + 1);
 					LOG4CXX_INFO(logger, "Setting account string '" << key << "'='" << (*it).second << "'");
 					purple_account_set_string(account, key.c_str(), (*it).second.c_str());
+				}
+			}
 			purple_account_set_privacy_type(account, PURPLE_PRIVACY_DENY_USERS);
 			const PurpleStatusType *status_type = purple_account_get_status_type_with_primitive(account, PURPLE_STATUS_AVAILABLE);
 			if (status_type != NULL) {
 				purple_account_set_status(account, purple_status_type_get_id(status_type), TRUE, NULL);
+			}
+		}
 		void handleLogoutRequest(const std::string &user, const std::string &legacyName) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 // 				VALGRIND_DO_LEAK_CHECK;

include/transport/config.h

➞

Show inline comments

@@ @@ -73,21 +73,26 @@ class Config { @@
 		/// Returns value of variable defined by key.
 		/// For variables in sections you can use "section.variable" key format.
 		/// \param key config variable name
 		const boost::program_options::variable_value &operator[] (const std::string &key) {
 			return m_variables[key];
+		}
 		/// Returns path to config file from which data were loaded.
 		const std::string &getConfigFile() { return m_file; }
 		const std::map<std::string, std::string> &getUnregistered() {
 			return m_unregistered;
+		}
 		/// This signal is emitted when config is loaded/reloaded.
 		boost::signal<void ()> onConfigReloaded;
 	private:
 		Variables m_variables;
 		std::map<std::string, std::string> m_unregistered;
 		std::string m_file;
 };
+}

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -11,21 +11,24 @@ admin_password=test @@
 #idle_reconnect_time=10
 #cert= #patch to PKCS#12 certificate
 #cert_password= #password to that certificate if any
 users_per_backend=10
 backend=../../backends/libpurple/spectrum_libpurple_backend
 #backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 #protocol=prpl-msn
 protocol=any
 #protocol=prpl-icq
 [backend]
 default_avatar=catmelonhead.jpg
 [purple]
 test=test1
 test2=test3
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends
 [database]
 #type = mysql # or "none" without database backend
 database = test.sql
 prefix=icq

src/config.cpp

➞

Show inline comments

@@ @@ -17,24 +17,25 @@ @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "transport/config.h"
 #include <fstream>
 using namespace boost::program_options;
 namespace Transport {
 bool Config::load(const std::string &configfile, boost::program_options::options_description &opts) {
 	m_unregistered.clear();
 	std::ifstream ifs(configfile.c_str());
 	if (!ifs.is_open())
 		return false;
 	opts.add_options()
 		("service.jid", value<std::string>()->default_value(""), "Transport Jabber ID")
 		("service.server", value<std::string>()->default_value(""), "Server to connect to")
 		("service.password", value<std::string>()->default_value(""), "Password used to auth the server")
 		("service.port", value<int>()->default_value(0), "Port the server is listening on")
 		("service.backend", value<std::string>()->default_value("libpurple_backend"), "Backend")
 		("service.protocol", value<std::string>()->default_value(""), "Protocol")
 		("service.allowed_servers", value<std::string>()->default_value(""), "Only users from these servers can connect")
 		("database.database", value<std::string>()->default_value(""), "Database used to store data")
 		("database.server", value<std::string>()->default_value("localhost"), "Database server.")
 		("database.user", value<std::string>()->default_value(""), "Database user.")
 		("database.password", value<std::string>()->default_value(""), "Database Password.")
 		("database.port", value<int>()->default_value(0), "Database port.")
 		("database.prefix", value<std::string>()->default_value(""), "Prefix of tables in database")
 		("logging.config", value<std::string>()->default_value(""), "Path to log4cxx config file which is used for Spectrum 2 instance")
 		("logging.backend_config", value<std::string>()->default_value(""), "Path to log4cxx config file which is used for backends")
 		("backend.default_avatar", value<std::string>()->default_value(""), "Full path to default avatar")
 		("backend.avatars_directory", value<std::string>()->default_value(""), "Path to directory with avatars")
+	;
 	store(parse_config_file(ifs, opts), m_variables);
 	parsed_options parsed = parse_config_file(ifs, opts, true);
 	BOOST_FOREACH(option opt, parsed.options) {
 		if (opt.unregistered) {
 			m_unregistered[opt.string_key] = opt.value[0];
+		}
+	}
 	store(parsed, m_variables);
 	notify(m_variables);
 	m_file = configfile;
 	onConfigReloaded();
 	return true;
+}
 bool Config::load(const std::string &configfile) {
 	options_description opts("Transport options");
 	return load(configfile, opts);

0 comments (0 inline, 0 general)