raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix localhost connection

This commit is contained in:
Ken Roberts 2014-10-15 11:18:00 -07:00
parent 8ea0917230
commit dc321155a0
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
openlp/core/lib/projector/pjlink1.py
View File

@ -348,11 +348,16 @@ class PJLink1(QTcpSocket):
self.timer.setInterval(2000) # Set 2 seconds for initial information self.timer.setInterval(2000) # Set 2 seconds for initial information
self.timer.start() self.timer.start()
@pyqtSlot()
def get_data(self): def get_data(self):
log.debug('(%s) get_data() Received readyRead signal' % self.ip)
return self._get_data()
def _get_data(self):
""" """
Socket interface to retrieve data. Socket interface to retrieve data.
""" """
log.debug('(%s) Reading data' % self.ip) log.debug('(%s) get_data(): Reading data' % self.ip)
if self.state() != self.ConnectedState: if self.state() != self.ConnectedState:
log.debug('(%s) get_data(): Not connected - returning' % self.ip) log.debug('(%s) get_data(): Not connected - returning' % self.ip)
return return
@ -370,28 +375,28 @@ class PJLink1(QTcpSocket):
log.debug('(%s) get_data(): Packet length < 7: "%s"' % (self.ip, data)) log.debug('(%s) get_data(): Packet length < 7: "%s"' % (self.ip, data))
self.projectorReceivedData.emit() self.projectorReceivedData.emit()
return return
log.debug('(%s) Checking new data "%s"' % (self.ip, data)) log.debug('(%s) get_data(): Checking new data "%s"' % (self.ip, data))
if data.upper().startswith('PJLINK'): if data.upper().startswith('PJLINK'):
# Reconnected from remote host disconnect ? # Reconnected from remote host disconnect ?
self.check_login(data) self.check_login(data)
self.projectorReceivedData.emit() self.projectorReceivedData.emit()
return return
elif '=' not in data: elif '=' not in data:
log.warn('(%s) Invalid packet received' % self.ip) log.warn('(%s) get_data(): Invalid packet received' % self.ip)
self.projectorReceivedData.emit() self.projectorReceivedData.emit()
return return
data_split = data.split('=') data_split = data.split('=')
try: try:
(prefix, class_, cmd, data) = (data_split[0][0], data_split[0][1], data_split[0][2:], data_split[1]) (prefix, class_, cmd, data) = (data_split[0][0], data_split[0][1], data_split[0][2:], data_split[1])
except ValueError as e: except ValueError as e:
log.warn('(%s) Invalid packet - expected header + command + data' % self.ip) log.warn('(%s) get_data(): Invalid packet - expected header + command + data' % self.ip)
log.warn('(%s) Received data: "%s"' % (self.ip, read)) log.warn('(%s) get_data(): Received data: "%s"' % (self.ip, read))
self.change_status(E_INVALID_DATA) self.change_status(E_INVALID_DATA)
self.projectorReceivedData.emit() self.projectorReceivedData.emit()
return return
if not self.check_command(cmd): if not self.check_command(cmd):
log.warn('(%s) Invalid packet - unknown command "%s"' % (self.ip, cmd)) log.warn('(%s) get_data(): Invalid packet - unknown command "%s"' % (self.ip, cmd))
self.projectorReceivedData.emit() self.projectorReceivedData.emit()
return return
return self.process_command(cmd, data) return self.process_command(cmd, data)
@ -414,6 +419,7 @@ class PJLink1(QTcpSocket):
self.change_status(err, self.errorString()) self.change_status(err, self.errorString())
else: else:
self.change_status(E_NETWORK, self.errorString()) self.change_status(E_NETWORK, self.errorString())
self.projectorUpdateIcons.emit()
return return
def send_command(self, cmd, opts='?', salt=None): def send_command(self, cmd, opts='?', salt=None):
@ -425,7 +431,7 @@ class PJLink1(QTcpSocket):
self.send_queue = [] self.send_queue = []
return return
self.projectorNetwork.emit(S_NETWORK_SENDING) self.projectorNetwork.emit(S_NETWORK_SENDING)
log.debug('(%s) Sending cmd="%s" opts="%s" %s' % (self.ip, log.debug('(%s) send_command(): Sending cmd="%s" opts="%s" %s' % (self.ip,
cmd, cmd,
opts, opts,
'' if salt is None else 'with hash')) '' if salt is None else 'with hash'))
@ -435,7 +441,9 @@ class PJLink1(QTcpSocket):
out = '%s%s %s%s' % (salt, cmd, opts, CR) out = '%s%s %s%s' % (salt, cmd, opts, CR)
if out in self.send_queue: if out in self.send_queue:
# Already there, so don't add # Already there, so don't add
log.debug('(%s) send_command(out=%s) Already in queue - skipping' % (self.ip, out)) log.debug('(%s) send_command(out=%s) Already in queue - skipping' % (self.ip, out.strip()))
elif len(self.send_queue) == 0:
return self._send_string(out)
else: else:
self.send_queue.append(out) self.send_queue.append(out)
if not self.send_busy: if not self.send_busy:
@ -454,6 +462,11 @@ class PJLink1(QTcpSocket):
:returns: None :returns: None
""" """
log.debug('(%s) _send_string()' % self.ip) log.debug('(%s) _send_string()' % self.ip)
if self.state() != self.ConnectedState:
log.debug('(%s) _send_string() Not connected - abort' % self.ip)
self.send_queue = []
self.send_busy = False
return
if data is not None: if data is not None:
out = data out = data
log.debug('(%s) _send_string(data=%s)' % (self.ip, out)) log.debug('(%s) _send_string(data=%s)' % (self.ip, out))
@ -466,7 +479,7 @@ class PJLink1(QTcpSocket):
self.send_busy = False self.send_busy = False
return return
self.send_busy = True self.send_busy = True
log.debug('(%s) _sed_string(): Sending "%s"' % (self.ip, out)) log.debug('(%s) _send_string(): Sending "%s"' % (self.ip, out))
log.debug('(%s) _send_string(): Queue = %s' % (self.ip, self.send_queue)) log.debug('(%s) _send_string(): Queue = %s' % (self.ip, self.send_queue))
try: try:
self.projectorNetwork.emit(S_NETWORK_SENDING) self.projectorNetwork.emit(S_NETWORK_SENDING)