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

CC-2633: moving to_unicode() to api_client.py

Browse source 
- move to_unicode() to api_client.py
- fixed how it decodes path in airtime-import.py
This commit is contained in:
James 2011-08-05 12:35:50 -04:00
parent e2a5344e6e
commit 375cfb2c2d
4 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
View file

@ -4,12 +4,7 @@ import mutagen
import logging
import math
import re
def to_unicode(obj, encoding='utf-8'):
if isinstance(obj, basestring):
if not isinstance(obj, unicode):
obj = unicode(obj, encoding)
return obj
from api_clients import api_client
"""
list of supported easy tags in mutagen version 1.20
@ -139,8 +134,8 @@ class AirtimeMetadata:
if 'MDATA_KEY_TITLE' not in md:
#get rid of file extention from original name, name might have more than 1 '.' in it.
filepath = to_unicode(filepath)
filepath = filepath.encode('utf-8')
#filepath = to_unicode(filepath)
#filepath = filepath.encode('utf-8')
original_name = os.path.basename(filepath)
original_name = original_name.split(".")[0:-1]
original_name = ''.join(original_name)
@ -185,7 +180,7 @@ class AirtimeMetadata:
if (isinstance(md[key], basestring)):
#self.logger.info("Converting md[%s] = '%s' ", key, md[key])
md[key] = to_unicode(md[key])
md[key] = api_client.to_unicode(md[key])
md[key] = md[key].encode('utf-8')
#self.logger.info("Converting complete: md[%s] = '%s' ", key, md[key])