OpenLP

Merge lp://qastaging/~tomasgroth/openlp/song-import-fixes25 into lp://qastaging/openlp

song-import-fixes25
Merge into trunk

Proposed by Tomas Groth on 2017-01-20

Status:

Merged

Merged at revision:

2718

Proposed branch:

lp://qastaging/~tomasgroth/openlp/song-import-fixes25

Merge into:

lp://qastaging/openlp

Diff against target:

311 lines (+130/-29)

9 files modified

openlp/plugins/songs/lib/__init__.py (+2/-2)
openlp/plugins/songs/lib/importers/easyslides.py (+12/-12)
openlp/plugins/songs/lib/importers/songbeamer.py (+9/-6)
openlp/plugins/songs/lib/importers/videopsalm.py (+4/-2)
tests/functional/openlp_plugins/songs/test_easyslidesimport.py (+2/-0)
tests/resources/easyslidessongs/Amazing Grace.json (+6/-6)
tests/resources/easyslidessongs/Export_2017-01-12_BB.json (+44/-0)
tests/resources/easyslidessongs/Export_2017-01-12_BB.xml (+50/-0)
tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold.json (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~tomasgroth/openlp/song-import-fixes25

Related bugs:

Bug #1530597: Importing Songbeamer songs using latin1 encoding doesn't get decoded correctly	Low	Fix Committed
Bug #1652851: VideoPsalm import fails due to unexpected format	Medium	Fix Committed
Bug #1655985: EasySlide importer gets the verse order wrong	Low	Fix Committed
Bug #1655988: Formatting tags gets included in searchable lyric text	High	Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Tim Bentley		2017-01-20	Approve on 2017-01-20
Review via email: mp+315270@code.qastaging.launchpad.net

Description of the change

Clean search lyrics for formatting tags. Fixes bug #1655988.
Fix an issue with easyslide import not handling verse order correctly. Fixes bug #1655985.
Improve the songbeamer encoding detection. Fixes bug #1530597.
Handle a few videopsalm quirks. Fixes bug #1652851.