Skip to content

Decode socket data for python3 #1

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

Merged
merged 5 commits into from
May 24, 2016
Merged

Decode socket data for python3 #1

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ae4c3e
Added sock data decoding into cp437
olimpiurob May 15, 2016
24a0aa2
Properly handle python3 data decoding
olimpiurob May 15, 2016
6ab5b2f
Handle exception output
olimpiurob May 15, 2016
c2505bd
Connection exceptions should be handled elsewhere and just raise the …
olimpiurob May 15, 2016
89df5d7
Updated with the following changes:
olimpiurob May 15, 2016
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
101 changes: 67 additions & 34 deletions lightify/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,19 @@ def on(self):
def set_onoff(self, on):
self.__on = on
super(Light, self).set_onoff(on)
if self.lum() == 0 and on != 0:
self.__lum = 1 # This seems to be the default

def lum(self):
return self.__lum

def set_luminance(self, lum, time):
self.__lum = lum
super(Light, self).set_luminance(lum, time)
if lum > 0 and self.__on == 0:
self.__on = 1
elif lum == 0 and self.__on != 0:
self.__on = 0

def temp(self):
return self.__temp
Expand Down Expand Up @@ -189,17 +195,8 @@ def __init__(self, host):
self.__groups = {}
self.__lights = {}

try:
self.__sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
except socket.error as msg:
sys.stderr.write("[ERROR] %s\n" % msg[1])
sys.exit(1)

try:
self.__sock.connect((host, PORT))
except socket.error as msg:
sys.stderr.write("[ERROR] %s\n" % msg[1])
sys.exit(2)
self.__sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.__sock.connect((host, PORT))

def groups(self):
"""Dict from group name to Group object."""
Expand All @@ -224,31 +221,59 @@ def next_seq(self):

def build_global_command(self, command, data):
length = 6 + len(data)
try:
result = struct.pack(
"<H6B",
length,
0x02,
command,
0,
0,
0x7,
self.next_seq()
) + data
except TypeError:
# Decode using cp437 for python3. This is not UTF-8
result = struct.pack(
"<H6B",
length,
0x02,
command,
0,
0,
0x7,
self.next_seq()
) + data.decode('cp437')

return struct.pack(
"<H6B",
length,
0x02,
command,
0,
0,
0x7,
self.next_seq()
) + data
return result

def build_basic_command(self, flag, command, group_or_light, data):
length = 14 + len(data)
try:
result = struct.pack(
"<H6B",
length,
flag,
command,
0,
0,
0x7,
self.next_seq()
) + group_or_light + data
except TypeError:
# Decode using cp437 for python3. This is not UTF-8
result = struct.pack(
"<H6B",
length,
flag,
command,
0,
0,
0x7,
self.next_seq()
) + group_or_light + data.decode('cp437')

return struct.pack(
"<H6B",
length,
flag,
command,
0,
0,
0x7,
self.next_seq()
) + group_or_light + data
return result

def build_command(self, command, group, data):
# length = 14 + len(data)
Expand Down Expand Up @@ -377,8 +402,12 @@ def recv(self):
)
data = self.__sock.recv(expected)
expected = expected - len(data)
string = string + data
self.__logger.debug('received "%s"', binascii.hexlify(string))
try:
string = string + data
except TypeError:
# Decode using cp437 for python3. This is not UTF-8
string = string + data.decode('cp437')
self.__logger.debug('received "%s"', string)
return data

def update_light_status(self, light):
Expand Down Expand Up @@ -417,7 +446,11 @@ def update_all_light_status(self):
self.__logger.debug("%d %d %d", i, pos, len(payload))

(a, addr, stat, name, extra) = struct.unpack("<HQ16s16sQ", payload)
name = name.replace('\0', "")
try:
name = name.replace('\0', "")
except TypeError:
# Decode using cp437 for python3. This is not UTF-8
name = name.decode('cp437').replace('\0', "")

self.__logger.debug('light: %x %x %s %x', a, addr, name, extra)
if addr in old_lights:
Expand Down