| 11 |
|
Publisher::Publisher(const std::set<Buddy>& buddies, const Database& database, bool start) : buddies(buddies), |
| 12 |
|
database(database), start(start) |
| 13 |
|
{ |
| 14 |
< |
if (start) publisher.Spawn(etl::Bind<0>(&Publisher::publish, this)); |
| 14 |
> |
if (start) publish(); |
| 15 |
|
} |
| 16 |
|
|
| 17 |
< |
int Publisher::publish() |
| 18 |
< |
{ |
| 19 |
< |
cerr << bright << green << "Started publisher daemon at " << Stamp() |
| 20 |
< |
<< ".\n" << reset; |
| 21 |
< |
|
| 22 |
< |
while (true) |
| 23 |
< |
{ |
| 24 |
< |
Stamp now, next(now + Hour(1)); |
| 25 |
< |
api::Thread thread(etl::Bind<0>(&Publisher::update, this)); |
| 26 |
< |
|
| 27 |
< |
next.setSeconds(0); |
| 28 |
< |
next.setMinutes(0); |
| 29 |
< |
|
| 30 |
< |
if (Zoe::debug) cerr << "now = " << now << "\nnext = " << next << '\n'; |
| 31 |
< |
|
| 32 |
< |
while (now < next - Minute(1)) |
| 33 |
< |
{ |
| 34 |
< |
sleep(Minute(1)); |
| 35 |
< |
|
| 36 |
< |
now = Stamp(); |
| 37 |
< |
} |
| 38 |
< |
|
| 39 |
< |
while (now < next) |
| 40 |
< |
{ |
| 41 |
< |
sleep(1); |
| 42 |
< |
|
| 43 |
< |
now = Stamp(); |
| 44 |
< |
} |
| 45 |
< |
|
| 46 |
< |
thread.Join(); |
| 47 |
< |
} |
| 48 |
< |
} |
| 49 |
< |
|
| 50 |
< |
int Publisher::update() |
| 17 |
> |
void Publisher::publish() |
| 18 |
|
{ |
| 19 |
|
cerr << bright << yellow << "Started updating feeds at " << Stamp() |
| 20 |
|
<< ".\n" << reset; |
| 23 |
|
ext::Handle<dbi::Connection> db(dbi::Connect(database.driver, database.host, |
| 24 |
|
database.user, database.password, database.db)); |
| 25 |
|
|
| 26 |
< |
db->Execute("DELETE FROM messages WHERE stamp<'" + ext::String(stamp - Day(30)) + "'"); |
| 26 |
> |
db->Execute("DELETE FROM messages WHERE stamp<'" |
| 27 |
> |
+ ext::String(stamp - Day(30)) + "'"); |
| 28 |
|
|
| 29 |
|
for (std::set<Buddy>::const_iterator buddy(buddies.begin()); |
| 30 |
|
buddy != buddies.end(); ++buddy) |
| 31 |
|
{ |
| 32 |
< |
ext::Handle<dbi::ResultSet> messages(db->Execute("SELECT stamp, message FROM messages WHERE id='" |
| 32 |
> |
ext::Handle<dbi::ResultSet> messages(db->Execute("SELECT stamp, message" |
| 33 |
> |
" FROM messages WHERE id='" |
| 34 |
|
+ lexical_cast<ext::String>(buddy->getId()) + "'")); |
| 35 |
< |
std::vector<AwayMessage> messages_; |
| 35 |
> |
std::set<AwayMessage, std::greater<AwayMessage> > messages_; |
| 36 |
|
|
| 37 |
< |
while (messages->MoveNext()) messages_.push_back(AwayMessage(messages->GetString("message"), |
| 37 |
> |
while (messages->MoveNext()) |
| 38 |
> |
messages_.insert(AwayMessage(messages->GetString("message"), |
| 39 |
|
messages->GetString("stamp"))); |
| 40 |
|
|
| 41 |
< |
Rss rss(*buddy, messages_, stamp); |
| 42 |
< |
Atom atom(*buddy, messages_, stamp); |
| 41 |
> |
ext::String display(buddy->getDisplay(database)); |
| 42 |
> |
Rss rss(*buddy, display, messages_.begin(), messages_.end(), stamp); |
| 43 |
> |
Atom atom(*buddy, display, messages_.begin(), messages_.end(), stamp); |
| 44 |
|
|
| 45 |
|
cerr << bright << yellow << "Updated feeds for " << blue << *buddy |
| 46 |
|
<< yellow << ".\n" << reset; |
