lp:~tomasgroth/openlp/more-song-import-formats

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2575

Raoul Snyman: Approve on 2015-12-20

Tim Bentley: Approve on 2015-12-20

Diff: 1108 lines (+742/-133)

21 files modified

openlp/plugins/songs/lib/importer.py (+24/-1)
openlp/plugins/songs/lib/importers/cclifile.py (+4/-4)
openlp/plugins/songs/lib/importers/lyrix.py (+115/-0)
openlp/plugins/songs/lib/importers/songimport.py (+5/-5)
openlp/plugins/songs/lib/importers/videopsalm.py (+123/-0)
tests/functional/openlp_plugins/songs/test_lyriximport.py (+53/-0)
tests/functional/openlp_plugins/songs/test_songbeamerimport.py (+16/-60)
tests/functional/openlp_plugins/songs/test_songselect.py (+19/-62)
tests/functional/openlp_plugins/songs/test_videopsalm.py (+49/-0)
tests/helpers/songfileimport.py (+4/-1)
tests/resources/lyrixsongs/A002.TXT (+34/-0)
tests/resources/lyrixsongs/A06.TXT (+31/-0)
tests/resources/lyrixsongs/AO05.TXT (+48/-0)
tests/resources/lyrixsongs/Amazing Grace.json (+26/-0)
tests/resources/lyrixsongs/Amazing Grace2.json (+33/-0)
tests/resources/lyrixsongs/in die regterhand.json (+18/-0)
tests/resources/songbeamersongs/Lobsinget dem Herrn.json (+12/-0)
tests/resources/songselect/TestSong-bin.json (+25/-0)
tests/resources/songselect/TestSong-txt.json (+21/-0)
tests/resources/videopsalmsongs/as-safe-a-stronghold.json (+35/-0)
tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold.json (+47/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1509550: Support song import from VideoPsalm

Wishlist

Fix Released

Link a bug report

Related blueprints

2579. By Tomas Groth on 2015-12-20

Added tests for LyriX import.

2578. By Tomas Groth on 2015-12-20

Migrated songselect and songbeamer tests to the SongImportTestHelper based structure.

2577. By Tomas Groth on 2015-12-18

Added support for author types in tests + some VideoPsalm fixes

2576. By Tomas Groth on 2015-12-18

trunk

2575. By Tomas Groth on 2015-12-17

Added support of importing VideoPsalm songbooks.

2574. By Tomas Groth on 2015-12-14

Added suport for importing songs exported from Lyrix.

2573. By Jonathan Springer on 2015-12-13

Fix traceback in mediacontroller if a service item had a processor type of automatic

2572. By Tim Bentley on 2015-12-07

Allow local stage views

2571. By Jonathan Springer on 2015-12-01

Fix projector tests by removing unneeded patch start calls

2570. By Tim Bentley on 2015-11-29

Fix missing players when processing service items