[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Sebastian Krzyszkowiak]

The following commit has been merged in the debian branch:
commit 56e32575538e9042fd5cf349402e6f0d24df5a8d
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Wed Aug 19 22:05:56 2009 +0200

    opimd: Calls: implement missing stuff

diff --git a/framework/subsystems/opimd/pimd_calls.py b/framework/subsystems/opimd/pimd_calls.py
index ca06c35..3ddf9c3 100644
--- a/framework/subsystems/opimd/pimd_calls.py
+++ b/framework/subsystems/opimd/pimd_calls.py
@@ -204,6 +204,7 @@ class CallDomain(Domain, GenericDomain):
     _entries = None
     query_manager = None
     _dbus_path = None
+    _new_missed_calls = None
     Entry = None
 
     def __init__(self):
@@ -213,6 +214,7 @@ class CallDomain(Domain, GenericDomain):
 
         self._backends = {}
         self._entries = []
+        self._new_missed_calls = 0
         self._dbus_path = _DIN_ENTRY
         self.query_manager = QueryManager(self._entries)
 
@@ -223,6 +225,48 @@ class CallDomain(Domain, GenericDomain):
         self.interface = _DIN_CALLS
         self.path = _DBUS_PATH_CALLS
 
+    def register_entry(self, backend, call_data):
+        new_call_id = len(self._calls)
+        call_id = GenericDomain.register_entry(self, backend, call_data)
+        if call_id == new_call_id:
+            if call_data.has_key('New') and call_data.has_key('Answered') and call_data.has_key('Direction'):
+                if call_data['New'] and not call_data['Answered'] and call_data['Direction'] == 'in':
+                    self._new_missed_calls += 1
+                    self.NewMissedCalls(self._new_missed_calls)
+        return call_id
+
+    def register_missed_call(self, backend, call_data, stored_on_input_backend = False):
+        logger.debug("Registering missed call...")
+        if stored_on_input_backend:
+            message_id = self.register_call(backend, message_data)
+            self._new_missed_calls += 1
+            self.NewMissedCalls(self._new_missed_calls)
+        else:
+            # FIXME: now it's just copied from Add method.
+            # Make some checking, fallbacking etc.
+
+            dbackend = BackendManager.get_default_backend(_DOMAIN_NAME)
+            result = ""
+
+            if not PIMB_CAN_ADD_ENTRY in dbackend.properties:
+            #    raise InvalidBackend( "This backend does not feature PIMB_CAN_ADD_ENTRY" )
+                 return -1
+
+            try:
+                call_id = dbackend.add_call(call_data)
+            except AttributeError:
+            #    raise InvalidBackend( "This backend does not feature add_call" )
+                 return -1
+
+            call = self._calls[call_id]
+            result = call['Path']
+
+            # As we just added a new message, we check it against all queries to see if it matches
+            self.query_manager.check_new_call(call_id)
+            
+        self.MissedCall(_DBUS_PATH_CALLS+ '/' + str(call_id))
+        return call_id
+
  
     #---------------------------------------------------------------------#
     # dbus methods and signals                                            #
@@ -235,6 +279,14 @@ class CallDomain(Domain, GenericDomain):
     def NewCall(self, path):
         pass
 
+    @dbus_signal(_DIN_CALLS, "i")
+    def NewMissedCalls(self, amount):
+        pass
+
+    @dbus_signal(_DIN_CALLS, "s")
+    def MissedCall(self, path):
+        pass
+
     @dbus_method(_DIN_CALLS, "a{sv}", "s")
     def Add(self, entry_data):
         """Adds a entry to the list, assigning it to the default backend and saving it
@@ -300,6 +352,11 @@ class CallDomain(Domain, GenericDomain):
     def Delete(self, rel_path):
         num_id = int(rel_path[1:])
 
+        call = self._calls[num_id].get_fields(self._calls[num_id]._field_idx)
+        if call['New'] and not call['Answered'] and call['Direction'] == 'in':
+            self._new_missed_calls -= 1
+            self.NewMissedCalls(self._new_missed_calls)
+
         self.delete(num_id)
 
     def EntryUpdated(self, data, rel_path=None):
@@ -313,4 +370,20 @@ class CallDomain(Domain, GenericDomain):
     def Update(self, data, rel_path):
         num_id = int(rel_path[1:])
 
-        self.update(num_id, data)
+        # Make sure the requested call exists
+        if num_id >= len(self._calls) or self._calls[num_id]==None:
+            raise InvalidCallID()
+
+        callif = self._calls[num_id]
+        call = callif.get_fields(callif._field_idx)
+
+        if call.has_key('New') and data.has_key('New') and call.has_key('Answered') and call.has_key('Direction'):
+            if not call['Answered'] and call['Direction'] == 'in':
+                if call['New'] and not data['New']:
+                    self._new_missed_calls -= 1
+                    self.NewMissedCalls(self._new_missed_calls)
+                elif not call['New'] and data['New']:
+                    self._new_missed_calls += 1
+                    self.NewMissedCalls(self._new_missed_calls)
+
+        self.update(num_id, data, callif = callif, call = call)
diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index 6078074..66ce46c 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -603,12 +603,16 @@ class GenericDomain():
 
         return result
 
-    def update(self, num_id, data):
+    def update(self, num_id, data, *args, **kargs):
         # Make sure the requested entry exists
         self.check_entry_id(num_id)
 
-        entryif = self._entries[num_id]
-        entry = entryif.get_fields(entryif._field_idx)
+        entryif = kargs.get('entryif')
+        entry = kargs.get('entry')
+        if not entryif:
+            entryif = self._entries[num_id]
+        if not entry:
+            entry = entryif.get_fields(entryif._field_idx)
 
         default_backend = BackendManager.get_default_backend(self.name)
         

-- 
FSO frameworkd Debian packaging