diff options
Diffstat (limited to 'packet.py')
| -rw-r--r-- | packet.py | 37 |
1 files changed, 21 insertions, 16 deletions
@@ -3,26 +3,31 @@ import struct class Packet(object): - def __init__(self, cmd, *data): - self.cmd = cmd - self.data = data - if len(data) > 8: - raise ValueError('Too many data') - self.data = list(self.data) + [0] * (8-len(self.data)) + def __init__(self, cmd, *data): + self.cmd = cmd + self.data = data + if len(data) > 8: + raise ValueError('Too many data') + self.data = list(self.data) + [0] * (8-len(self.data)) @classmethod def FromStr(cls, s): - parts = struct.unpack('>9L', s) - return cls(parts[0], *parts[1:]) + try: + parts = struct.unpack('>9L', s) + return cls(parts[0], *parts[1:]) + except Exception: + raise ValueError('Failed to unpack %r' % s) def as_float(self, i): return struct.unpack('>f', struct.pack('>L', self.data[i]))[0] - def __str__(self): - return struct.pack('>L'+(''.join('f' if isinstance(i, float) else 'L' for i in self.data)), self.cmd, *self.data) + def __str__(self): + return struct.pack('>L'+(''.join('f' if isinstance(i, float) else 'L' for i in self.data)), self.cmd, *self.data) + def __bytes__(self): + return self.__str__() class CMD: - KA = 0 # No important data - PING = 1 # Data are echoed exactly - QUIT = 2 # No important data - PLAY = 3 # seconds, microseconds, frequency (Hz), amplitude (0.0 - 1.0), port, flags + KA = 0 # No important data + PING = 1 # Data are echoed exactly + QUIT = 2 # No important data + PLAY = 3 # seconds, microseconds, frequency (Hz), amplitude (0.0 - 1.0), port, flags CAPS = 4 # ports, client type (1), user ident (2-7) PCM = 5 # 16 samples, encoded S16_LE PCMSYN = 6 # number of samples which should be buffered right now @@ -32,9 +37,9 @@ class PLF: SAMEPHASE = 0x1 def itos(i): - return struct.pack('>L', i).rstrip('\0') + return struct.pack('>L', i).rstrip(b'\0') def stoi(s): - return struct.unpack('>L', s.ljust(4, '\0'))[0] + return struct.unpack('>L', s.ljust(4, b'\0'))[0] OBLIGATE_POLYPHONE = 0xffffffff |