Merge lp:~zeitgeist/zeitgeist/datasource-properties-fix into lp:zeitgeist/0.1

[Seif Lotfy]

This is a fix for
https://bugs.edge.launchpad.net/zeitgeist/+bug/513295
pretty straight forward
tested in the Registry Extension Directly (removed code before commit)

[lp:~zeitgeist/zeitgeist/datasource-properties-fix]

1554. By Seif Lotfy on 2010-08-26

revert the is_always method (mistake change)

1555. By Seif Lotfy on 2010-08-26

fix docstring and revert changes of method to trunk

[Markus Korn (thekorn)]

So far so good, but this new properties should be used in the existing code, otherwise they are pretty much useless ;)

http://pastebin.ubuntu.com/484135/ has a few bits where the new properties should be used

I guess some properties also need to be writable...

[Markus Korn (thekorn)]

review: Needs Fixing

[lp:~zeitgeist/zeitgeist/datasource-properties-fix]

1556. By Seif Lotfy on 2010-08-28

add get/set methods to make datasource properties writable

1557. By Seif Lotfy on 2010-08-28

add get/set methods to make datasource properties writable

1558. By Seif Lotfy on 2010-08-28

fix datasource_registery.py to make use of the new properties

1559. By Seif Lotfy on 2010-08-28

fix datasource_registery.py to make use of DataSource properties

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good. I didn't actually run the unit tests but the diff is clean enough that I don't think regressions are a big danger here.

Nice work!

review: Approve

=== modified file '_zeitgeist/engine/extensions/datasource_registry.py'
--- _zeitgeist/engine/extensions/datasource_registry.py	2010-08-03 23:25:07 +0000
+++ _zeitgeist/engine/extensions/datasource_registry.py	2010-08-28 15:16:41 +0000
@@ -101,7 +101,7 @@
 	
 	def _get_data_source(self, unique_id):
 		for datasource in self._registry:
-			if datasource[DataSource.UniqueId] == unique_id:
+			if datasource.unique_id == unique_id:
 				return datasource
 	
 	def pre_insert_event(self, event, sender):
@@ -109,10 +109,10 @@
 			if sender in bus_names:
 				datasource = self._get_data_source(unique_id)
 				# Update LastSeen time
-				datasource[DataSource.LastSeen] = get_timestamp_for_now()
+				datasource.last_seen = get_timestamp_for_now()
 				self._write_to_disk()
 				# Check whether the data-source is allowed to insert events
-				if not [DataSource.Enabled]:
+				if not datasource.enabled:
 					return None
 		return event
 	
@@ -124,7 +124,7 @@
 			if datasource == source:
 				datasource.update_from_data_source(source)
 				self.DataSourceRegistered(datasource)
-				return datasource[DataSource.Enabled]
+				return datasource.enabled
 		self._registry.append(source)
 		self._write_to_disk()
 		self.DataSourceRegistered(source)
@@ -139,9 +139,9 @@
 		datasource = self._get_data_source(unique_id)
 		if not datasource:
 			return False
-		if datasource[DataSource.Enabled] != enabled:
-			datasource[DataSource.Enabled] = enabled
-			self.DataSourceEnabled(datasource[DataSource.UniqueId], enabled)
+		if datasource.enabled != enabled:
+			datasource.enabled = enabled
+			self.DataSourceEnabled(datasource.unique_id, enabled)
 		return True
 	
 	@dbus.service.method(REGISTRY_DBUS_INTERFACE,
@@ -248,15 +248,15 @@
 		datasource = self._get_data_source(uid)
 		
 		# Update LastSeen time
-		datasource[DataSource.LastSeen] = get_timestamp_for_now()
+		datasource.last_seen = get_timestamp_for_now()
 		self._write_to_disk()
 		
-		strid = "%s (%s)" % (uid, datasource[DataSource.Name])
+		strid = "%s (%s)" % (uid, datasource.name)
 		log.debug("Client disconnected: %s" % strid)
 		if len(self._running[uid]) == 1:
 			log.debug("No remaining client running: %s" % strid)
 			del self._running[uid]
-			datasource[DataSource.Running] = False
+			datasource.running = False
 			self.DataSourceDisconnected(datasource)
 		else:
 			self._running[uid].remove(owner)

=== modified file 'zeitgeist/datamodel.py'
--- zeitgeist/datamodel.py	2010-08-26 18:24:48 +0000
+++ zeitgeist/datamodel.py	2010-08-28 15:16:41 +0000
@@ -4,7 +4,7 @@
 #
 # Copyright © 2009 Mikkel Kamstrup Erlandsen <[e-mail]>
 # Copyright © 2009 Markus Korn <[e-mail]>
-# Copyright © 2009 Seif Lotfy <[e-mail]>
+# Copyright © 2009-2010 Seif Lotfy <[e-mail]>
 # Copyright © 2009-2010 Siegfried-Angel Gevatter Pujals <[e-mail]>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -381,7 +381,7 @@
 	
 	def is_always(self):
 		"""
-		Returns True if this time range goes from timestamp 0 (January 1, 1970)
+		Returns True if this time range goes from timestamp 0 (January 1, 1970) 
 		-or lower- to the most distant future.
 		"""
 		return self.begin <= 0 and self.end >= TimeRange._max_stamp
@@ -483,8 +483,8 @@
 		self = Subject()
 		for key, value in values.iteritems():
 			if not key in ("uri", "interpretation", "manifestation", "origin",
-				"mimetype", "text", "storage"):
-				raise ValueError("Subject parameter '%s' is not supported" % key)
+						"mimetype", "text", "storage"):
+				raise ValueError("Subject parameter '%s' is not supported" %key)
 			setattr(self, key, value)
 		return self
 		
@@ -906,6 +906,55 @@
 		LastSeen,	# last time the data-source did something (connected,
 					# inserted events, disconnected).
 		Enabled) = range(7)
+		
+	def get_unique_id(self):
+		return self[self.UniqueId]
+	
+	def set_unique_id(self, value):
+		self[self.UniqueId] = value
+	
+	def get_name(self):
+		return self[self.Name]
+	
+	def set_name(self, value):
+		self[self.Name] = value
+	
+	def get_description(self):
+		return self[self.Description]
+	
+	def set_description(self, value):
+		self[self.Description] = value
+	
+	def get_running(self):
+		return self[self.Running]
+	
+	def set_running(self,value):
+		self[self.Running] = value
+	
+	def get_running(self):
+		return self[self.Running]
+	
+	def running(self, value):
+		self[self.Running] = value
+	
+	def get_last_seen(self):
+		return self[self.LastSeen]
+	
+	def set_last_seen(self, value):
+		self[self.LastSeen] = value
+	
+	def get_enabled(self):
+		return self[self.Enabled]
+	
+	def set_enabled(self, value):
+		self[self.Enabled] = value
+		
+	unique_id = property(get_unique_id, set_unique_id)
+	name = property(get_name, set_name)
+	description = property(get_description, set_description)
+	running = property(get_running, set_running)
+	last_seen = property(get_last_seen, set_last_seen)
+	enabled = property(get_enabled, set_enabled)
 	
 	def __init__(self, unique_id, name, description, templates, running=True,
 		last_seen=None, enabled=True):
@@ -930,6 +979,8 @@
 	def __repr__(self):
 		return "%s: %s (%s)" % (self.__class__.__name__, self[self.UniqueId],
 			self[self.Name])
+	
+	
 
 NULL_EVENT = ([], [], [])
 """Minimal Event representation, a tuple containing three empty lists.