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

pep8

Browse Source
This commit is contained in:
Ken Roberts 2014-10-13 10:09:23 -07:00
parent e7e53501df
commit 5a1aa5c88c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@ class PJLink1(QTcpSocket):
changeStatus = pyqtSignal(str, int, str) changeStatus = pyqtSignal(str, int, str)
projectorNetwork = pyqtSignal(int) # Projector network activity projectorNetwork = pyqtSignal(int) # Projector network activity
projectorStatus = pyqtSignal(int) projectorStatus = pyqtSignal(int)
projectorAuthentication = pyqtSignal(str) # Authentication error - str=self.name
def __init__(self, name=None, ip=None, port=PJLINK_PORT, pin=None, *args, **kwargs): def __init__(self, name=None, ip=None, port=PJLINK_PORT, pin=None, *args, **kwargs):
""" """
@ -319,7 +320,7 @@ class PJLink1(QTcpSocket):
if data.upper().startswith('PJLINK'): if data.upper().startswith('PJLINK'):
# Reconnected from remote host disconnect ? # Reconnected from remote host disconnect ?
return self.check_login(data) return self.check_login(data)
if not '=' in data: if '=' not in data:
log.warn('(%s) Invalid packet received' % self.ip) log.warn('(%s) Invalid packet received' % self.ip)
return return
data_split = data.split('=') data_split = data.split('=')
@ -379,7 +380,7 @@ class PJLink1(QTcpSocket):
if sent == -1: if sent == -1:
# Network error? # Network error?
self.change_status(E_NETWORK, self.change_status(E_NETWORK,
translate('OpenLP.PJLink1', 'Error while sending data to projector')) translate('OpenLP.PJLink1', 'Error while sending data to projector'))
except SocketError as e: except SocketError as e:
self.disconnect_from_host() self.disconnect_from_host()
self.changeStatus(E_NETWORK, '%s : %s' % (e.error(), e.errorString())) self.changeStatus(E_NETWORK, '%s : %s' % (e.error(), e.errorString()))
@ -395,6 +396,7 @@ class PJLink1(QTcpSocket):
# Authentication error # Authentication error
self.disconnect_from_host() self.disconnect_from_host()
self.change_status(E_AUTHENTICATION) self.change_status(E_AUTHENTICATION)
self.projectorAuthentication.emit(self.name)
return return
elif data.upper() == 'ERR1': elif data.upper() == 'ERR1':
# Undefined command # Undefined command