Skip to content

Add DateTime getter for timestamp #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amake merged 3 commits into from
May 29, 2025
Merged

Add DateTime getter for timestamp #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aace57
test(timestamp): add test for DateTime getter
confusedalex May 29, 2025
985f1f3
feat(timestamp): add DateTime getter for timestamps
confusedalex May 29, 2025
08bc6fb
Invert ternary operator for readability
amake May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions lib/src/org/model/org_timestamp.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ class OrgSimpleTimestamp extends OrgLeafNode {
@override
String toString() => 'OrgSimpleTimestamp';

DateTime get dateTime => DateTime(
int.parse(date.year),
int.parse(date.month),
int.parse(date.day),
time == null ? 0 : int.parse(time!.hour),
time == null ? 0 : int.parse(time!.minute),
);

@override
void _toMarkupImpl(OrgSerializer buf) {
buf
Expand Down Expand Up @@ -157,6 +165,22 @@ class OrgTimeRangeTimestamp extends OrgLeafNode {

bool get isActive => prefix == '<' && suffix == '>';

DateTime get startDateTime => DateTime(
int.parse(date.year),
int.parse(date.month),
int.parse(date.day),
int.parse(timeStart.hour),
int.parse(timeStart.minute),
);

DateTime get endDateTime => DateTime(
int.parse(date.year),
int.parse(date.month),
int.parse(date.day),
int.parse(timeEnd.hour),
int.parse(timeEnd.minute),
);

@override
String toString() => 'OrgTimeRangeTimestamp';

Expand Down
10 changes: 10 additions & 0 deletions test/org/model/timestamp_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ void main() {
expect(result.contains('Wed'), isTrue);
expect(result.contains('あ'), isFalse);
expect(result.isActive, isTrue);
expect(result.dateTime, DateTime(2020, 03, 12));
expect(result.toMarkup(), markup);
});
test('date and time', () {
Expand All @@ -22,6 +23,7 @@ void main() {
expect(result.contains('Wed'), isTrue);
expect(result.contains('あ'), isFalse);
expect(result.isActive, isTrue);
expect(result.dateTime, DateTime(2020, 03, 12, 08, 34));
expect(result.toMarkup(), markup);
});
test('with repeater', () {
Expand All @@ -32,6 +34,7 @@ void main() {
expect(result.contains('+1w'), isTrue);
expect(result.contains('あ'), isFalse);
expect(result.isActive, isTrue);
expect(result.dateTime, DateTime(2020, 03, 12, 08, 34));
expect(result.toMarkup(), markup);
});
test('with repeater (min/max)', () {
Expand All @@ -42,6 +45,7 @@ void main() {
expect(result.contains('+1w/2w'), isTrue);
expect(result.contains('あ'), isFalse);
expect(result.isActive, isTrue);
expect(result.dateTime, DateTime(2020, 03, 12, 08, 34));
expect(result.toMarkup(), markup);
});
test('with multiple repeaters', () {
Expand All @@ -53,6 +57,7 @@ void main() {
expect(result.contains('--2d'), isTrue);
expect(result.contains('あ'), isFalse);
expect(result.isActive, isTrue);
expect(result.dateTime, DateTime(2020, 03, 12, 08, 34));
expect(result.toMarkup(), markup);
});
test('inactive', () {
Expand All @@ -64,6 +69,7 @@ void main() {
expect(result.contains('--12d'), isTrue);
expect(result.contains('あ'), isFalse);
expect(result.isActive, isFalse);
expect(result.dateTime, DateTime(2020, 03, 12, 18, 34));
expect(result.toMarkup(), markup);
});
test('time range', () {
Expand All @@ -75,6 +81,8 @@ void main() {
expect(result.contains('--12d'), isTrue);
expect(result.contains('あ'), isFalse);
expect(result.isActive, isFalse);
expect(result.startDateTime, DateTime(2020, 03, 12, 18, 34));
expect(result.endDateTime, DateTime(2020, 03, 12, 19, 35));
expect(result.toMarkup(), markup);
});
test('date range', () {
Expand All @@ -89,6 +97,8 @@ void main() {
expect(result.contains('--12d'), isTrue);
expect(result.contains('あ'), isFalse);
expect(result.isActive, isFalse);
expect(result.start.dateTime, DateTime(2020, 03, 11, 18, 34));
expect(result.end.dateTime, DateTime(2020, 03, 12, 18, 34));
expect(result.toMarkup(), markup);
});
test('sexp', () {
Expand Down