Merge lp:~suutari-olli/openlp/fix-openlp-importer into lp:openlp

[Azaziah]

- For diff (trunk)

[Tim Bentley (trb143)]

Question and no tests Sorry!

review: Needs Fixing

[Azaziah (suutari-olli)]

I don't understand the question, and this branch is still a work in progress
- "proposals" are only for diff for now.

[lp:~suutari-olli/openlp/fix-openlp-importer]

2717. By Azaziah on 2017-01-08

- Fixed bug #1632567

2718. By Azaziah on 2017-01-12

- This is broken, attempted to fix author types on import

Unmerged revisions

2718. By Azaziah on 2017-01-12

- This is broken, attempted to fix author types on import

2717. By Azaziah on 2017-01-08

- Fixed bug #1632567

2716. By Azaziah on 2017-01-08

- Better fix, now checks for songbook entry 1st.

2715. By Azaziah on 2017-01-08

- Fixed bug: 1652003

=== modified file 'openlp/plugins/songs/lib/importers/openlp.py'
--- openlp/plugins/songs/lib/importers/openlp.py	2016-12-31 11:01:36 +0000
+++ openlp/plugins/songs/lib/importers/openlp.py	2017-01-08 23:00:41 +0000
@@ -221,11 +221,18 @@
                     if not existing_book:
                         existing_book = Book.populate(name=entry.songbook.name, publisher=entry.songbook.publisher)
                     new_song.add_songbook_entry(existing_book, entry.entry)
-            elif song.book:
+            elif hasattr(song, 'book') and song.book:
                 existing_book = self.manager.get_object_filtered(Book, Book.name == song.book.name)
                 if not existing_book:
                     existing_book = Book.populate(name=song.book.name, publisher=song.book.publisher)
-                new_song.add_songbook_entry(existing_book, '')
+                # Get the song_number from "songs" table "song_number" field. (This is db structure from 2.2.1)
+                # If there's a number, add it to the song, otherwise it will be "".
+                existing_number = song.song_number
+                if existing_number:
+                    new_song.add_songbook_entry(existing_book, existing_number)
+                else:
+                    new_song.add_songbook_entry(existing_book, "")
+
             # Find or create all the media files and add them to the new song object
             if has_media_files and song.media_files:
                 for media_file in song.media_files: