Azaziah has proposed merging lp:~suutari-olli/openlp/fix-openlp-importer into
lp:openlp.
Requested reviews:
Tim Bentley (trb143)
For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/fix-openlp-importer/+merge/314297
- For diff (trunk)
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== 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:01:14 +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:
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
