forked from openlp/openlp
removed extra empty lines, removed leading spaces
This commit is contained in:
parent
1c1e66bba8
commit
ff80150fc1
@ -59,18 +59,15 @@ class EasiSlidesImport(SongImport):
|
|||||||
import will not be committed to the database (useful for test scripts).
|
import will not be committed to the database (useful for test scripts).
|
||||||
"""
|
"""
|
||||||
self.import_wizard.progressBar.setMaximum(1)
|
self.import_wizard.progressBar.setMaximum(1)
|
||||||
|
log.info(u'Importing EasiSlides XML file %s', self.filename)
|
||||||
log.info(u'Importing XML file %s', self.filename)
|
|
||||||
parser = etree.XMLParser(remove_blank_text=True)
|
parser = etree.XMLParser(remove_blank_text=True)
|
||||||
file = etree.parse(self.filename, parser)
|
file = etree.parse(self.filename, parser)
|
||||||
xml = unicode(etree.tostring(file))
|
xml = unicode(etree.tostring(file))
|
||||||
song_xml = objectify.fromstring(xml)
|
song_xml = objectify.fromstring(xml)
|
||||||
|
|
||||||
self.import_wizard.incrementProgressBar(
|
self.import_wizard.incrementProgressBar(
|
||||||
unicode(translate('SongsPlugin.ImportWizardForm',
|
unicode(translate('SongsPlugin.ImportWizardForm',
|
||||||
u'Importing %s...')) % os.path.split(self.filename)[-1])
|
u'Importing %s...')) % os.path.split(self.filename)[-1])
|
||||||
self.import_wizard.progressBar.setMaximum(len(song_xml.Item))
|
self.import_wizard.progressBar.setMaximum(len(song_xml.Item))
|
||||||
|
|
||||||
for song in song_xml.Item:
|
for song in song_xml.Item:
|
||||||
self.import_wizard.incrementProgressBar(
|
self.import_wizard.incrementProgressBar(
|
||||||
unicode(translate('SongsPlugin.ImportWizardForm',
|
unicode(translate('SongsPlugin.ImportWizardForm',
|
||||||
@ -180,9 +177,7 @@ class EasiSlidesImport(SongImport):
|
|||||||
except AttributeError:
|
except AttributeError:
|
||||||
log.exception(u'no Contents')
|
log.exception(u'no Contents')
|
||||||
self._success = False
|
self._success = False
|
||||||
|
|
||||||
lines = lyrics.split(u'\n')
|
lines = lyrics.split(u'\n')
|
||||||
|
|
||||||
# we go over all lines first, to determine information,
|
# we go over all lines first, to determine information,
|
||||||
# which tells us how to parse verses later
|
# which tells us how to parse verses later
|
||||||
regionlines = {}
|
regionlines = {}
|
||||||
@ -200,7 +195,6 @@ class EasiSlidesImport(SongImport):
|
|||||||
regionlines[region] = 1
|
regionlines[region] = 1
|
||||||
elif line[0] == u'[':
|
elif line[0] == u'[':
|
||||||
separatorlines = separatorlines + 1
|
separatorlines = separatorlines + 1
|
||||||
|
|
||||||
# if the song has separators
|
# if the song has separators
|
||||||
separators = (separatorlines > 0)
|
separators = (separatorlines > 0)
|
||||||
# the number of different regions in song - 1
|
# the number of different regions in song - 1
|
||||||
@ -214,7 +208,6 @@ class EasiSlidesImport(SongImport):
|
|||||||
# if the regions are inside verses
|
# if the regions are inside verses
|
||||||
regionsInVerses = (regions and \
|
regionsInVerses = (regions and \
|
||||||
regionlines[regionlines.keys()[0]] > 1)
|
regionlines[regionlines.keys()[0]] > 1)
|
||||||
|
|
||||||
MarkTypes = {
|
MarkTypes = {
|
||||||
u'CHORUS': u'C',
|
u'CHORUS': u'C',
|
||||||
u'VERSE': u'V',
|
u'VERSE': u'V',
|
||||||
@ -222,7 +215,6 @@ class EasiSlidesImport(SongImport):
|
|||||||
u'ENDING': u'E',
|
u'ENDING': u'E',
|
||||||
u'BRIDGE': u'B',
|
u'BRIDGE': u'B',
|
||||||
u'PRECHORUS': u'P'}
|
u'PRECHORUS': u'P'}
|
||||||
|
|
||||||
verses = {}
|
verses = {}
|
||||||
# list as [region, versetype, versenum, instance]
|
# list as [region, versetype, versenum, instance]
|
||||||
our_verse_order = []
|
our_verse_order = []
|
||||||
@ -236,7 +228,6 @@ class EasiSlidesImport(SongImport):
|
|||||||
|
|
||||||
for line in lines:
|
for line in lines:
|
||||||
line = line.strip()
|
line = line.strip()
|
||||||
|
|
||||||
if len(line) == 0:
|
if len(line) == 0:
|
||||||
if separators:
|
if separators:
|
||||||
# separators are used, so empty line means slide break
|
# separators are used, so empty line means slide break
|
||||||
@ -251,7 +242,6 @@ class EasiSlidesImport(SongImport):
|
|||||||
else:
|
else:
|
||||||
vn = u'1'
|
vn = u'1'
|
||||||
inst = 1
|
inst = 1
|
||||||
continue
|
|
||||||
elif line[0:7] == u'[region':
|
elif line[0:7] == u'[region':
|
||||||
reg = self._extractRegion(line)
|
reg = self._extractRegion(line)
|
||||||
if not verses.has_key(reg):
|
if not verses.has_key(reg):
|
||||||
@ -260,7 +250,6 @@ class EasiSlidesImport(SongImport):
|
|||||||
vt = u'V'
|
vt = u'V'
|
||||||
vn = u'1'
|
vn = u'1'
|
||||||
inst = 1
|
inst = 1
|
||||||
continue
|
|
||||||
elif line[0] == u'[':
|
elif line[0] == u'[':
|
||||||
# this is a normal section marker
|
# this is a normal section marker
|
||||||
marker = line[1:line.find(u']')].upper()
|
marker = line[1:line.find(u']')].upper()
|
||||||
@ -282,24 +271,20 @@ class EasiSlidesImport(SongImport):
|
|||||||
inst = 1
|
inst = 1
|
||||||
if self._listHas(verses, [reg, vt, vn, inst]):
|
if self._listHas(verses, [reg, vt, vn, inst]):
|
||||||
inst = len(verses[reg][vt][vn])+1
|
inst = len(verses[reg][vt][vn])+1
|
||||||
continue
|
else:
|
||||||
|
|
||||||
if not [reg, vt, vn, inst] in our_verse_order:
|
if not [reg, vt, vn, inst] in our_verse_order:
|
||||||
our_verse_order.append([reg, vt, vn, inst])
|
our_verse_order.append([reg, vt, vn, inst])
|
||||||
|
|
||||||
if not verses[reg].has_key(vt):
|
if not verses[reg].has_key(vt):
|
||||||
verses[reg][vt] = {}
|
verses[reg][vt] = {}
|
||||||
if not verses[reg][vt].has_key(vn):
|
if not verses[reg][vt].has_key(vn):
|
||||||
verses[reg][vt][vn] = {}
|
verses[reg][vt][vn] = {}
|
||||||
if not verses[reg][vt][vn].has_key(inst):
|
if not verses[reg][vt][vn].has_key(inst):
|
||||||
verses[reg][vt][vn][inst] = []
|
verses[reg][vt][vn][inst] = []
|
||||||
|
|
||||||
words = self.tidy_text(line)
|
words = self.tidy_text(line)
|
||||||
verses[reg][vt][vn][inst].append(words)
|
verses[reg][vt][vn][inst].append(words)
|
||||||
# done parsing
|
# done parsing
|
||||||
|
|
||||||
versetags = []
|
versetags = []
|
||||||
|
|
||||||
# we use our_verse_order to ensure, we insert lyrics in the same order
|
# we use our_verse_order to ensure, we insert lyrics in the same order
|
||||||
# as these appeared originally in the file
|
# as these appeared originally in the file
|
||||||
for [reg, vt, vn, inst] in our_verse_order:
|
for [reg, vt, vn, inst] in our_verse_order:
|
||||||
|
@ -134,3 +134,4 @@ SongFormat.set_availability(SongFormat.SongsOfFellowship, has_sof)
|
|||||||
SongFormat.set_availability(SongFormat.Generic, has_ooo)
|
SongFormat.set_availability(SongFormat.Generic, has_ooo)
|
||||||
|
|
||||||
__all__ = [u'SongFormat']
|
__all__ = [u'SongFormat']
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user