forked from openlp/openlp
string change, close file, MarkType
This commit is contained in:
parent
1adcf1a43a
commit
62643d7d5e
@ -32,6 +32,7 @@ import os
|
|||||||
import chardet
|
import chardet
|
||||||
import codecs
|
import codecs
|
||||||
|
|
||||||
|
from openlp.core.lib import translate
|
||||||
from openlp.plugins.songs.lib.songimport import SongImport
|
from openlp.plugins.songs.lib.songimport import SongImport
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@ -54,7 +55,8 @@ class SongBeamerTypes(object):
|
|||||||
u'Pre-Bridge': u'O',
|
u'Pre-Bridge': u'O',
|
||||||
u'Pre-Coda': u'O',
|
u'Pre-Coda': u'O',
|
||||||
u'Unbekannt': u'O',
|
u'Unbekannt': u'O',
|
||||||
u'Unknown': u'O'
|
u'Unknown': u'O',
|
||||||
|
u'Unbenannt': u'O'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -100,6 +102,7 @@ class SongBeamerImport(SongImport):
|
|||||||
detect_file.close()
|
detect_file.close()
|
||||||
infile = codecs.open(file, u'r', details['encoding'])
|
infile = codecs.open(file, u'r', details['encoding'])
|
||||||
self.songData = infile.readlines()
|
self.songData = infile.readlines()
|
||||||
|
infile.close()
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
for line in self.songData:
|
for line in self.songData:
|
||||||
@ -127,8 +130,9 @@ class SongBeamerImport(SongImport):
|
|||||||
self.replace_html_tags()
|
self.replace_html_tags()
|
||||||
self.add_verse(self.current_verse, self.current_verse_type)
|
self.add_verse(self.current_verse, self.current_verse_type)
|
||||||
self.finish()
|
self.finish()
|
||||||
self.import_wizard.incrementProgressBar(
|
self.import_wizard.incrementProgressBar(u'%s %s...' %
|
||||||
"Importing %s" % (self.file_name))
|
(translate('SongsPlugin.SongBeamerImport', 'Importing'),
|
||||||
|
self.file_name))
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def replace_html_tags(self):
|
def replace_html_tags(self):
|
||||||
@ -263,6 +267,9 @@ class SongBeamerImport(SongImport):
|
|||||||
pass
|
pass
|
||||||
elif tag_val[0] == u'#Version':
|
elif tag_val[0] == u'#Version':
|
||||||
pass
|
pass
|
||||||
|
elif tag_val[0] == u'#VerseOrder':
|
||||||
|
# TODO: add the verse order.
|
||||||
|
pass
|
||||||
|
|
||||||
def check_verse_marks(self, line):
|
def check_verse_marks(self, line):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user