arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-09-11 17:58:17 +00:00
Code Releases Wiki Activity

[#95 state:fixed] Fixed a crash on results save when it contained invalid characters.

Browse Source
This commit is contained in:
Virgil Dupras 2010-07-14 09:19:34 +02:00
parent 4d66b4667c
commit ac1593ff75
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/results.py
View File

@ -284,9 +284,12 @@ class Results(Markable):
except AttributeError: except AttributeError:
words = () words = ()
file_elem = etree.SubElement(group_elem, 'file') file_elem = etree.SubElement(group_elem, 'file')
try:
file_elem.set('path', unicode(d.path)) file_elem.set('path', unicode(d.path))
file_elem.set('is_ref', ('y' if d.is_ref else 'n'))
file_elem.set('words', ','.join(words)) file_elem.set('words', ','.join(words))
except ValueError: # If there's an invalid character, just skip the file
file_elem.set('path', '')
file_elem.set('is_ref', ('y' if d.is_ref else 'n'))
file_elem.set('marked', ('y' if self.is_marked(d) else 'n')) file_elem.set('marked', ('y' if self.is_marked(d) else 'n'))
for match in g.matches: for match in g.matches:
match_elem = etree.SubElement(group_elem, 'match') match_elem = etree.SubElement(group_elem, 'match')

6
core/tests/results_test.py
View File

@ -575,6 +575,12 @@ class TCResultsXML(TestCase):
self.results.apply_filter(u'basepath') self.results.apply_filter(u'basepath')
eq_(len(self.results.groups), 2) eq_(len(self.results.groups), 2)
def test_save_xml_with_invalid_characters(self):
# Don't crash when saving files that have invalid xml characters in their path
self.objects[0].name = u'foo\x19'
self.results.save_to_xml(StringIO.StringIO()) # don't crash
class TCResultsFilter(TestCase): class TCResultsFilter(TestCase):
def setUp(self): def setUp(self):
self.results = Results(data) self.results = Results(data)