OpenLP

Merge lp://qastaging/~phill-ridout/openlp/fixes-V into lp://qastaging/openlp

fixes-V
Merge into trunk

Proposed by Phill on 2017-12-17

Status:

Merged

Merged at revision:

2798

Proposed branch:

lp://qastaging/~phill-ridout/openlp/fixes-V

Merge into:

lp://qastaging/openlp

Diff against target:

151 lines (+63/-5)

7 files modified

openlp/core/common/__init__.py (+1/-0)
openlp/core/lib/pluginmanager.py (+1/-1)
openlp/core/ui/media/mediacontroller.py (+2/-1)
openlp/core/ui/servicemanager.py (+1/-1)
openlp/plugins/bibles/forms/bibleimportform.py (+1/-0)
openlp/plugins/presentations/presentationplugin.py (+2/-1)
tests/functional/openlp_plugins/presentations/test_impresscontroller.py (+55/-1)

To merge this branch:

bzr merge lp://qastaging/~phill-ridout/openlp/fixes-V

Related bugs:

Bug #1736274: SWORD importer - Information text not wrapped	Low	Fix Committed
Bug #1738047: OpenLP picks up macOS hidden files when loading plugins	Low	Fix Committed

Link a bug report

Reviewer	Date Requested	Status
Tim Bentley		Approve on 2017-12-21
Raoul Snyman	2017-12-17	Approve on 2017-12-21
Review via email: mp+335288@code.qastaging.launchpad.net

Description of the change

Number of fixes, including:
* Fix to creation and saving of services
* SongBeamer encoding detection
* OSX plugin, media and presentation controller discovery and import fixes
* Make the ftw thread work in its own thread, rather than the main thread

lp:~phill-ridout/openlp/fixes-V (revision 2801)
https://ci.openlp.io/job/Branch-01-Pull/2351/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2252/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2117/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1443/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1260/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04c-Code_Analysis2/390/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/219/ [WAITING]
[FAILURE]
Stopping after failure

Failed builds:
- Branch-05-AppVeyor-Tests #219: https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/219/console

Revision history for this message

Raoul Snyman (raoul-snyman) wrote on 2017-12-17:

Hold up with the thread changes. I have a thread manager thingie which I'm hoping will solve some of the segfaults we're getting related to threads.

Revision history for this message

Raoul Snyman (raoul-snyman) wrote on 2017-12-17:

Also, a note on the SongBeamer import. Despite what their forums and other stuff says, SongBeamer actually uses the encoding set by Windows. This means that I had a case where the file encoding was actually an Arabic encoding (which chardet couldn't detect either). Sadly, this is not a simple fix (and probably never will be).

lp://qastaging/~phill-ridout/openlp/fixes-V updated on 2017-12-17

2796. By Tim Bentley on 2017-12-17

Refactor asserts in api and common packages

lp:~trb143/openlp/asserts (revision 2809)
https://ci.openlp.io/job/Branch-01-Pull/2354/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2255/ [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2120/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1446/ [SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1263/ [SUCCESS]
https...