lp:~alisonken1/openlp/pjlink2-i

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2760

Raoul Snyman: Approve on 2017-08-23

Tomas Groth: Approve on 2017-08-20

Tim Bentley: Pending requested 2017-08-12

Diff: 1078 lines (+690/-117)

3 files modified

openlp/core/lib/projector/pjlink.py (+45/-35)
tests/functional/openlp_core_lib/test_projector_pjlink_cmd_routing.py (+1/-1)
tests/functional/openlp_core_lib/test_projector_pjlink_commands.py (+644/-81)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2760. By Ken Roberts on 2017-08-12

Fix deprecated log calls

2759. By Ken Roberts on 2017-08-12

PJLink update I - minor code cleanups and new tests

2758. By Phill on 2017-08-11

Definitely ready for merging, unless, of course you guys find some more issues!

Part 2

Changed the pathedit widget over to using pathlib
Added a 'patched' file dialog
Added a few utility methods

lp:~phill-ridout/openlp/pathlib2 (revision 2763)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2125/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2033/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1938/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis...

2757. By Ken Roberts on 2017-08-11

- Restructured AVMT to shortcut return on invalid input
- Added AVMT bad data test
- Fix AVMT tests
- Added extra logging information for CLSS errors
- Added CLSS failure tests
- Restructure ERST to not use hard-coded error breakout
- Added several ERST tests
- Fix ERST tests
- Added tests for pjlink.process_command

--------------------------------
lp:~alisonken1/openlp/pjlink2-h (revision 2757)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2130/
[SUCCESS] https://ci.openlp.io/job/Branc...

2756. By Ken Roberts on 2017-08-07

- Break PJLink class into base class and process commands class
- Restructure class methods
- Break projector PJLink tests into pjlink_base and pjlink_commands
- Restructure test methods
- Remove unused test imports
- Rename several tests
- Remove extraneous test (test_projector_return_ok)
- Added tests for process_erst reply

So much for no code changes this update :).
- Convert AVMT check to use dict instead of if..elif
- Fix AVMT test

--------------------------------
lp:~alisonken1/openlp...

2755. By Raoul Snyman on 2017-08-03

Remove the version number from various places within OpenLP. Fix the import path of UiStrings.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/remove-version-number (revision 2756)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2112/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2022/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1930/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1307/
[SUCCESS] https:...

2754. By Phill on 2017-08-03

This is the first in a series of merges to switch to the pathlib module. As per tgc's request I am splitting this down into smaller parts for merging. As such, this merge works in itself, but is incomplete.

Please bear this in mind when reviewing

Also contains a fix for bible gateway

lp:~phill-ridout/openlp/pathlib1 (revision 2757)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2108/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2018/
[SUCCESS] https://ci.openlp.io/job/B...

2753. By Ken Roberts on 2017-08-01

-- Renamed test_projector_clss to clss_one
-- Added test_projector_clss_two
-- Updated PJLink non-standard class check
-- Added process_snum
-- Added tests for process_snum
-- Renamed tests/functional/openlp_core_lib/test_projectordb.py to test_projector_db.py
-- Added filter model command (rfil) -- Added lamp model command (rlmp)
-- Added tests for filter/model commands
-- Fix typo in projector status window
-- Cleanups from commit notes
-- Added invalid data buffer cleanups
-- Added calls ...

2752. By virbinarus on 2017-07-04

I removed the blank spaces from the file.
Allows service items to be expanded and collapsed with the left and right arrow keys.

lp:~virbinarus/openlp/expandserviceitem (revision 2758)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2097/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2007/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1920/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1297/
[[1;32...

2751. By Ken Roberts on 2017-06-22

-- Fix docstring for pjlink2 db upgrade
-- Add PJLink2 module for UDP socket (skeleton)
-- Move ProjectorManager.projector_list to class attribute
-- Added database_exists check for first time install skip upgrade checks
-- Fix db upgrade for songs
-- Fix db upgrade for songusage
-- Added database_exists from sqlalchemy_utils
-- Added test for skipping upgrade on no db
-- Revert songs db upgrade_7 back to upgrade_6
-- kwargs cleanup

--------------------------------
lp:~alisonken1/openlp/pjli...