[Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-s into lp:openlp
Ken Roberts has proposed merging lp:~alisonken1/openlp/pjlink2-s into lp:openlp. Commit message: PJLink2 update S Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~alisonken1/openlp/pjlink2-s/+merge/348698 - Convert action.remove raise ValueError on missing action to log.warning - Added 2-second status timer to update icons during projector state change - Update set power methods to use status timer - Update set shutter methods to use status timer - Fix process_avmt to include missing valid status from projector - Update projector info menu to include version 2 information - Add E_SOCKET_TIMEOUT to STATUS_ICONS dictionary - Change 'Action "{action}" does not exist' from raise ValueError to log.warning - Update projector to include PJLink2 extras - Fix version check exception if server returns status code != 200 - Fix version tests for status code - Fix actions tests for remove action not in list - Fix projector tests for changed calls - Update setup.cfg to inlude pycodestyle (pep8 deprecaded) - PEP8 fix for scripts/lp-merge.txt lp:~alisonken1/openlp/pjlink2-s (revision 2821) https://ci.openlp.io/job/Branch-01-Pull/2537/ [SUCCESS] https://ci.openlp.io/job/Branch-02a-Linux-Tests/2435/ [SUCCESS] https://ci.openlp.io/job/Branch-02b-macOS-Tests/224/ [FAILURE] https://ci.openlp.io/job/Branch-03a-Build-Source/126/ [SUCCESS] https://ci.openlp.io/job/Branch-03b-Build-macOS/119/ [SUCCESS] https://ci.openlp.io/job/Branch-04a-Code-Analysis/1588/[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test-Coverage/1401/[SUCCESS] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/322/ [FAILURE] -- Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/pjlink2-s into lp:openlp. === modified file 'openlp/core/common/actions.py' --- openlp/core/common/actions.py 2017-12-29 09:15:48 + +++ openlp/core/common/actions.py 2018-06-28 15:48:46 + @@ -113,7 +113,7 @@ if item[1] == action: self.actions.remove(item) return -raise ValueError('Action "{action}" does not exist.'.format(action=action)) +log.warning('Action "{action}" does not exist.'.format(action=action)) class CategoryList(object): === modified file 'openlp/core/projectors/manager.py' --- openlp/core/projectors/manager.py 2018-05-19 00:48:33 + +++ openlp/core/projectors/manager.py 2018-06-28 15:48:46 + @@ -36,8 +36,8 @@ from openlp.core.lib.ui import create_widget_action from openlp.core.projectors import DialogSourceStyle from openlp.core.projectors.constants import E_AUTHENTICATION, E_ERROR, E_NETWORK, E_NOT_CONNECTED, \ -E_UNKNOWN_SOCKET_ERROR, S_CONNECTED, S_CONNECTING, S_COOLDOWN, S_INITIALIZE, S_NOT_CONNECTED, S_OFF, S_ON, \ -S_STANDBY, S_WARMUP, PJLINK_PORT, STATUS_CODE, STATUS_MSG, QSOCKET_STATE +E_SOCKET_TIMEOUT, E_UNKNOWN_SOCKET_ERROR, S_CONNECTED, S_CONNECTING, S_COOLDOWN, S_INITIALIZE, \ +S_NOT_CONNECTED, S_OFF, S_ON, S_STANDBY, S_WARMUP, PJLINK_PORT, STATUS_CODE, STATUS_MSG, QSOCKET_STATE from openlp.core.projectors.db import ProjectorDB from openlp.core.projectors.editform import ProjectorEditForm @@ -62,6 +62,7 @@ S_COOLDOWN: ':/projector/projector_cooldown.png', E_ERROR: ':/projector/projector_error.png', E_NETWORK: ':/projector/projector_not_connected_error.png', +E_SOCKET_TIMEOUT: ':/projector/projector_not_connected_error.png', E_AUTHENTICATION: ':/projector/projector_not_connected_error.png', E_UNKNOWN_SOCKET_ERROR: ':/projector/projector_not_connected_error.png', E_NOT_CONNECTED: ':/projector/projector_not_connected_error.png' @@ -360,22 +361,14 @@ self.connect_action.setVisible(not visible) self.disconnect_action.setVisible(visible) self.status_action.setVisible(visible) -if visible: -self.select_input_action.setVisible(real_projector.link.power == S_ON) -self.edit_input_action.setVisible(real_projector.link.power == S_ON) -self.poweron_action.setVisible(real_projector.link.power == S_STANDBY) -self.poweroff_action.setVisible(real_projector.link.power == S_ON) -self.blank_action.setVisible(real_projector.link.power == S_ON and - not real_projector.link.shutter) -self.show_action.setVisible(real_projector.link.power == S_ON and -real_projector.link.shutter) -else: -self.select_input_action.setVisible(False) -self.edit_input_action.setVisible(False) -self.poweron_action.setVisible(False) -self.poweroff_action.setVisible(False) -self.blank_action.setVisible(False)
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-s into lp:openlp
Review: Needs Fixing The fix for version is not correct see inline notes. Diff comments: > > === modified file 'openlp/core/version.py' > --- openlp/core/version.py2018-03-29 15:54:55 + > +++ openlp/core/version.py2018-06-28 15:48:46 + > @@ -89,6 +89,10 @@ > while retries < 3: > try: > response = requests.get(download_url, headers=headers) > +if response.status_code != 200: No this is not correct if status == 200 then set remote_version otherwise leave as null. See how I have fixed it in the fonts branch, > +log.warn('Server returned status code {code}: ' > + 'Version update check not > available.'.format(code=response.status_code)) > +break > remote_version = response.text.strip() > log.debug('New version found: %s', remote_version) > break -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-s/+merge/348698 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-s into lp:openlp
The proposal to merge lp:~alisonken1/openlp/pjlink2-s into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~alisonken1/openlp/pjlink2-s/+merge/348698 -- 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-s into lp:openlp
Ken Roberts has proposed merging lp:~alisonken1/openlp/pjlink2-s into lp:openlp. Commit message: PJLink2 update S Requested reviews: Tim Bentley (trb143) For more details, see: https://code.launchpad.net/~alisonken1/openlp/pjlink2-s/+merge/348709 - Convert action.remove raise ValueError on missing action to log.warning - Added 2-second status timer to update icons during projector state change - Update set power methods to use status timer - Update set shutter methods to use status timer - Fix process_avmt to include missing valid status from projector - Update projector info menu to include version 2 information - Add E_SOCKET_TIMEOUT to STATUS_ICONS dictionary - Change 'Action "{action}" does not exist' from raise ValueError to log.warning - Update projector to include PJLink2 extras - Fix version check exception if server returns status code != 200 - Fix version tests for status code - Fix actions tests for remove action not in list - Fix projector tests for changed calls - Update setup.cfg to inlude pycodestyle (pep8 deprecaded) - PEP8 fix for scripts/lp-merge.txt - Updated fix for version check exception lp:~alisonken1/openlp/pjlink2-s (revision 2822) https://ci.openlp.io/job/Branch-01-Pull/2538/ [SUCCESS] https://ci.openlp.io/job/Branch-02a-Linux-Tests/2436/ [SUCCESS] https://ci.openlp.io/job/Branch-02b-macOS-Tests/225/ [FAILURE] https://ci.openlp.io/job/Branch-03a-Build-Source/127/ [SUCCESS] https://ci.openlp.io/job/Branch-03b-Build-macOS/120/ [SUCCESS] https://ci.openlp.io/job/Branch-04a-Code-Analysis/1589/[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test-Coverage/1402/[SUCCESS] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/323/ [FAILURE] -- Your team OpenLP Core is subscribed to branch lp:openlp. === modified file 'openlp/core/common/actions.py' --- openlp/core/common/actions.py 2017-12-29 09:15:48 + +++ openlp/core/common/actions.py 2018-06-28 17:08:08 + @@ -113,7 +113,7 @@ if item[1] == action: self.actions.remove(item) return -raise ValueError('Action "{action}" does not exist.'.format(action=action)) +log.warning('Action "{action}" does not exist.'.format(action=action)) class CategoryList(object): === modified file 'openlp/core/projectors/manager.py' --- openlp/core/projectors/manager.py 2018-05-19 00:48:33 + +++ openlp/core/projectors/manager.py 2018-06-28 17:08:08 + @@ -36,8 +36,8 @@ from openlp.core.lib.ui import create_widget_action from openlp.core.projectors import DialogSourceStyle from openlp.core.projectors.constants import E_AUTHENTICATION, E_ERROR, E_NETWORK, E_NOT_CONNECTED, \ -E_UNKNOWN_SOCKET_ERROR, S_CONNECTED, S_CONNECTING, S_COOLDOWN, S_INITIALIZE, S_NOT_CONNECTED, S_OFF, S_ON, \ -S_STANDBY, S_WARMUP, PJLINK_PORT, STATUS_CODE, STATUS_MSG, QSOCKET_STATE +E_SOCKET_TIMEOUT, E_UNKNOWN_SOCKET_ERROR, S_CONNECTED, S_CONNECTING, S_COOLDOWN, S_INITIALIZE, \ +S_NOT_CONNECTED, S_OFF, S_ON, S_STANDBY, S_WARMUP, PJLINK_PORT, STATUS_CODE, STATUS_MSG, QSOCKET_STATE from openlp.core.projectors.db import ProjectorDB from openlp.core.projectors.editform import ProjectorEditForm @@ -62,6 +62,7 @@ S_COOLDOWN: ':/projector/projector_cooldown.png', E_ERROR: ':/projector/projector_error.png', E_NETWORK: ':/projector/projector_not_connected_error.png', +E_SOCKET_TIMEOUT: ':/projector/projector_not_connected_error.png', E_AUTHENTICATION: ':/projector/projector_not_connected_error.png', E_UNKNOWN_SOCKET_ERROR: ':/projector/projector_not_connected_error.png', E_NOT_CONNECTED: ':/projector/projector_not_connected_error.png' @@ -360,22 +361,14 @@ self.connect_action.setVisible(not visible) self.disconnect_action.setVisible(visible) self.status_action.setVisible(visible) -if visible: -self.select_input_action.setVisible(real_projector.link.power == S_ON) -self.edit_input_action.setVisible(real_projector.link.power == S_ON) -self.poweron_action.setVisible(real_projector.link.power == S_STANDBY) -self.poweroff_action.setVisible(real_projector.link.power == S_ON) -self.blank_action.setVisible(real_projector.link.power == S_ON and - not real_projector.link.shutter) -self.show_action.setVisible(real_projector.link.power == S_ON and -real_projector.link.shutter) -else: -self.select_input_action.setVisible(False) -self.edit_input_action.setVisible(False) -self.poweron_action.setVisible(False) -self.poweroff_action.setVisible(False) -self.blank_action.setVisible(False) -self.sho
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-s into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-s/+merge/348698 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-s into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-s/+merge/348709 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-s into lp:openlp
Review: Approve Looks good to me -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-s/+merge/348709 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-s into lp:openlp
The proposal to merge lp:~alisonken1/openlp/pjlink2-s into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~alisonken1/openlp/pjlink2-s/+merge/348709 -- 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