Skip to content
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

OscBundle uses compact repr #441

Merged
merged 1 commit into from
Feb 19, 2025
Merged

OscBundle uses compact repr #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 14 additions & 46 deletions supriya/osc/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
from collections.abc import Sequence as SequenceABC
from typing import List

from uqbar.objects import get_repr

from ..utils import group_by_count

BUNDLE_PREFIX = b"#bundle\x00"
Expand Down Expand Up @@ -109,23 +107,13 @@ class OscMessage:
... ["a", "b", ["c", "d"]],
... )
>>> osc_message
OscMessage('/foo', 1, 2.5, OscBundle(
contents=(
OscMessage('/bar', 'baz', 3.0),
OscMessage('/ffff', False, True, None),
),
), ['a', 'b', ['c', 'd']])
OscMessage('/foo', 1, 2.5, OscBundle(contents=[OscMessage('/bar', 'baz', 3.0), OscMessage('/ffff', False, True, None)]), ['a', 'b', ['c', 'd']])

::

>>> datagram = osc_message.to_datagram()
>>> OscMessage.from_datagram(datagram)
OscMessage('/foo', 1, 2.5, OscBundle(
contents=(
OscMessage('/bar', 'baz', 3.0),
OscMessage('/ffff', False, True, None),
),
), ['a', 'b', ['c', 'd']])
OscMessage('/foo', 1, 2.5, OscBundle(contents=[OscMessage('/bar', 'baz', 3.0), OscMessage('/ffff', False, True, None)]), ['a', 'b', ['c', 'd']])

::

Expand Down Expand Up @@ -328,13 +316,7 @@ class OscBundle:
... contents=(message_one, message_two),
... )
>>> inner_bundle
OscBundle(
contents=(
OscMessage('/one', 1),
OscMessage('/two', 2),
),
timestamp=1401557034.5,
)
OscBundle(timestamp=1401557034.5, contents=[OscMessage('/one', 1), OscMessage('/two', 2)])

::

Expand All @@ -351,18 +333,7 @@ class OscBundle:
... contents=(inner_bundle, message_three),
... )
>>> outer_bundle
OscBundle(
contents=(
OscBundle(
contents=(
OscMessage('/one', 1),
OscMessage('/two', 2),
),
timestamp=1401557034.5,
),
OscMessage('/three', 3),
),
)
OscBundle(contents=[OscBundle(timestamp=1401557034.5, contents=[OscMessage('/one', 1), OscMessage('/two', 2)]), OscMessage('/three', 3)])

::

Expand All @@ -383,18 +354,7 @@ class OscBundle:

>>> decoded_bundle = supriya.osc.OscBundle.from_datagram(datagram)
>>> decoded_bundle
OscBundle(
contents=(
OscBundle(
contents=(
OscMessage('/one', 1),
OscMessage('/two', 2),
),
timestamp=1401557034.5,
),
OscMessage('/three', 3),
),
)
OscBundle(contents=[OscBundle(timestamp=1401557034.5, contents=[OscMessage('/one', 1), OscMessage('/two', 2)]), OscMessage('/three', 3)])

::

Expand Down Expand Up @@ -425,7 +385,15 @@ def __eq__(self, other) -> bool:
return True

def __repr__(self) -> str:
return get_repr(self)
parts = ["{}(".format(type(self).__name__)]
if self.timestamp is not None:
parts.append(f"timestamp={self.timestamp}")
if self.contents:
parts.append(", ")
if self.contents:
parts.append(f"contents={list(self.contents)!r}")
parts.append(")")
return "".join(parts)

def __str__(self) -> str:
return format_datagram(bytearray(self.to_datagram()))
Expand Down
24 changes: 6 additions & 18 deletions tests/test_osc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,9 @@ def test_OscMessage() -> None:
),
["a", "b", ["c", "d"]],
)
assert repr(osc_message) == normalize(
"""
OscMessage('/foo', 1, 2.5, OscBundle(
contents=(
OscMessage('/bar', 'baz', 3.0),
OscMessage('/ffff', False, True, None),
),
), ['a', 'b', ['c', 'd']])
"""
assert (
repr(osc_message)
== "OscMessage('/foo', 1, 2.5, OscBundle(contents=[OscMessage('/bar', 'baz', 3.0), OscMessage('/ffff', False, True, None)]), ['a', 'b', ['c', 'd']])"
)
assert str(osc_message) == normalize(
"""
Expand All @@ -69,15 +63,9 @@ def test_OscMessage() -> None:
datagram = osc_message.to_datagram()
new_osc_message = OscMessage.from_datagram(datagram)
assert osc_message == new_osc_message
assert repr(new_osc_message) == normalize(
"""
OscMessage('/foo', 1, 2.5, OscBundle(
contents=(
OscMessage('/bar', 'baz', 3.0),
OscMessage('/ffff', False, True, None),
),
), ['a', 'b', ['c', 'd']])
"""
assert (
repr(new_osc_message)
== "OscMessage('/foo', 1, 2.5, OscBundle(contents=[OscMessage('/bar', 'baz', 3.0), OscMessage('/ffff', False, True, None)]), ['a', 'b', ['c', 'd']])"
)


Expand Down
Loading