OpenLP

Merge lp://qastaging/~tomasgroth/openlp/pysword-import into lp://qastaging/openlp

pysword-import
Merge into trunk

Proposed by Tomas Groth on 2016-04-23

Status:	Merged
Merged at revision:	2652
Proposed branch:	lp://qastaging/~tomasgroth/openlp/pysword-import
Merge into:	lp://qastaging/openlp
Diff against target:	615 lines (+412/-7) 7 files modified openlp/core/ui/lib/wizard.py (+2/-1) openlp/plugins/bibles/forms/bibleimportform.py (+176/-3) openlp/plugins/bibles/lib/manager.py (+8/-1) openlp/plugins/bibles/lib/sword.py (+100/-0) scripts/check_dependencies.py (+1/-0) tests/functional/openlp_plugins/bibles/test_swordimport.py (+109/-0) tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py (+16/-2)
To merge this branch:	bzr merge lp://qastaging/~tomasgroth/openlp/pysword-import
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Raoul Snyman		2016-04-23	Approve on 2016-04-23
Review via email: mp+292713@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-04-20.

Description of the change

Added support for importing SWORD bibles using PySword.

Revision history for this message

Tomas Groth (tomasgroth) wrote on 2016-04-20: Posted in a previous version of this proposal

lp:~tomasgroth/openlp/pysword-import (revision 2588)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1468/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1384/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1322/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1124/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/715/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/782/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/650/

Revision history for this message

Raoul Snyman (raoul-snyman) wrote on 2016-04-23: Posted in a previous version of this proposal

I tried to do an import from a SWORD Bible I already have, and I got this error as the import itself started.

Traceback (most recent call last):
  File "/home/raoul/Projects/OpenLP/OpenLP/pysword-import/openlp/core/ui/wizard.py", line 217, in on_current_id_changed
    self.perform_wizard()
  File "/home/raoul/Projects/OpenLP/OpenLP/pysword-import/openlp/plugins/bibles/forms/bibleimportform.py", line 805, in perform_wizard
    if importer.do_import(license_version):
TypeError: do_import() takes 1 positional argument but 2 were given

review: Needs Fixing

Revision history for this message

Tomas Groth (tomasgroth) wrote on 2016-04-23:

Fixed traceback.

[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1487/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1398/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1336/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1136/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/727/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/794/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/662/

Revision history for this message

Raoul Snyman (raoul-snyman) wrote on 2016-04-23:

I only have 1 SWORD Bible at the moment, so I'm not sure if it's pysword or the Bible itself, but it imported in a weird order. Nothing seemed to be wrong afterward, just had the new testament first and then the old. I figure it's probably just the order of things in the SWORD module itself.

review: Approve

lp://qastaging/~tomasgroth/openlp/pysword-import updated on 2016-04-26