Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

python_apps/api_clients/api_client.py

@@ -32,7 +32,13 @@ def api_client_factory(config):
     else:
         logger.info('API Client "'+config["api_client"]+'" not supported.  Please check your config file.\n')
         sys.exit()
-
+        
+def to_unicode(obj, encoding='utf-8'):
+    if isinstance(obj, basestring):
+        if not isinstance(obj, unicode):
+            obj = unicode(obj, encoding)
+    return obj
+        
 class ApiClientInterface:
 
     # Implementation: optional
@@ -515,7 +521,6 @@ class AirTimeApiClient(ApiClientInterface):
 
         return response
 
-
 ################################################################################
 # OpenBroadcast API Client
 ################################################################################

python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py

@@ -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
@@ -148,8 +143,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)
@@ -236,7 +231,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])