nikdoof/python-ts3
1
0
Fork 0
mirror of https://github.com/nikdoof/python-ts3.git synced 2025-12-17 11:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

wrapping response in TS3Response class for usability

Browse Source
This commit is contained in:
Krzysztof Jagiello
2011-06-04 19:12:48 +02:00
parent 3d73a72842
commit 1d7d351e28
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ts3.py
View File

@@ -49,6 +49,17 @@ ts3_escape = { '/': r"\/",
"\t": r'\t', "\t": r'\t',
"\v": r'\v' } "\v": r'\v' }
class TS3Response():
def __init__(self, response):
self.response = TS3Proto.parse_command(response)
def successful(self):
if isinstance(self.response, dict):
return self.response['keys']['msg'] == 'ok'
# if the response is a list, it has to be successful
return True
class TS3Proto(): class TS3Proto():
_timeout = 0 _timeout = 0
_connected = False _connected = False
@@ -78,10 +89,7 @@ class TS3Proto():
self._telnet.write("%s\n" % cmd) self._telnet.write("%s\n" % cmd)
resp = self._telnet.read_until("\n", self._timeout) return TS3Response(self._telnet.read_until("\n", self._timeout))
resp = self.parse_command(resp)
return resp
def construct_command(self, command, keys=None, opts=None): def construct_command(self, command, keys=None, opts=None):
""" """
@@ -117,7 +125,8 @@ class TS3Proto():
return " ".join(cstr) return " ".join(cstr)
def parse_command(self, commandstr): @staticmethod
def parse_command(commandstr):
""" """
Parses a TS3 command string into command/keys/opts tuple Parses a TS3 command string into command/keys/opts tuple
@@ -128,7 +137,7 @@ class TS3Proto():
if len(commandstr.split('|')) > 1: if len(commandstr.split('|')) > 1:
vals = [] vals = []
for cmd in commandstr.split('|'): for cmd in commandstr.split('|'):
vals.append(self.parse_command(cmd)) vals.append(TS3Proto.parse_command(cmd))
return vals return vals
cmdlist = commandstr.strip().split(' ') cmdlist = commandstr.strip().split(' ')
@@ -144,7 +153,7 @@ class TS3Proto():
# Fix the stupidities in TS3 escaping # Fix the stupidities in TS3 escaping
v = [v[0], '='.join(v[1:])] v = [v[0], '='.join(v[1:])]
key, value = v key, value = v
keys[key] = self._unescape_str(value) keys[key] = TS3Proto._unescape_str(value)
elif v[0][0] == '-': elif v[0][0] == '-':
# Option # Option
opts.append(v[0][1:]) opts.append(v[0][1:])
@@ -225,8 +234,8 @@ class TS3Server(TS3Proto):
print response print response
if response['key']['msg'] != 'ok': if response.successful():
self._log.info('Login error: %s.' % response['keys']['msg']) self._log.info('Login error: %s.')
return False return False
else: else:
self._log.info('Login successful.') self._log.info('Login successful.')