| 40 |
|
{ |
| 41 |
|
if (!Zoe::publisher) Zoe::publisher = true; |
| 42 |
|
} |
| 43 |
+ |
else if (arg == "-color") |
| 44 |
+ |
{ |
| 45 |
+ |
if (!Zoe::color) Zoe::color = true; |
| 46 |
+ |
} |
| 47 |
|
else if (arg == "-D") |
| 48 |
|
{ |
| 49 |
|
if (!Zoe::debug) Zoe::debug = true; |
| 50 |
|
} |
| 51 |
|
else |
| 52 |
|
{ |
| 53 |
< |
cerr << bright << "Usage: " << cyan << Zoe::program << reset << " [" |
| 54 |
< |
<< bright << blue << "-config=" << yellow << "config" << reset |
| 51 |
< |
<< "] [" << bright << blue << "-collector" << reset << "] [" |
| 52 |
< |
<< bright << blue << "-publisher" << reset << "] [" << bright |
| 53 |
< |
<< blue << "-D" << reset << "]\n"; |
| 53 |
> |
cerr << "Usage: " << Zoe::program << " [-config=config] " |
| 54 |
> |
"[-collector] [-publisher] [-color] [-D]\n"; |
| 55 |
|
|
| 56 |
|
return 1; |
| 57 |
|
} |
| 71 |
|
Publisher publisher(buddies, database, Zoe::publisher); |
| 72 |
|
} |
| 73 |
|
|
| 74 |
< |
bool Zoe::debug(false), Zoe::collector(false), Zoe::publisher(false); |
| 74 |
> |
bool Zoe::debug(false), Zoe::collector(false), Zoe::publisher(false), |
| 75 |
> |
Zoe::color(false); |
| 76 |
|
ext::String Zoe::program, Zoe::config("zoe.xml"); |
| 77 |
|
|
| 78 |
< |
ext::String Zoe::generator() |
| 78 |
> |
ext::String Zoe::generator(Generator generator) |
| 79 |
|
{ |
| 80 |
< |
utsname system; |
| 80 |
> |
ext::String generator_(generator == all || generator == agent ? "Zoe" : ""); |
| 81 |
> |
|
| 82 |
> |
switch (generator) |
| 83 |
> |
{ |
| 84 |
> |
case all: |
| 85 |
> |
generator_.InsertAllLast("/0.9"); |
| 86 |
> |
case agent: |
| 87 |
> |
{ |
| 88 |
> |
utsname system; |
| 89 |
> |
|
| 90 |
> |
uname(&system); |
| 91 |
> |
|
| 92 |
> |
generator_.InsertAllLast(_S(" (") + system.sysname); |
| 93 |
> |
} |
| 94 |
> |
|
| 95 |
> |
if (generator == agent) |
| 96 |
> |
{ |
| 97 |
> |
generator_.InsertAllLast(")"); |
| 98 |
> |
|
| 99 |
> |
break; |
| 100 |
> |
} |
| 101 |
> |
else generator_.InsertAllLast("; "); |
| 102 |
> |
case url: |
| 103 |
> |
generator_.InsertAllLast("http://computers.douglasthrift.net/zoe.xml"); |
| 104 |
|
|
| 105 |
< |
uname(&system); |
| 105 |
> |
if (generator == all) generator_.InsertAllLast(")"); |
| 106 |
> |
|
| 107 |
> |
break; |
| 108 |
> |
case version: |
| 109 |
> |
generator_ = "0.9"; |
| 110 |
> |
} |
| 111 |
|
|
| 112 |
< |
return ext::String("Zoe/0.9 (") + system.sysname + "; http://computers.doug" |
| 83 |
< |
+ "lasthrift.net/zoe.xml)"; |
| 112 |
> |
return generator_; |
| 113 |
|
} |
| 114 |
|
|
| 115 |
|
void Zoe::configure() |
| 128 |
|
if ((*zoe/"database"/"password").IsEmpty()) |
| 129 |
|
{ |
| 130 |
|
ext::String prompt(database.user + (!database.host.IsEmpty() ? "@" : "") |
| 131 |
< |
+ database.host + (!database.user.IsEmpty() ? "'s " : "") + "Databa" |
| 132 |
< |
+ "se Password: "); |
| 131 |
> |
+ database.host + (!database.user.IsEmpty() ? "'s " : "") |
| 132 |
> |
+ "Database Password: "); |
| 133 |
|
char* password(getpass(prompt.NullTerminate())); |
| 134 |
|
|
| 135 |
|
database.password = password; |
| 141 |
|
|
| 142 |
|
database.db = std::string(*zoe/"database"/"db"); |
| 143 |
|
|
| 144 |
< |
if (debug) cerr << "login = " << login << "\npassword = " |
| 145 |
< |
<< std::string(password.GetSize(), '*') << "\ndatabase = {\n driver =" |
| 146 |
< |
<< ' ' << database.driver << "\n host=" << database.host << "\n use" |
| 147 |
< |
<< "r = " << database.user << "\n password = " |
| 148 |
< |
<< std::string(database.password.GetSize(), '*') << "\n db = " |
| 149 |
< |
<< database.db << "\n}\n"; |
| 144 |
> |
if (debug) cerr << "login = " << login << "\npassword = " |
| 145 |
> |
<< std::string(password.GetSize(), '*') << "\ndatabase = {\n" |
| 146 |
> |
<< " driver = " << database.driver << "\n host=" << database.host |
| 147 |
> |
<< "\n user = " << database.user << '\n' |
| 148 |
> |
<< " password = " << std::string(database.password.GetSize(), '*') |
| 149 |
> |
<< "\n db = " << database.db << "\n}\n"; |
| 150 |
|
|
| 151 |
|
xml::NodeSet buddies(*zoe/"buddy"); |
| 152 |
|
|
| 153 |
|
for (xml::NodeSet::Iterator buddy(buddies.Begin()); buddy != buddies.End(); |
| 154 |
< |
++buddy) this->buddies.insert(Buddy(**buddy/"login", **buddy/"rss")); |
| 154 |
> |
++buddy) |
| 155 |
> |
{ |
| 156 |
> |
this->buddies.insert(Buddy(**buddy/"login", **buddy/"rss", |
| 157 |
> |
**buddy/"atom")); |
| 158 |
> |
} |
| 159 |
|
|
| 160 |
|
if (debug) |
| 161 |
|
{ |
| 162 |
|
cerr << "buddies = {\n"; |
| 163 |
|
|
| 164 |
< |
for (std::set<Buddy>::const_iterator buddy(this->buddies.begin()); buddy |
| 165 |
< |
!= this->buddies.end(); ++buddy) cerr << " " << *buddy << '\n'; |
| 164 |
> |
for (std::set<Buddy>::const_iterator buddy(this->buddies.begin()); |
| 165 |
> |
buddy != this->buddies.end(); ++buddy) |
| 166 |
> |
{ |
| 167 |
> |
cerr << " " << *buddy << " = {\n rss = " << buddy->getRss() |
| 168 |
> |
<< "\n atom = " << buddy->getAtom() << "\n }\n"; |
| 169 |
> |
} |
| 170 |
|
|
| 171 |
|
cerr << "}\n"; |
| 172 |
|
} |
| 178 |
|
} |
| 179 |
|
|
| 180 |
|
if (debug) cerr << "collector = " << lexical_cast<ext::String>(collector) |
| 181 |
< |
<< "\npublisher = " << lexical_cast<ext::String>(publisher) << '\n'; |
| 181 |
> |
<< "\npublisher = " << lexical_cast<ext::String>(publisher) |
| 182 |
> |
<< "\ncolor = " << lexical_cast<ext::String>(color) << '\n'; |
| 183 |
|
} |
| 184 |
|
|
| 185 |
|
void Zoe::initialize() |
| 203 |
|
buddies_.end(), std::insert_iterator<std::vector<Buddy> >(difference, |
| 204 |
|
difference.begin())); |
| 205 |
|
|
| 206 |
< |
for (std::vector<Buddy>::iterator buddy(difference.begin()); buddy != |
| 207 |
< |
difference.end(); ++buddy) |
| 206 |
> |
for (std::vector<Buddy>::iterator buddy(difference.begin()); |
| 207 |
> |
buddy != difference.end(); ++buddy) |
| 208 |
|
{ |
| 209 |
|
ext::Uuid id; |
| 210 |
|
|
| 211 |
|
api::Uuid::CreateSequential(id); |
| 212 |
|
|
| 213 |
|
buddy->setId(id); |
| 214 |
< |
db->Execute("INSERT INTO buddies (id, buddy) VALUES ('" + |
| 215 |
< |
lexical_cast<ext::String>(id) + "', '" + ext::String(*buddy) + |
| 216 |
< |
"')"); |
| 214 |
> |
db->Execute("INSERT INTO buddies (id, buddy) VALUES ('" |
| 215 |
> |
+ lexical_cast<ext::String>(id) + "', '" + ext::String(*buddy) |
| 216 |
> |
+ "')"); |
| 217 |
|
|
| 218 |
|
buddies_.insert(*buddy); |
| 219 |
|
} |
