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

fixed bug #690774

Browse Source
This commit is contained in:
Andreas Preikschat 2010-12-16 18:56:08 +01:00
parent 4e9d6370b3
commit 95f30dfb6d
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ class SongListView(BaseListWithDnD):
self.PluginName = u'Songs' self.PluginName = u'Songs'
BaseListWithDnD.__init__(self, parent) BaseListWithDnD.__init__(self, parent)
class SongMediaItem(MediaManagerItem): class SongMediaItem(MediaManagerItem):
""" """
This is the custom media manager item for Songs. This is the custom media manager item for Songs.
@ -392,7 +393,7 @@ class SongMediaItem(MediaManagerItem):
author_audit.append(unicode(author.display_name)) author_audit.append(unicode(author.display_name))
raw_footer.append(song.title) raw_footer.append(song.title)
raw_footer.append(author_list) raw_footer.append(author_list)
raw_footer.append(song.copyright ) raw_footer.append(song.copyright)
raw_footer.append(unicode( raw_footer.append(unicode(
translate('SongsPlugin.MediaItem', 'CCLI License: ') + translate('SongsPlugin.MediaItem', 'CCLI License: ') +
QtCore.QSettings().value(u'general/ccli number', QtCore.QSettings().value(u'general/ccli number',
@ -417,26 +418,30 @@ class SongMediaItem(MediaManagerItem):
item.data_string[u'title'].split(u'@')[0].lower() , item.data_string[u'title'].split(u'@')[0].lower() ,
Song.search_title.asc()) Song.search_title.asc())
author_list = item.data_string[u'authors'].split(u', ') author_list = item.data_string[u'authors'].split(u', ')
# The service item always has an author (at least it has u''
# as author). However, songs saved in the database do not
# have to have an author.
if u'' in author_list:
author_list.remove(u'')
editId = 0 editId = 0
uuid = item._uuid uuid = item._uuid
add_song = True
if search_results: if search_results:
for song in search_results: for song in search_results:
count = 0 same_author = True
for author in song.authors: for author in song.authors:
if author.display_name in author_list: if author.display_name not in author_list:
count += 1 same_author = False
# All Authors the same # All Authors the same, so we can stop here and the song
if count == len(author_list): # does not have to be saved.
if same_author:
editId = song.id editId = song.id
else: add_song = False
# Authors different break
if self.addSongFromService: if add_song:
editId = self.openLyrics. \ # Authors different
xml_to_song(item.xml_version)
else:
# Title does not match
if self.addSongFromService: if self.addSongFromService:
editId = self.openLyrics.xml_to_song(item.xml_version) editId = self.openLyrics. xml_to_song(item.xml_version)
# Update service with correct song id # Update service with correct song id
if editId != 0: if editId != 0:
Receiver.send_message(u'service_item_update', Receiver.send_message(u'service_item_update',