OpenLP

Merge lp://qastaging/~gtalent/openlp/easyworship6 into lp://qastaging/openlp

  1. easyworship6
  2. Merge into trunk
Proposed by Gary Talent
Status: Superseded
Proposed branch: lp://qastaging/~gtalent/openlp/easyworship6
Merge into: lp://qastaging/openlp
Diff against target: 515 lines (+179/-78)
4 files modified
openlp/plugins/songs/lib/__init__.py (+6/-3)
openlp/plugins/songs/lib/importer.py (+31/-21)
openlp/plugins/songs/lib/importers/easyworship.py (+118/-37)
tests/functional/openlp_plugins/songs/test_ewimport.py (+24/-17)
To merge this branch: bzr merge lp://qastaging/~gtalent/openlp/easyworship6
Reviewer Review Type Date Requested Status
Raoul Snyman Needs Fixing
Tomas Groth Needs Fixing
Review via email: mp+321381@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2017-03-31.

Description of the change

This adds support for importing EasyWorship 6 databases. It's been a while since I made the changes though, so I had to merge in the trunk changes beforehand to get it to pass the Jenkins tests.

lp:~gtalent/openlp/openlp (revision 2701)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1955/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1866/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1807/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1533/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1123/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1191/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/1059/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/190/

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote :

Generally I think it looks good! Just a few minor fixes.

review: Approve
Revision history for this message
Tomas Groth (tomasgroth) :
review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

I agree with Tomas, this is great. I used it the other evening to convert a user's EW6 database, and it seemed to work perfectly. Again, just a few issues, and then we can merge this.

review: Needs Fixing
lp://qastaging/~gtalent/openlp/easyworship6 updated
2702. By Gary Talent

Remove empty lines from EW6 importer methods.

2703. By Gary Talent

EW6 Importer: Replace appended string paths with os.path.join.

2704. By Gary Talent

Add option to import EasyWorship 6 database from any level in the database directory tree.

2705. By Gary Talent

EW6 Importer: Cleanup array cropping.

2706. By Gary Talent

Fix error message for invalid EasyWorship 6 database directories.
The old one was copied from the EasyWorship 2009 database importer.

2707. By Gary Talent

Cleanup EW6 invalid directory messages.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.