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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2718

Tim Bentley: Approve on 2017-01-20

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

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

Related blueprints

2718. By Tomas Groth on 2017-01-15

Clean search lyrics for formatting tags.

2717. By Tomas Groth on 2017-01-12

Fix an issue with easyslide import not handling verse order correctly.

2716. By Tomas Groth on 2017-01-12

Improve the songbeamer encoding detection.

2715. By Tomas Groth on 2017-01-12

Handle a few videopsalm quirks

2714. By Tim Bentley on 2017-01-04

Update year in headers and about form

2713. By Tim Bentley on 2016-12-21

Move some http code around to allow it to be reused in the remote updates.

lp:~trb143/openlp/httpfixes (revision 2718)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1888/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1799/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1738/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1474/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1064/
[SUCCESS] https://ci.openlp.io/jo...

2712. By Tomas Groth on 2016-12-18

Update to the appveyor integration script to work with the new packaging builder.

2711. By Raoul Snyman on 2016-12-17

Fix segfault on click on a spinner on macOS
Fix spurious traceback on some platforms or configurations of media players
Make the tab style affect only the media library tabs, not everything else too
Hide the splash screen when the backup dialog shows and when the exception form shows

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/mac-niggles (revision 2713)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1873/
[SUCCESS] https://ci.openlp.io/job/B...

2710. By Raoul Snyman on 2016-12-15

Fix bug #1642684 by removing the blank item and clearing the text box instead.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1642684 (revision 2710)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1869/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1780/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1718/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1458/
[SUCCESS] https://ci.openlp.io/...

2709. By Raoul Snyman on 2016-12-14

Woo! Brand new OpenLP look and feel!

Unfortunately, the Crosswalk servers seem a little dodgy at the moment.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/new-branding (revision 2703)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1862/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1773/
[FAILURE] https://ci.openlp.io/job/Branch-03-Interface-Tests/1711/