[Openlp-core] macOS Test Results: Passed
macOS tests passed! -- https://code.launchpad.net/~bastian-germann/openlp/gpl3/+merge/366626 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~bastian-germann/openlp/gpl3/+merge/366626 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~bastian-germann/openlp/gpl3/+merge/366626 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~bastian-germann/openlp/gpl3 into lp:openlp
The proposal to merge lp:~bastian-germann/openlp/gpl3 into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~bastian-germann/openlp/gpl3/+merge/365987 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/gpl3 into lp:openlp
Review: Needs Fixing A few new files have been added since this MR was created, please update those files as well. -- https://code.launchpad.net/~bastian-germann/openlp/gpl3/+merge/365987 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/wix-packaging into lp:openlp/packaging
Review: Needs Fixing Add support for registrering "capabilities" (file extensions), as described here: https://stackoverflow.com/questions/2772452/how-to-associate-application-with-existing-file-types-using-wix-installer -- https://code.launchpad.net/~raoul-snyman/openlp/wix-packaging/+merge/365880 Your team OpenLP Core is subscribed to branch lp:openlp/packaging. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v02 into lp:openlp
The proposal to merge lp:~alisonken1/openlp/pjlink2-v02 into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~alisonken1/openlp/pjlink2-v02/+merge/366554 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v1 into lp:openlp
The proposal to merge lp:~alisonken1/openlp/pjlink2-v1 into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~alisonken1/openlp/pjlink2-v1/+merge/366334 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp
The proposal to merge lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~alisonken1/openlp/pjlink2-v03/+merge/366612 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v03/+merge/366612 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v02 into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v02/+merge/366554 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v1 into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v1/+merge/366334 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v03/+merge/366612 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] macOS Test Results: Passed
macOS tests passed! -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v03/+merge/366612 Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v03/+merge/366612 Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp
Ken Roberts has proposed merging lp:~alisonken1/openlp/pjlink2-v03 into
lp:openlp with lp:~alisonken1/openlp/pjlink2-v02 as a prerequisite.
Commit message:
PJLink2 Update V03
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~alisonken1/openlp/pjlink2-v03/+merge/366612
NOTE: Part 3 of a multi-part merge.
v[1..n] merges are to fix tests
WARNING: Requires merge of lp:~alisonken1/openlp/pjlink2-v02
- Update tests for test_projector_pjlink_base_02.py
- Added setUp() and tearDown() to have a common pjlink instance
- Rename test_send_command_no_data() to test_send_command_not_connected() to
reflect actual test
- Add tests for PJLink.send_command and PJLink._underscore_send_command
- Fix test_projector_pjlink_cmd_routing for logging change to
PJLink._underscore_send_command()
- In openlp.core.projectors.pjlink.PJLink class:
- Added copy import for PJLink reset information so PJLINK_CLASS default is
not changed
- Fix send_command() socket state check
- Change some log entries from debug to warning
- Add call to pjlink._underscore_send_command() for invalid command check if
send_queue or priority_queue has data to send
- Fix _underscore_send_command no data check to include setting send_busy
to False
lp:~alisonken1/openlp/pjlink2-v03 (revision 2861)
https://ci.openlp.io/job/Branch-01-Pull/2722/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2616/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/391/ [SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/214/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/193/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Lint/1676/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1489/[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/371/ [SUCCESS]
All builds passed
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp.
=== modified file 'openlp/core/projectors/pjlink.py'
--- openlp/core/projectors/pjlink.py 2019-04-28 07:10:59 +
+++ openlp/core/projectors/pjlink.py 2019-04-28 07:10:59 +
@@ -48,6 +48,7 @@
"""
import logging
from codecs import decode
+from copy import copy
from PyQt5 import QtCore, QtNetwork
@@ -276,6 +277,7 @@
self.model_lamp = None # RLMP
self.mute = None # AVMT
self.other_info = None # INFO
+self.pjlink_class = copy(PJLINK_CLASS)
self.pjlink_name = None # NAME
self.power = S_OFF # POWR
self.serial_no = None # SNUM
@@ -629,11 +631,14 @@
:param salt: Optional salt for md5 hash initial authentication
:param priority: Option to send packet now rather than queue it up
"""
-if QSOCKET_STATE[self.state()] != S_CONNECTED:
+if QSOCKET_STATE[self.state()] != QSOCKET_STATE[S_CONNECTED]:
log.warning('({ip}) send_command(): Not connected - returning'.format(ip=self.entry.name))
return self.reset_information()
if cmd not in PJLINK_VALID_CMD:
log.error('({ip}) send_command(): Invalid command requested - ignoring.'.format(ip=self.entry.name))
+if self.priority_queue or self.send_queue:
+# Just in case there's already something to send
+return self._send_command()
return
log.debug('({ip}) send_command(): Building cmd="{command}" opts="{data}"{salt}'.format(ip=self.entry.name,
command=cmd,
@@ -649,9 +654,9 @@
options=opts,
suffix=PJLINK_SUFFIX)
if out in self.priority_queue:
-log.debug('({ip}) send_command(): Already in priority queue - skipping'.format(ip=self.entry.name))
+log.warning('({ip}) send_command(): Already in priority queue - skipping'.format(ip=self.entry.name))
elif out in self.send_queue:
-log.debug('({ip}) send_command(): Already in normal queue - skipping'.format(ip=self.entry.name))
+log.warning('({ip}) send_command(): Already in normal queue - skipping'.format(ip=self.entry.name))
else:
if priority:
log.debug('({ip}) send_command(): Adding to priority queue'.format(ip=self.entry.name))
@@ -672,7 +677,8 @@
:param utf8: Send as UTF-8 string otherwise send as ASCII string
"""
if not data and not self.priority_queue and not self.send_queue:
-log.debug('({ip}) _send_command(): Nothing to send -
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-v03/+merge/366612 Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/pjlink2-v03 into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
