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

More changes

This commit is contained in:
Tim Bentley 2010-11-28 14:40:46 +00:00
parent dba32e3614
commit 9fa384b57f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openlp/plugins/songs/lib/xml.py
View File

@ -317,9 +317,7 @@ class OpenLyricsParser(object):
unicode(song.search_title)).lower() unicode(song.search_title)).lower()
# Process Authors # Process Authors
for author in properties.authors.author: for author in properties.authors.author:
print author, author.text self._process_author(author.text, song)
#song.authors.append(self._process_author(author.text))
print "here"
# Process Lyrics # Process Lyrics
sxml = SongXMLBuilder() sxml = SongXMLBuilder()
search_text = u'' search_text = u''
@ -327,16 +325,18 @@ class OpenLyricsParser(object):
for verse in song_xml.lyrics.verse: for verse in song_xml.lyrics.verse:
print "verse", verse.attrib print "verse", verse.attrib
text = u'' text = u''
for line in lyrics.verse.lines.line: for line in verse.lines.line:
line = unicode(line) line = unicode(line)
if not text: if not text:
text = line text = line
else: else:
text += u'\n' + line text += u'\n' + line
sxml.add_verse_to_lyrics(u'V', verse.attrib, text) sxml.add_verse_to_lyrics(u'V', verse.attrib[u'name'], text)
search_text = search_text + text search_text = search_text + text
song.search_lyrics = search_text.lower() song.search_lyrics = search_text.lower()
song.lyrics = unicode(sxml.extract_xml(), u'utf-8') song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
song.comments = u''
song.song_number = u''
self.manager.save_object(song) self.manager.save_object(song)
return 0 return 0
@ -364,7 +364,7 @@ class OpenLyricsParser(object):
return etree.tostring(xml, encoding=u'UTF-8', return etree.tostring(xml, encoding=u'UTF-8',
xml_declaration=True) xml_declaration=True)
def _process_author(self, name): def _process_author(self, name, song):
""" """
Find or create an Author from display_name. Find or create an Author from display_name.
""" """
@ -374,10 +374,10 @@ class OpenLyricsParser(object):
Author.display_name == name) Author.display_name == name)
if search_results: if search_results:
# should only be one! so take the first # should only be one! so take the first
return search_results[0] song.authors.append(search_results[0])
else: else:
# Need a new author # Need a new author
new_author = Author.populate(first_name=name.rsplit(u' ', 1)[0], new_author = Author.populate(first_name=name.rsplit(u' ', 1)[0],
last_name=name.rsplit(u' ', 1)[1], display_name=name) last_name=name.rsplit(u' ', 1)[1], display_name=name)
self.manager.save_object(new_author) self.manager.save_object(new_author)
return author song.authors.append(new_author)