arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-03-10 05:34:36 +00:00
Code Releases Wiki Activity

Fix bug where invalid xml in iTunes library would make dgme crash.

Browse Source
This commit is contained in:
Virgil Dupras 2012-06-13 13:11:48 -04:00
parent 21c0292154
commit 222ae73590
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocoa/inter/app_me.py
View File

@ -16,6 +16,7 @@ from cocoa import as_fetch, proxy
from hscommon import io from hscommon import io
from hscommon.trans import trget from hscommon.trans import trget
from hscommon.path import Path from hscommon.path import Path
from hscommon.util import remove_invalid_xml
from core import directories from core import directories
from core.app import JobType from core.app import JobType
@ -78,7 +79,10 @@ def get_itunes_database_path():
def get_itunes_songs(plistpath): def get_itunes_songs(plistpath):
if not io.exists(plistpath): if not io.exists(plistpath):
return [] return []
plist = plistlib.readPlist(str(plistpath)) s = io.open(plistpath, 'rt', encoding='utf-8').read()
# iTunes sometimes produces XML files with invalid characters in it.
s = remove_invalid_xml(s, replace_with='')
plist = plistlib.readPlistFromBytes(s.encode('utf-8'))
result = [] result = []
for song_data in plist['Tracks'].values(): for song_data in plist['Tracks'].values():
if song_data['Track Type'] != 'File': if song_data['Track Type'] != 'File':