raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Don't duplicate songs if a single author contains a comma

Browse Source
This commit is contained in:
Jonathan Corwin 2011-06-19 23:18:06 +01:00
parent 099b62f233
commit f3b7e609e9
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openlp/plugins/songs/lib/mediaitem.py
View File

@ -467,23 +467,20 @@ class SongMediaItem(MediaManagerItem):
search_results = self.plugin.manager.get_all_objects(Song, search_results = self.plugin.manager.get_all_objects(Song,
Song.search_title == item.data_string[u'title'], Song.search_title == item.data_string[u'title'],
Song.search_title.asc()) Song.search_title.asc())
author_list = item.data_string[u'authors'].split(u', ')
editId = 0 editId = 0
add_song = True add_song = True
if search_results: if search_results:
for song in search_results: for song in search_results:
author_list = item.data_string[u'authors']
same_authors = True same_authors = True
# If the author counts are different, we do not have to do any
# further checking.
if len(song.authors) == len(author_list):
for author in song.authors: for author in song.authors:
if author.display_name not in author_list: if author.display_name in author_list:
same_authors = False author_list = author_list.replace(author.display_name,
u'', 1)
else: else:
same_authors = False same_authors = False
# All authors are the same, so we can stop here and the song break
# does not have to be saved. if same_authors and author_list.strip(u', ') == u'':
if same_authors:
add_song = False add_song = False
editId = song.id editId = song.id
break break