Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the function that returns relative time strings to generate times relative to an arbitrary clock instead of always using time_point::now(). (this is so we can use blockchain::now() instead).

Browse source 
Remove unused include.
This commit is contained in:
Eric Frias 2014-06-15 14:16:00 -04:00
parent 88162349f1
commit 888a01881a
3 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/fc/time.hpp
View file

@ -117,8 +117,12 @@ namespace fc {
/** return a human-readable approximate time, relative to now() /** return a human-readable approximate time, relative to now()
* e.g., "4 hours ago", "2 months ago", etc. * e.g., "4 hours ago", "2 months ago", etc.
*/ */
string get_approximate_relative_time_string(const time_point_sec& event_time); string get_approximate_relative_time_string(const time_point_sec& event_time,
string get_approximate_relative_time_string(const time_point& event_time); const time_point_sec& relative_to_time = fc::time_point::now(),
const std::string& ago = " ago");
string get_approximate_relative_time_string(const time_point& event_time,
const time_point_sec& relative_to_time = fc::time_point::now(),
const std::string& ago = " ago");
} }
#include <fc/reflect/reflect.hpp> #include <fc/reflect/reflect.hpp>

1
src/filesystem.cpp
View file

@ -16,7 +16,6 @@
#else #else
#include <sys/types.h> #include <sys/types.h>
#include <pwd.h> #include <pwd.h>
#include <uuid/uuid.h>
#endif #endif
namespace fc { namespace fc {

30
src/time.cpp
View file

@ -43,45 +43,47 @@ namespace fc {
} }
// inspired by show_date_relative() in git's date.c // inspired by show_date_relative() in git's date.c
string get_approximate_relative_time_string(const time_point_sec& event_time) { string get_approximate_relative_time_string(const time_point_sec& event_time,
time_point_sec now_in_sec(time_point::now()); const time_point_sec& relative_to_time /* = fc::time_point::now() */,
if (event_time > now_in_sec) const std::string& ago /* = " ago" */) {
if (event_time > relative_to_time)
return "in the future"; return "in the future";
stringstream result; stringstream result;
uint32_t seconds_ago = now_in_sec.sec_since_epoch() - event_time.sec_since_epoch(); uint32_t seconds_ago = relative_to_time.sec_since_epoch() - event_time.sec_since_epoch();
if (seconds_ago < 90) if (seconds_ago < 90)
{ {
result << seconds_ago << " second" << (seconds_ago > 1 ? "s" : "") << " ago"; result << seconds_ago << " second" << (seconds_ago > 1 ? "s" : "") << ago;
return result.str(); return result.str();
} }
uint32_t minutes_ago = (seconds_ago + 30) / 60; uint32_t minutes_ago = (seconds_ago + 30) / 60;
if (minutes_ago < 90) if (minutes_ago < 90)
{ {
result << minutes_ago << " minute" << (minutes_ago > 1 ? "s" : "") << " ago"; result << minutes_ago << " minute" << (minutes_ago > 1 ? "s" : "") << ago;
return result.str(); return result.str();
} }
uint32_t hours_ago = (minutes_ago + 30) / 60; uint32_t hours_ago = (minutes_ago + 30) / 60;
if (hours_ago < 90) if (hours_ago < 90)
{ {
result << hours_ago << " hour" << (hours_ago > 1 ? "s" : "") << " ago"; result << hours_ago << " hour" << (hours_ago > 1 ? "s" : "") << ago;
return result.str(); return result.str();
} }
uint32_t days_ago = (hours_ago + 12) / 24; uint32_t days_ago = (hours_ago + 12) / 24;
if (days_ago < 90) if (days_ago < 90)
{ {
result << days_ago << " day" << (days_ago > 1 ? "s" : "") << " ago"; result << days_ago << " day" << (days_ago > 1 ? "s" : "") << ago;
return result.str(); return result.str();
} }
uint32_t weeks_ago = (days_ago + 3) / 7; uint32_t weeks_ago = (days_ago + 3) / 7;
if (weeks_ago < 70) if (weeks_ago < 70)
{ {
result << weeks_ago << " week" << (weeks_ago > 1 ? "s" : "") << " ago"; result << weeks_ago << " week" << (weeks_ago > 1 ? "s" : "") << ago;
return result.str(); return result.str();
} }
uint32_t months_ago = (days_ago + 15) / 30; uint32_t months_ago = (days_ago + 15) / 30;
if (months_ago < 12) if (months_ago < 12)
{ {
result << months_ago << " month" << (months_ago > 1 ? "s" : "") << " ago"; result << months_ago << " month" << (months_ago > 1 ? "s" : "") << ago;
return result.str(); return result.str();
} }
uint32_t years_ago = days_ago / 365; uint32_t years_ago = days_ago / 365;
@ -93,11 +95,13 @@ namespace fc {
if (leftover_months) if (leftover_months)
result << leftover_months << " month" << (months_ago > 1 ? "s" : ""); result << leftover_months << " month" << (months_ago > 1 ? "s" : "");
} }
result << " ago"; result << ago;
return result.str(); return result.str();
} }
string get_approximate_relative_time_string(const time_point& event_time) { string get_approximate_relative_time_string(const time_point& event_time,
return get_approximate_relative_time_string(time_point_sec(event_time)); const time_point& relative_to_time /* = fc::time_point::now() */,
const std::string& ago /* = " ago" */) {
return get_approximate_relative_time_string(time_point_sec(event_time), time_point_sec(relative_to_time), ago);
} }
void to_variant( const microseconds& input_microseconds, variant& output_variant ) void to_variant( const microseconds& input_microseconds, variant& output_variant )