Merge lp:~mahfiaz/openlp/opensong-bible-importer-crash into lp:openlp

[mahfiaz]

Fixes traceback when using opensong importer, not working cancel button for any of bible importers and opensong importer not acception XML file which starts with a space.

[Tim Bentley (trb143)]

Lines 34 and 41 are not needed.

You need to add a test even if it is not connected to the change. Welcome to the 2.2 world!

review: Needs Fixing

[Tim Bentley (trb143)]

Please resubmit due to the age of this request and additionally it will need converting to Python 3 as on 1/9/2013 truck will be converted.

review: Needs Resubmitting

[Tim Bentley (trb143)]

Please resubmit as this is not compatible with python3 as tests are required for all core changes.

review: Needs Fixing

[Andreas Preikschat (googol-deactivatedaccount)]

Please resubmit by the end of 2013.

review: Needs Resubmitting

Unmerged revisions

2290. By mahfiaz on 2013-08-31

Remove unnecessary blank lines.

2289. By mahfiaz on 2013-08-24

Fix Cancel import not working for Bible plugins.

2288. By mahfiaz on 2013-08-24

Make OpenSong bible importer ignore whitespace in start of XML file.

2287. By mahfiaz on 2013-08-24

Fix a crash when importing OpenSong bible.

=== modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
--- openlp/plugins/bibles/forms/bibleupgradeform.py	2013-04-25 17:58:37 +0000
+++ openlp/plugins/bibles/forms/bibleupgradeform.py	2013-08-31 15:20:27 +0000
@@ -82,7 +82,7 @@
         Set up the UI for the bible wizard.
         """
         OpenLPWizard.setupUi(self, image)
-        Registry().execute(u'openlp_stop_wizard', self.stop_import)
+        Registry().register_function(u'openlp_stop_wizard', self.stop_import)
 
     def stop_import(self):
         """
 
=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py	2013-06-24 16:54:23 +0000
+++ openlp/plugins/bibles/lib/db.py	2013-08-31 15:20:27 +0000
@@ -160,7 +160,7 @@
         if u'path' in kwargs:
             self.path = kwargs[u'path']
         self.wizard = None
-        Registry().execute(u'openlp_stop_wizard', self.stop_import)
+        Registry().register_function(u'openlp_stop_wizard', self.stop_import)
 
     def stop_import(self):
         """
 
=== modified file 'openlp/plugins/bibles/lib/opensong.py'
--- openlp/plugins/bibles/lib/opensong.py	2013-04-18 17:45:14 +0000
+++ openlp/plugins/bibles/lib/opensong.py	2013-08-31 15:20:27 +0000
@@ -80,6 +80,12 @@
             # NOTE: We don't need to do any of the normal encoding detection here, because lxml does it's own encoding
             # detection, and the two mechanisms together interfere with each other.
             file = open(self.filename, u'r')
+            # Seek over any preceeding whitespace.
+            while True:
+                byte = file.read(1)
+                if len(byte.strip()):
+                    break
+            file.seek(file.tell() - 1)
             opensong = objectify.parse(file)
             bible = opensong.getroot()
             language_id = self.get_language(bible_name)
@@ -123,7 +129,7 @@
                             verse_number += 1
                         self.create_verse(db_book.id, chapter_number, verse_number, self.get_text(verse))
                     self.wizard.increment_progress_bar(translate('BiblesPlugin.Opensong', 'Importing %s %s...',
-                        'Importing <book name> <chapter>...')) % (db_book.name, chapter_number)
+                        'Importing <book name> <chapter>...') % (db_book.name, chapter_number))
                 self.session.commit()
             self.application.process_events()
         except etree.XMLSyntaxError as inst: