← Back to branch summary

~zeitgeist/zeitgeist/bug580364

« back to all changes in this revision

Viewing changes to _zeitgeist/engine/extensions/datasource_registry.py

  • Committer: Seif Lotfy
  • Date: 2010-08-28 15:08:49 UTC
  • Revision ID: seif@lotfy.com-20100828150849-kf4ek6sl9mk2vexp
fix datasource_registery.py to make use of the new properties

Show diffs side-by-side

added added

removed removed

Lines of Context:
_zeitgeist/engine/extensions/datasource_registry.py
101
101
        
102
102
        def _get_data_source(self, unique_id):
103
103
                for datasource in self._registry:
104
 
                        if datasource[DataSource.UniqueId] == unique_id:
 
104
                        if datasource.unique_id == unique_id:
105
105
                                return datasource
106
106
        
107
107
        def pre_insert_event(self, event, sender):
109
109
                        if sender in bus_names:
110
110
                                datasource = self._get_data_source(unique_id)
111
111
                                # Update LastSeen time
112
 
                                datasource[DataSource.LastSeen] = get_timestamp_for_now()
 
112
                                datasource.last_seen = get_timestamp_for_now()
113
113
                                self._write_to_disk()
114
114
                                # Check whether the data-source is allowed to insert events
115
 
                                if not [DataSource.Enabled]:
 
115
                                if not datasource.enabled:
116
116
                                        return None
117
117
                return event
118
118
        
124
124
                        if datasource == source:
125
125
                                datasource.update_from_data_source(source)
126
126
                                self.DataSourceRegistered(datasource)
127
 
                                return datasource[DataSource.Enabled]
 
127
                                return datasource.enabled
128
128
                self._registry.append(source)
129
129
                self._write_to_disk()
130
130
                self.DataSourceRegistered(source)
139
139
                datasource = self._get_data_source(unique_id)
140
140
                if not datasource:
141
141
                        return False
142
 
                if datasource[DataSource.Enabled] != enabled:
143
 
                        datasource[DataSource.Enabled] = enabled
144
 
                        self.DataSourceEnabled(datasource[DataSource.UniqueId], enabled)
 
142
                if datasource.enabled != enabled:
 
143
                        datasource.enabled = enabled
 
144
                        self.DataSourceEnabled(datasource.unique_id, enabled)
145
145
                return True
146
146
        
147
147
        @dbus.service.method(REGISTRY_DBUS_INTERFACE,
248
248
                datasource = self._get_data_source(uid)
249
249
                
250
250
                # Update LastSeen time
251
 
                datasource[DataSource.LastSeen] = get_timestamp_for_now()
 
251
                datasource.last_seen = get_timestamp_for_now()
252
252
                self._write_to_disk()
253
253
                
254
 
                strid = "%s (%s)" % (uid, datasource[DataSource.Name])
 
254
                strid = "%s (%s)" % (uid, datasource.name)
255
255
                log.debug("Client disconnected: %s" % strid)
256
256
                if len(self._running[uid]) == 1:
257
257
                        log.debug("No remaining client running: %s" % strid)
258
258
                        del self._running[uid]
259
 
                        datasource[DataSource.Running] = False
 
259
                        datasource.running = False
260
260
                        self.DataSourceDisconnected(datasource)
261
261
                else:
262
262
                        self._running[uid].remove(owner)