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

Fix for overwriting files on song export. Fixes bug 1216232

Browse Source 
Fixes: https://launchpad.net/bugs/1216232
This commit is contained in:
Tomas Groth 2014-11-15 22:38:36 +00:00
parent ed13dcbd75
commit 571b50f016
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/plugins/songs/lib/openlyricsexport.py
View File

@ -75,9 +75,14 @@ class OpenLyricsExport(RegistryProperties):
filename = '%s (%s)' % (song.title, ', '.join([author.display_name for author in song.authors])) filename = '%s (%s)' % (song.title, ', '.join([author.display_name for author in song.authors]))
filename = clean_filename(filename) filename = clean_filename(filename)
# Ensure the filename isn't too long for some filesystems # Ensure the filename isn't too long for some filesystems
filename = '%s.xml' % filename[0:250 - len(self.save_path)] filename_with_ext = '%s.xml' % filename[0:250 - len(self.save_path)]
# Make sure we're not overwriting an existing file
conflicts = 0
while os.path.exists(os.path.join(self.save_path, filename_with_ext)):
conflicts += 1
filename_with_ext = '%s-%d.xml' % (filename[0:247 - len(self.save_path)], conflicts)
# Pass a file object, because lxml does not cope with some special # Pass a file object, because lxml does not cope with some special
# characters in the path (see lp:757673 and lp:744337). # characters in the path (see lp:757673 and lp:744337).
tree.write(open(os.path.join(self.save_path, filename), 'wb'), encoding='utf-8', xml_declaration=True, tree.write(open(os.path.join(self.save_path, filename_with_ext), 'wb'), encoding='utf-8',
pretty_print=True) xml_declaration=True, pretty_print=True)
return True return True