anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core/date: Add date_compare() for comparing two dates 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-10-28 01:44:42 -04:00
parent cef39bc0fc
commit af1939a6e7
4 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/date.c
View File

@ -16,3 +16,14 @@ void date_today(struct date *date)
date->d_day = now->tm_mday;
}
}
int date_compare(const struct date *lhs, const struct date *rhs)
{
int ret = lhs->d_year - rhs->d_year;
if (ret != 0)
return ret;
ret = lhs->d_month - rhs->d_month;
if (ret != 0)
return ret;
return lhs->d_day - rhs->d_day;
}

8
core/tags/track.cpp
View File

@ -104,13 +104,7 @@ void Track :: played()
int Track :: compare_date(const Track *rhs)
{
int ret = _date.d_year - rhs->_date.d_year;
if (ret == 0) {
ret = _date.d_month - rhs->_date.d_month;
if (ret == 0)
ret = _date.d_day - rhs->_date.d_day;
}
return ret;
return date_compare(&_date, &rhs->_date);
}
void Track :: read(file &file)

9
include/core/date.h
View File

@ -14,4 +14,13 @@ struct date {
/* Set the provided date structure to today's date. */
void date_today(struct date *);
/*
* Compare two dates.
*
* if ret < 0: lhs < rhs.
* if ret = 0: lhs == rhs.
* if ret > 0: lhs > rhs.
*/
int date_compare(const struct date *, const struct date *);
#endif /* OCARINA_CORE_DATE_H */

30
tests/core/date.c
View File

@ -25,6 +25,36 @@ void test_date()
test_equal(date.d_day, today->tm_mday);
}
void test_compare()
{
struct date a = {
.d_year = 2015,
.d_month = 6,
.d_day = 17,
};
struct date b = {
.d_year = 2010,
.d_month = 12,
.d_day = 10,
};
/* Check year comparison. */
test_equal(date_compare(&a, &b), 5);
test_equal(date_compare(&b, &a), -5);
/* Check month comparison. */
b.d_year = a.d_year;
test_equal(date_compare(&a, &b), -6);
test_equal(date_compare(&b, &a), 6);
/* Check day comparison. */
b.d_month = a.d_month;
test_equal(date_compare(&a, &a), 0);
test_equal(date_compare(&a, &b), 7);
test_equal(date_compare(&b, &a), -7);
}
DECLARE_UNIT_TESTS(
UNIT_TEST("Date", test_date),
UNIT_TEST("Date Comparison", test_compare),
);