src/pyams_media/utility.py
changeset 65 d38220c1116e
parent 41 509aefe2f45c
child 76 6fd737a311f0
--- a/src/pyams_media/utility.py	Thu Jan 11 17:12:00 2018 +0100
+++ b/src/pyams_media/utility.py	Thu Jan 11 17:14:45 2018 +0100
@@ -18,7 +18,6 @@
 # import interfaces
 from pyams_media.interfaces import IMediaConversionUtility, CONVERTER_HANDLER_KEY, CUSTOM_AUDIO_TYPES, \
     CUSTOM_VIDEO_TYPES
-from pyams_utils.interfaces.zeo import IZEOConnection
 from zope.intid.interfaces import IIntIds
 
 # import packages
@@ -35,7 +34,7 @@
 class MediaConversionUtility(Persistent, Contained):
     """Medias conversions utility"""
 
-    zeo_connection = FieldProperty(IMediaConversionUtility['zeo_connection'])
+    zodb_name = FieldProperty(IMediaConversionUtility['zodb_name'])
 
     video_formats = FieldProperty(IMediaConversionUtility['video_formats'])
     video_frame_size = FieldProperty(IMediaConversionUtility['video_frame_size'])
@@ -75,11 +74,8 @@
         socket = self._get_socket()
         if socket is None:
             return [501, "No socket handler defined in configuration file"]
-        if not self.zeo_connection:
-            return [502, "Missing ZEO connection"]
-        zeo = get_utility(IZEOConnection, self.zeo_connection)
         intids = get_utility(IIntIds)
-        settings = {'zeo': zeo.get_settings(),
+        settings = {'zodb_name': self.zodb_name,
                     'media': intids.register(media),
                     'format': format}
         socket.send_json(['convert', settings])
@@ -90,7 +86,5 @@
         socket = self._get_socket()
         if socket is None:
             return [501, "No socket handler defined in configuration file"]
-        if not self.zeo_connection:
-            return [502, "Missing ZEO connection"]
         socket.send_json(['test', {}])
         return zmq_response(socket)