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]

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-12 13:37:17 +0000
@@ -33,7 +33,7 @@
 from openlp.core.lib.db import BaseModel
 from openlp.core.ui.lib.wizard import WizardStrings
 from openlp.plugins.songs.lib import clean_song
-from openlp.plugins.songs.lib.db import Author, Book, Song, Topic, MediaFile
+from openlp.plugins.songs.lib.db import Author, AuthorSong, Book, Song, Topic, MediaFile
 from .songimport import SongImport
 
 log = logging.getLogger(__name__)
@@ -67,6 +67,12 @@
             """
             pass
 
+        class OldAuthorSong(BaseModel):
+            """
+            Maps to the authors_songs songs table
+            """
+            pass
+
         class OldBook(BaseModel):
             """
             Maps to the songbooks table
@@ -142,8 +148,10 @@
         # Set up the songs relationships
         song_props = {
             'authors': relation(OldAuthor, backref='songs', secondary=source_authors_songs_table),
-            'topics': relation(OldTopic, backref='songs', secondary=source_songs_topics_table)
+            'topics': relation(OldTopic, backref='songs', secondary=source_songs_topics_table),
+            'authors_songs': relation(OldAuthorSong, backref='songs', secondary=source_authors_songs_table)
         }
+
         if has_media_files:
             if isinstance(source_media_files_songs_table, Table):
                 song_props['media_files'] = relation(OldMediaFile, backref='songs',
@@ -163,6 +171,10 @@
         except UnmappedClassError:
             mapper(OldAuthor, source_authors_table)
         try:
+            class_mapper(OldAuthorSong)
+        except UnmappedClassError:
+            mapper(OldAuthorSong, source_authors_table)
+        try:
             class_mapper(OldBook)
         except UnmappedClassError:
             mapper(OldBook, source_song_books_table)
@@ -201,13 +213,19 @@
             # Find or create all the authors and add them to the new song object
             for author in song.authors:
                 existing_author = self.manager.get_object_filtered(Author, Author.display_name == author.display_name)
+                # Get the author type.
+                a_type = self.manager.get_object_filtered(AuthorSong, AuthorSong.author_type == AuthorSong.author_type)
                 if not existing_author:
                     existing_author = Author.populate(
                         first_name=author.first_name,
                         last_name=author.last_name,
-                        display_name=author.display_name)
-                new_song.add_author(existing_author)
+                        display_name=author.display_name,
+                        )
+
+                new_song.add_author(existing_author, a_type)
+
             # Find or create all the topics and add them to the new song object
+
             if song.topics:
                 for topic in song.topics:
                     existing_topic = self.manager.get_object_filtered(Topic, Topic.name == topic.name)
@@ -221,11 +239,17 @@
                     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:
 
=== modified file 'openlp/plugins/songs/lib/importers/songimport.py'
--- openlp/plugins/songs/lib/importers/songimport.py	2016-12-31 11:01:36 +0000
+++ openlp/plugins/songs/lib/importers/songimport.py	2017-01-12 13:37:17 +0000
@@ -30,7 +30,7 @@
 from openlp.core.common import Registry, AppLocation, check_directory_exists, translate
 from openlp.core.ui.lib.wizard import WizardStrings
 from openlp.plugins.songs.lib import clean_song, VerseType
-from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile
+from openlp.plugins.songs.lib.db import Song, Author, AuthorType, Topic, Book, MediaFile
 from openlp.plugins.songs.lib.ui import SongStrings
 from openlp.plugins.songs.lib.openlyricsxml import SongXML