objectstore-client 0.2.2__tar.gz → 0.2.3__tar.gz

{objectstore_client-0.2.2 → objectstore_client-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: objectstore-client
-Version: 0.2.2
+Version: 0.2.3
 Summary: Client SDK for Objectstore, the Sentry object storage platform
 Author: Sentry
 Author-email: Sentry <oss@sentry.io>

{objectstore_client-0.2.2 → objectstore_client-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "objectstore-client"
-version = "0.2.2"
+version = "0.2.3"
 description = "Client SDK for Objectstore, the Sentry object storage platform"
 readme = "README.md"
 authors = [{ name = "Sentry", email = "oss@sentry.io" }]

{objectstore_client-0.2.2 → objectstore_client-0.2.3}/src/objectstore_client/metadata.py

@@ -148,37 +148,47 @@ def parse_expiration(value: str) -> ExpirationPolicy | None:
 
 
 def format_timedelta(delta: timedelta) -> str:
-    days = delta.days
-    output = f"{days} days" if days else ""
-    if seconds := delta.seconds:
-        if output:
-            output += " "
-        output += f"{seconds} seconds"
+    """
+    Formats a duration in the wire format, such as `400d 1m 30s`.
+
+    Days are the largest unit, components that are zero are omitted, and a zero duration
+    is written as `0s`. Any sub-second remainder is truncated.
+    """
+    minutes, seconds = divmod(delta.seconds, 60)
+    hours, minutes = divmod(minutes, 60)
+
+    components = ((delta.days, "d"), (hours, "h"), (minutes, "m"), (seconds, "s"))
+    output = " ".join(f"{value}{unit}" for value, unit in components if value)
 
-    return output
+    return output or "0s"
 
 
 TIME_SPLIT = re.compile(r"[^\W\d_]+|\d+")
 
 
 def parse_timedelta(delta: str) -> timedelta:
+    """
+    Parses a duration in the wire format, such as `400d 1m 30s`.
+
+    Units are matched exactly, so anything outside the wire format raises a
+    `ValueError` rather than being mistaken for a unit it merely starts with.
+    """
     words = TIME_SPLIT.findall(delta)
     seconds = 0
 
     for num, unit in itertools_batched(words, n=2, strict=True):
         num = int(num)
-        multiplier = 0
 
-        if unit.startswith("w"):
-            multiplier = 86400 * 7
-        elif unit.startswith("d"):
+        if unit == "d":
             multiplier = 86400
-        elif unit.startswith("h"):
+        elif unit == "h":
             multiplier = 3600
-        elif unit.startswith("m") and not unit.startswith("ms"):
+        elif unit == "m":
             multiplier = 60
-        elif unit.startswith("s"):
+        elif unit == "s":
             multiplier = 1
+        else:
+            raise ValueError(f"unknown time unit {unit!r} in duration {delta!r}")
 
         seconds += num * multiplier