Update node property support to match proto changes

1 files changed, 37 insertions, 0 deletions

diff --git a/src/buildstream/utils.py b/src/buildstream/utils.py
index 29b3bf484..99c22d169 100644
--- a/src/buildstream/utils.py
+++ b/src/buildstream/utils.py
@@ -24,6 +24,7 @@ Utilities
 import calendar
 import errno
 import hashlib
+import math
 import os
 import re
 import shutil
@@ -39,6 +40,7 @@ from contextlib import contextmanager
 from pathlib import Path
 from typing import Callable, IO, Iterable, Iterator, Optional, Tuple, Union
 from dateutil import parser as dateutil_parser
+from google.protobuf import timestamp_pb2
 
 import psutil
 
@@ -179,6 +181,41 @@ def _parse_timestamp(timestamp: str) -> float:
         raise UtilError(errmsg)
 
 
+def _make_protobuf_timestamp(timestamp: timestamp_pb2.Timestamp, timepoint: float):
+    """Obtain the Protobuf Timestamp represented by the time given in seconds.
+
+    Args:
+        timestamp: the Protobuf Timestamp to set
+        timepoint: the time since the epoch in seconds
+
+    """
+    timestamp.seconds = int(timepoint)
+    timestamp.nanos = int(math.modf(timepoint)[0] * 1e9)
+
+
+def _get_file_protobuf_mtimestamp(timestamp: timestamp_pb2.Timestamp, fullpath: str):
+    """Obtain the Protobuf Timestamp represented by the mtime of the
+    file at the given path."""
+    assert isinstance(fullpath, str), "Path to file must be a string: {}".format(str(fullpath))
+    try:
+        mtime = os.path.getmtime(fullpath)
+    except OSError:
+        raise UtilError("Failed to get mtime of file at {}".format(fullpath))
+    _make_protobuf_timestamp(timestamp, mtime)
+
+
+def _parse_protobuf_timestamp(timestamp: timestamp_pb2.Timestamp) -> float:
+    """Convert Protobuf Timestamp to seconds since epoch.
+
+    Args:
+        timestamp: the Protobuf Timestamp
+
+    Returns:
+        The time in seconds since epoch represented by the timestamp.
+    """
+    return timestamp.seconds + timestamp.nanos / 1e9
+
+
 def _set_file_mtime(fullpath: str, seconds: Union[int, float]) -> None:
     """Set the access and modification times of the file at the given path
     to the given time. The time of the file will be set with nanosecond