ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/zoe/trunk/Zoe.cpp

Comparing trunk/Zoe.cpp (file contents):
Revision 21 by douglas, 2004-07-16T23:37:41-07:00 vs.
Revision 36 by douglas, 2004-07-22T01:19:40-07:00

#	Line 15 | Line 15
15		extern "C"
16		{
17		#include <pwd.h>
18	+	#include <sys/utsname.h>
19		#include <unistd.h>
20		}
21
21	–	enum Color { reset, bright, dim, underscore = 4, blink, reverse = 7, hidden,
22	–	black = 30, red, green, yellow, blue, magenta, cyan, white, _black = 40,
23	–	_red, _green, _yellow, _blue, _magenta, _cyan, _white };
24	–
25	–	inline std::ostream& operator<<(std::ostream& sout, Color color)
26	–	{
27	–	sout << "\033[" << unsigned(color) << 'm';
28	–
29	–	return sout;
30	–	}
31	–
22		int main(int argc, char* argv[])
23		{
24		Zoe::program = argv[0];
#	Line 83 | Line 73 | Zoe::Zoe()
73		bool Zoe::debug(false), Zoe::collector(false), Zoe::publisher(false);
74		ext::String Zoe::program, Zoe::config("zoe.xml");
75
76	+	ext::String Zoe::generator(Generator generator)
77	+	{
78	+	ext::String generator_(generator == all || generator == agent ? "Zoe" : "");
79	+
80	+	switch (generator)
81	+	{
82	+	case all:
83	+	generator_.InsertAllLast("/0.9");
84	+	case agent:
85	+	{
86	+	utsname system;
87	+
88	+	uname(&system);
89	+
90	+	generator_.InsertAllLast(_S(" (") + system.sysname);
91	+	}
92	+
93	+	if (generator == agent)
94	+	{
95	+	generator_.InsertAllLast(")");
96	+
97	+	break;
98	+	}
99	+	else generator_.InsertAllLast("; ");
100	+	case url:
101	+	generator_.InsertAllLast("http://computers.douglasthrift.net/zoe.xml");
102	+
103	+	if (generator == all) generator_.InsertAllLast(")");
104	+
105	+	break;
106	+	case version:
107	+	generator_ = "0.9";
108	+	}
109	+
110	+	return generator_;
111	+	}
112	+
113		void Zoe::configure()
114		{
115		if (debug) cerr << "config = " << config << '\n';
#	Line 98 | Line 125 | void Zoe::configure()
125
126		if ((*zoe/"database"/"password").IsEmpty())
127		{
128	<	ext::String prompt(database.user + (!database.host.IsEmpty() ? "@" : "")
129	<	+ database.host + (!database.user.IsEmpty() ? "'s " : "") + "Databa"
103	<	+ "se Password: ");
128	>	ext::String prompt(database.user + (!database.host.IsEmpty() ? "@" : "") + database.host
129	>	+ (!database.user.IsEmpty() ? "'s " : "") + "Database Password: ");
130		char* password(getpass(prompt.NullTerminate()));
131
132		database.password = password;
133
134	<	for (size_t index(std::strlen(password)); index > 0; --index)
109	<	password[index - 1] = '\0';
134	>	for (size_t index(std::strlen(password)); index > 0; --index) password[index - 1] = '\0';
135		}
136		else database.password = std::string(*zoe/"database"/"password");
137
138		database.db = std::string(*zoe/"database"/"db");
139
140	<	if (debug) cerr << "login = " << login << "\npassword = "
141	<	<< std::string(password.GetSize(), '*') << "\ndatabase = {\n   driver ="
142	<	<< ' ' << database.driver << "\n   host=" << database.host << "\n   use"
118	<	<< "r = " << database.user << "\n   password = "
119	<	<< std::string(database.password.GetSize(), '*') << "\n   db = "
120	<	<< database.db << "\n}\n";
140	>	if (debug) cerr << "login = " << login << "\npassword = " << std::string(password.GetSize(), '*') << "\ndatabase = {\n"
141	>	<< "   driver = " << database.driver << "\n   host=" << database.host << "\n   user = " << database.user << '\n'
142	>	<< "   password = " << std::string(database.password.GetSize(), '*') << "\n   db = " << database.db << "\n}\n";
143
144		xml::NodeSet buddies(*zoe/"buddy");
145
146	<	for (xml::NodeSet::Iterator buddy(buddies.Begin()); buddy != buddies.End();
147	<	++buddy) this->buddies.insert(Buddy(**buddy/"login", **buddy/"rss"));
146	>	for (xml::NodeSet::Iterator buddy(buddies.Begin()); buddy != buddies.End(); ++buddy)
147	>	this->buddies.insert(Buddy(**buddy/"login", **buddy/"rss"));
148
149		if (debug)
150		{
151		cerr << "buddies = {\n";
152
153	<	for (std::set<Buddy>::const_iterator buddy(this->buddies.begin()); buddy
154	<	!= this->buddies.end(); ++buddy) cerr << "   " << *buddy << '\n';
153	>	for (std::set<Buddy>::const_iterator buddy(this->buddies.begin()); buddy != this->buddies.end(); ++buddy)
154	>	cerr << "   " << *buddy << " = " << buddy->getRss() << '\n';
155
156		cerr << "}\n";
157		}
#	Line 146 | Line 168 | void Zoe::configure()
168
169		void Zoe::initialize()
170		{
171	<	ext::Handle<dbi::Connection> db(dbi::Connect(database.driver, database.host,
172	<	database.user, database.password, database.db));
171	>	ext::Handle<dbi::Connection> db(dbi::Connect(database.driver, database.host, database.user, database.password,
172	>	database.db));
173		ext::Handle<dbi::ResultSet> buddies(db->Execute("SELECT * FROM buddies"));
174		std::set<Buddy> buddies_;
175
#	Line 161 | Line 183 | void Zoe::initialize()
183
184		std::vector<Buddy> difference;
185
186	<	set_difference(this->buddies.begin(), this->buddies.end(), buddies_.begin(),
187	<	buddies_.end(), std::insert_iterator<std::vector<Buddy> >(difference,
166	<	difference.begin()));
186	>	set_difference(this->buddies.begin(), this->buddies.end(), buddies_.begin(), buddies_.end(),
187	>	std::insert_iterator<std::vector<Buddy> >(difference, difference.begin()));
188
189	<	for (std::vector<Buddy>::iterator buddy(difference.begin()); buddy !=
169	<	difference.end(); ++buddy)
189	>	for (std::vector<Buddy>::iterator buddy(difference.begin()); buddy != difference.end(); ++buddy)
190		{
191		ext::Uuid id;
192
193		api::Uuid::CreateSequential(id);
194
195		buddy->setId(id);
196	<	db->Execute("INSERT INTO buddies (id, buddy) VALUES ('" +
197	<	lexical_cast<ext::String>(id) + "', '" + ext::String(*buddy) +
178	<	"')");
196	>	db->Execute("INSERT INTO buddies (id, buddy) VALUES ('" + lexical_cast<ext::String>(id) + "', '"
197	>	+ ext::String(*buddy) + "')");
198
199		buddies_.insert(*buddy);
200		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines