Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stricter error checking when adding to queues

Browse source
This commit is contained in:
Martin Konecny 2013-05-17 12:18:29 -04:00
parent 19506fb8c2
commit 85b73706dc
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
python_apps/pypo/schedule/telnetliquidsoap.py
View file

@ -38,8 +38,15 @@ class TelnetLiquidsoap:
def __connect(self): def __connect(self):
return self.__connect() return self.__connect()
def __is_empty(self, tn, queue_id): def __is_empty(self, queue_id):
return True tn = self.__connect()
msg = '%s.queue\nexit\n' % queue_id
tn.write(msg)
output = tn.read_all().splitlines()
if len(output) == 3:
return len(output[0]) == 0
else:
raise Exception("Unexpected list length returned: %s" % output)
def queue_clear_all(self): def queue_clear_all(self):
with self.telnet_lock: with self.telnet_lock:
@ -66,11 +73,12 @@ class TelnetLiquidsoap:
def queue_push(self, queue_id, media_item): def queue_push(self, queue_id, media_item):
with self.telnet_lock: with self.telnet_lock:
tn = self.__connect()
if not self.__is_empty(tn, queue_id): if not self.__is_empty(queue_id):
raise QueueNotEmptyException() raise QueueNotEmptyException()
tn = self.__connect()
annotation = create_liquidsoap_annotation(media_item) annotation = create_liquidsoap_annotation(media_item)
msg = '%s.push %s\n' % (queue_id, annotation.encode('utf-8')) msg = '%s.push %s\n' % (queue_id, annotation.encode('utf-8'))
self.logger.debug(msg) self.logger.debug(msg)