| 79 |
|
|
| 80 |
|
uname(&system); |
| 81 |
|
|
| 82 |
< |
return ext::String("Zoe/0.9 (") + system.sysname + "; http://computers.doug" |
| 83 |
< |
+ "lasthrift.net/zoe.xml)"; |
| 82 |
> |
return _S("Zoe/0.9 (") + system.sysname + "; http://computers.douglasthrift.net/zoe.xml)"; |
| 83 |
|
} |
| 84 |
|
|
| 85 |
|
void Zoe::configure() |
| 97 |
|
|
| 98 |
|
if ((*zoe/"database"/"password").IsEmpty()) |
| 99 |
|
{ |
| 100 |
< |
ext::String prompt(database.user + (!database.host.IsEmpty() ? "@" : "") |
| 101 |
< |
+ database.host + (!database.user.IsEmpty() ? "'s " : "") + "Databa" |
| 103 |
< |
+ "se Password: "); |
| 100 |
> |
ext::String prompt(database.user + (!database.host.IsEmpty() ? "@" : "") + database.host |
| 101 |
> |
+ (!database.user.IsEmpty() ? "'s " : "") + "Database Password: "); |
| 102 |
|
char* password(getpass(prompt.NullTerminate())); |
| 103 |
|
|
| 104 |
|
database.password = password; |
| 105 |
|
|
| 106 |
< |
for (size_t index(std::strlen(password)); index > 0; --index) |
| 109 |
< |
password[index - 1] = '\0'; |
| 106 |
> |
for (size_t index(std::strlen(password)); index > 0; --index) password[index - 1] = '\0'; |
| 107 |
|
} |
| 108 |
|
else database.password = std::string(*zoe/"database"/"password"); |
| 109 |
|
|
| 110 |
|
database.db = std::string(*zoe/"database"/"db"); |
| 111 |
|
|
| 112 |
< |
if (debug) cerr << "login = " << login << "\npassword = " |
| 113 |
< |
<< std::string(password.GetSize(), '*') << "\ndatabase = {\n driver =" |
| 114 |
< |
<< ' ' << 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"; |
| 112 |
> |
if (debug) cerr << "login = " << login << "\npassword = " << std::string(password.GetSize(), '*') << "\ndatabase = {\n" |
| 113 |
> |
<< " driver = " << database.driver << "\n host=" << database.host << "\n user = " << database.user << '\n' |
| 114 |
> |
<< " password = " << std::string(database.password.GetSize(), '*') << "\n db = " << database.db << "\n}\n"; |
| 115 |
|
|
| 116 |
|
xml::NodeSet buddies(*zoe/"buddy"); |
| 117 |
|
|
| 118 |
< |
for (xml::NodeSet::Iterator buddy(buddies.Begin()); buddy != buddies.End(); |
| 119 |
< |
++buddy) this->buddies.insert(Buddy(**buddy/"login", **buddy/"rss")); |
| 118 |
> |
for (xml::NodeSet::Iterator buddy(buddies.Begin()); buddy != buddies.End(); ++buddy) |
| 119 |
> |
this->buddies.insert(Buddy(**buddy/"login", **buddy/"rss")); |
| 120 |
|
|
| 121 |
|
if (debug) |
| 122 |
|
{ |
| 123 |
|
cerr << "buddies = {\n"; |
| 124 |
|
|
| 125 |
< |
for (std::set<Buddy>::const_iterator buddy(this->buddies.begin()); buddy |
| 126 |
< |
!= this->buddies.end(); ++buddy) cerr << " " << *buddy << " = " |
| 133 |
< |
<< buddy->getRss() << '\n'; |
| 125 |
> |
for (std::set<Buddy>::const_iterator buddy(this->buddies.begin()); buddy != this->buddies.end(); ++buddy) |
| 126 |
> |
cerr << " " << *buddy << " = " << buddy->getRss() << '\n'; |
| 127 |
|
|
| 128 |
|
cerr << "}\n"; |
| 129 |
|
} |
| 140 |
|
|
| 141 |
|
void Zoe::initialize() |
| 142 |
|
{ |
| 143 |
< |
ext::Handle<dbi::Connection> db(dbi::Connect(database.driver, database.host, |
| 144 |
< |
database.user, database.password, database.db)); |
| 143 |
> |
ext::Handle<dbi::Connection> db(dbi::Connect(database.driver, database.host, database.user, database.password, |
| 144 |
> |
database.db)); |
| 145 |
|
ext::Handle<dbi::ResultSet> buddies(db->Execute("SELECT * FROM buddies")); |
| 146 |
|
std::set<Buddy> buddies_; |
| 147 |
|
|
| 155 |
|
|
| 156 |
|
std::vector<Buddy> difference; |
| 157 |
|
|
| 158 |
< |
set_difference(this->buddies.begin(), this->buddies.end(), buddies_.begin(), |
| 159 |
< |
buddies_.end(), std::insert_iterator<std::vector<Buddy> >(difference, |
| 167 |
< |
difference.begin())); |
| 158 |
> |
set_difference(this->buddies.begin(), this->buddies.end(), buddies_.begin(), buddies_.end(), |
| 159 |
> |
std::insert_iterator<std::vector<Buddy> >(difference, difference.begin())); |
| 160 |
|
|
| 161 |
< |
for (std::vector<Buddy>::iterator buddy(difference.begin()); buddy != |
| 170 |
< |
difference.end(); ++buddy) |
| 161 |
> |
for (std::vector<Buddy>::iterator buddy(difference.begin()); buddy != difference.end(); ++buddy) |
| 162 |
|
{ |
| 163 |
|
ext::Uuid id; |
| 164 |
|
|
| 165 |
|
api::Uuid::CreateSequential(id); |
| 166 |
|
|
| 167 |
|
buddy->setId(id); |
| 168 |
< |
db->Execute("INSERT INTO buddies (id, buddy) VALUES ('" + id + "', '" + |
| 169 |
< |
*buddy + "')"); |
| 168 |
> |
db->Execute("INSERT INTO buddies (id, buddy) VALUES ('" + lexical_cast<ext::String>(id) + "', '" |
| 169 |
> |
+ ext::String(*buddy) + "')"); |
| 170 |
|
|
| 171 |
|
buddies_.insert(*buddy); |
| 172 |
|
} |
