Merge pull request #23 from mpromonet/master

add pullpoint access

Author: sinchb

examples/events.py

@@ -1,19 +1,14 @@
 # -*- coding: utf-8 -*-
-import os.path
 from onvif import ONVIFCamera
 __author__ = 'vahid'
 
 
-this_dir = os.path.abspath(os.path.dirname(__file__))
-wsdl_dir = os.path.abspath(os.path.join(this_dir, '../wsdl'))
-
-def get_event_srv():
-    mycam = ONVIFCamera('192.168.1.10', 8899, 'admin', 'admin', wsdl_dir) #, no_cache=True)
-    #print mycam.devicemgmt.GetServices()
-    event_service = mycam.create_events_service()
-    return event_service
-
-
 if __name__ == '__main__':
-    e_service = get_event_srv()
-    pp = e_service.GetEventProperties()
+    mycam = ONVIFCamera('192.168.1.10', 8899, 'admin', 'admin') #, no_cache=True)
+    event_service = mycam.create_events_service()
+    print(event_service.GetEventProperties())
+    
+    pullpoint = mycam.create_pullpoint_service()
+    req = pullpoint.create_type('PullMessages')
+    req.MessageLimit=100
+    print(pullpoint.PullMessages(req))

onvif/client.py

@@ -66,7 +66,7 @@ class ONVIFService(object):
     @safe_func
     def __init__(self, xaddr, user, passwd, url,
                  cache_location='/tmp/suds', cache_duration=None,
-                 encrypt=True, daemon=False, ws_client=None, no_cache=False):
+                 encrypt=True, daemon=False, ws_client=None, no_cache=False, portType=None):
 
         if not os.path.isfile(url):
             raise ONVIFError('%s doesn`t exist!' % url)
@@ -91,6 +91,7 @@ def __init__(self, xaddr, user, passwd, url,
             self.ws_client = Client(url=self.url,
                                     location=self.xaddr,
                                     cache=cache,
+                                    port=portType,
                                     headers={'Content-Type': 'application/soap+xml'})
         else:
             self.ws_client = ws_client
@@ -240,6 +241,14 @@ def update_xaddrs(self):
             except Exception:
                 logger.exception('Unexcept service type')
 
+        with self.services_lock:
+            try:
+                self.event = self.create_events_service()
+                self.xaddrs['http://www.onvif.org/ver10/events/wsdl/PullPointSubscription'] = self.event.CreatePullPointSubscription().SubscriptionReference.Address
+            except:
+                pass                
+
+
     def update_url(self, host=None, port=None):
         changed = False
         if host and self.host != host:
@@ -295,7 +304,7 @@ def get_definition(self, name):
         if not os.path.isfile(wsdlpath):
             raise ONVIFError('No such file: %s' % wsdlpath)
 
-        # XAddr for devicemgmt is fixd:
+        # XAddr for devicemgmt is fixed:
         if name == 'devicemgmt':
             xaddr = 'http://%s:%s/onvif/device_service' % (self.host, self.port)
             return xaddr, wsdlpath
@@ -307,7 +316,7 @@ def get_definition(self, name):
 
         return xaddr, wsdlpath
 
-    def create_onvif_service(self, name, from_template=True):
+    def create_onvif_service(self, name, from_template=True, portType=None):
         '''Create ONVIF service client'''
 
         name = name.lower()
@@ -323,14 +332,14 @@ def create_onvif_service(self, name, from_template=True):
                                              self.cache_duration,
                                              self.encrypt,
                                              self.daemon,
-                                             no_cache=self.no_cache)
+                                             no_cache=self.no_cache, portType=portType)
             # No template, create new service from wsdl document.
             # A little time-comsuming
             else:
                 service = ONVIFService(xaddr, self.user, self.passwd,
                                        wsdl_file, self.cache_location,
                                        self.cache_duration, self.encrypt,
-                                       self.daemon, no_cache=self.no_cache)
+                                       self.daemon, no_cache=self.no_cache, portType=portType)
 
             self.services[name] = service
 
@@ -369,4 +378,7 @@ def create_search_service(self, from_template=True):
         return self.create_onvif_service('search', from_template)
 
     def create_replay_service(self, from_template=True):
-        return self.create_onvif_service('search', from_template)
+        return self.create_onvif_service('replay', from_template)
+
+    def create_pullpoint_service(self, from_template=True):
+        return self.create_onvif_service('pullpoint', from_template, portType='PullPointSubscription')

onvif/definition.py

@@ -6,6 +6,7 @@
         'imaging'   : {'ns': 'http://www.onvif.org/ver20/imaging/wsdl',   'wsdl': 'imaging.wsdl'},
         'deviceio'  : {'ns': 'http://www.onvif.org/ver10/deviceIO/wsdl',  'wsdl': 'deviceio.wsdl'},
         'events'    : {'ns': 'http://www.onvif.org/ver10/events/wsdl',    'wsdl': 'events.wsdl'},
+        'pullpoint' : {'ns': 'http://www.onvif.org/ver10/events/wsdl/PullPointSubscription',    'wsdl': 'events.wsdl'},
         'analytics' : {'ns': 'http://www.onvif.org/ver20/analytics/wsdl', 'wsdl': 'analytics.wsdl'},
         'recording' : {'ns': 'http://www.onvif.org/ver10/recording/wsdl', 'wsdl': 'recording.wsdl'},
         'search'    : {'ns': 'http://www.onvif.org/ver10/search/wsdl',    'wsdl': 'search.wsdl'},