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

fixed problems with receiving responses from the server

Browse Source
This commit is contained in:
Krzysztof Jagiello
2011-06-04 22:55:06 +02:00
parent 9ca0dbe598
commit 4efb49c114
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ts3.py
View File

@@ -54,8 +54,9 @@ ts3_escape = { "\\": r'\\',
"\v": r'\v' } "\v": r'\v' }
class TS3Response(): class TS3Response():
def __init__(self, response): def __init__(self, response, data):
self.response = TS3Proto.parse_command(response) self.response = TS3Proto.parse_command(response)
self.data = TS3Proto.parse_command(data)
def is_successful(self): def is_successful(self):
if isinstance(self.response, dict): if isinstance(self.response, dict):
@@ -74,9 +75,9 @@ class TS3Proto():
self._timeout = timeout self._timeout = timeout
self._connected = False self._connected = False
data = self._telnet.read_until("\n", self._timeout) data = self._telnet.read_until("\n\r", self._timeout)
if data.endswith("TS3\n"): if data.endswith("TS3\n\r"):
self._connected = True self._connected = True
return self._connected return self._connected
@@ -91,9 +92,18 @@ class TS3Proto():
def send_command(self, command, keys=None, opts=None): def send_command(self, command, keys=None, opts=None):
self.check_connection() self.check_connection()
self._telnet.write("%s\n" % self.construct_command(command, keys=keys, opts=opts))
self._telnet.write("%s\n\r" % self.construct_command(command, keys=keys, opts=opts))
data = ""
response = self._telnet.read_until("\n\r", self._timeout)
if not response.startswith("error"):
# what we just got was extra data
data = response
response = self._telnet.read_until("\n\r", self._timeout)
return TS3Response(self._telnet.read_until("\n", self._timeout)) return TS3Response(response, data)
def check_connection(self): def check_connection(self):
if not self.is_connected: if not self.is_connected:
@@ -144,7 +154,9 @@ class TS3Proto():
@param commandstr: Command string @param commandstr: Command string
@type commandstr: string @type commandstr: string
""" """
if commandstr.strip() == "":
return {}
if len(commandstr.split('|')) > 1: if len(commandstr.split('|')) > 1:
vals = [] vals = []
for cmd in commandstr.split('|'): for cmd in commandstr.split('|'):