Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

-Media monitor not handling unicode incorrectly or comparing UTF-8 with unicode

Browse source
This commit is contained in:
Martin Konecny 2012-03-15 23:28:47 -04:00
parent 39a41f40ed
commit 0716e0425c
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
View file

@ -251,12 +251,29 @@ class MediaMonitorCommon:
if p.returncode != 0:
self.logger.warn("command \n%s\n return with a non-zero return value", command)
self.logger.error(stderr)
try:
"""
File name charset encoding is UTF-8.
"""
stdout = stdout.decode("UTF-8")
except Exception, e:
self.logger.error("Could not decode %s using UTF-8" % stdout)
return stdout
def scan_dir_for_new_files(self, dir):
command = 'find "%s" -type f -iname "*.ogg" -o -iname "*.mp3" -readable' % dir.replace('"', '\\"')
self.logger.debug(command)
stdout = self.exec_command(command)
stdout = self.exec_command(command).decode("UTF-8")
try:
"""
File name charset encoding is UTF-8.
"""
stdout = stdout.decode("UTF-8")
except Exception, e:
self.logger.error("Could not decode %s using UTF-8" % stdout)
return stdout.splitlines()