From e31787a3b4566ced235e9fe85133bc5a4a99fc63 Mon Sep 17 00:00:00 2001
From: phill-ridout <phill.ridout@googlemail.com>
Date: Tue, 19 Feb 2013 18:58:11 +0000
Subject: [PATCH 1/2] Fixes #1114457 by counting the records

---
 openlp/plugins/songs/lib/ewimport.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index de31083f0..9fdfa0d20 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -108,10 +108,6 @@ class EasyWorshipSongImport(SongImport):
         self.encoding = retrieve_windows_encoding(self.encoding)
         if not self.encoding:
             return
-        # There does not appear to be a _reliable_ way of getting the number
-        # of songs/records, so let's use file blocks for measuring progress.
-        total_blocks = (db_size - header_size) / (block_size * 1024)
-        self.importWizard.progressBar.setMaximum(total_blocks)
         # Read the field description information
         db_file.seek(120)
         field_info = db_file.read(num_fields * 2)
@@ -138,12 +134,24 @@ class EasyWorshipSongImport(SongImport):
         except IndexError:
             # This is the wrong table
             success = False
-        # Loop through each block of the file
+        # There does not appear to be a _reliable_ way of getting the number
+        # of songs/records, so loop through the file blocks and total the
+        # number of records. Store the information in a list so we dont have
+        # to do all this again.
         cur_block = first_block
+        total_count = 0
+        block_list = []
         while cur_block != 0 and success:
-            db_file.seek(header_size + ((cur_block - 1) * 1024 * block_size))
+            cur_block_pos = header_size + ((cur_block - 1) * 1024 * block_size)
+            db_file.seek(cur_block_pos)
             cur_block, rec_count = struct.unpack('<h2xh', db_file.read(6))
             rec_count = (rec_count + record_size) / record_size
+            block_list.append((cur_block_pos, rec_count))
+            total_count += rec_count
+            self.importWizard.progressBar.setMaximum(total_count)
+        for block in block_list:
+            cur_block_pos, rec_count = block
+            db_file.seek(cur_block_pos + 6)
             # Loop through each record within the current block
             for i in range(rec_count):
                 if self.stopImportFlag:

From 5b7421ee1fe9b82058ebd4225d5a7d3846491e0c Mon Sep 17 00:00:00 2001
From: phill-ridout <phill.ridout@googlemail.com>
Date: Tue, 19 Feb 2013 21:57:46 +0000
Subject: [PATCH 2/2] Unindented set progress max

---
 openlp/plugins/songs/lib/ewimport.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index 9fdfa0d20..c3cdd3bab 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -148,7 +148,7 @@ class EasyWorshipSongImport(SongImport):
             rec_count = (rec_count + record_size) / record_size
             block_list.append((cur_block_pos, rec_count))
             total_count += rec_count
-            self.importWizard.progressBar.setMaximum(total_count)
+        self.importWizard.progressBar.setMaximum(total_count)
         for block in block_list:
             cur_block_pos, rec_count = block
             db_file.seek(cur_block_pos + 6)