Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions pygeometa/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def generate_datetime(date_value: str) -> str:
:returns: `str` of date-time value
"""

format_ = None
value = None

if isinstance(date_value, str) and date_value != 'None':
Expand All @@ -118,8 +119,11 @@ def generate_datetime(date_value: str) -> str:
LOGGER.debug(msg)
format_ = '%Y-%m-%dT%H:%M:%S'

LOGGER.debug('date type found; expanding to date-time')
value = datetime.strptime(date_value, format_).strftime('%Y-%m-%dT%H:%M:%SZ') # noqa
if format_ is not None:
LOGGER.debug('date type found; expanding to date-time')
value = datetime.strptime(date_value, format_).strftime('%Y-%m-%dT%H:%M:%SZ') # noqa
else:
value = date_value

elif isinstance(date_value, int) and len(str(date_value)) == 4:
date_value2 = str(date_value)
Expand Down
21 changes: 20 additions & 1 deletion tests/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
prune_transfer_option, MCFReadError,
MCFValidationError, SCHEMAS, transform_metadata,
validate_mcf)
from pygeometa.helpers import json_dumps
from pygeometa.helpers import generate_datetime, json_dumps
from pygeometa.schemas import (get_supported_schemas, InvalidSchemaError,
load_schema)
from pygeometa.schemas.iso19139 import ISO19139OutputSchema
Expand Down Expand Up @@ -549,6 +549,25 @@ def test_schema_org_coords(self):
}
self.assertEqual(_get_box_from_coords(geo3), [1, 2, 3, 4])

def test_generate_datetime(self):
"""Test pygeometa.helpers:generate_datetime"""

self.assertEqual(generate_datetime('2026'), '2026-01-01T00:00:00Z')
self.assertEqual(generate_datetime('2026-10'), '2026-10-01T00:00:00Z')
self.assertEqual(generate_datetime('2026-10-30'),
'2026-10-30T00:00:00Z')
self.assertEqual(generate_datetime('2026-10-30T00:12:21'),
'2026-10-30T00:12:21Z')
self.assertEqual(generate_datetime('2026-10-30T00:12:21Z'),
'2026-10-30T00:12:21Z')
self.assertEqual(generate_datetime(2026), '2026-01-01T00:00:00Z')
self.assertEqual(generate_datetime(datetime.datetime(2026, 10, 30)),
'2026-10-30T00:00:00Z')
self.assertEqual(generate_datetime(datetime.datetime(2026, 10, 30, 11, 11, 11)), # noqa
'2026-10-30T11:11:11Z')
self.assertEqual(len(generate_datetime(None)), 20)
self.assertEqual(len(generate_datetime('None')), 20)


def get_abspath(filepath):
"""helper function absolute file access"""
Expand Down
Loading