X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fchannel%2Fcontact_list.py;h=6607979dcc06d4782d47754e3122cc9020dd6f57;hb=b5952a89cc8688e13329c9b6198a8b8498167208;hp=462e2eaf11c9c69edadaa5a7a469024ade199163;hpb=c15986e1caf528f13ad845b2fac019e9313e3284;p=theonering

diff --git a/src/channel/contact_list.py b/src/channel/contact_list.py
index 462e2ea..6607979 100644
--- a/src/channel/contact_list.py
+++ b/src/channel/contact_list.py
@@ -2,7 +2,7 @@ import logging
 
 import telepathy
 
-import util.go_utils as gobject_utils
+import tp
 import util.coroutines as coroutines
 import gtk_toolbox
 import handle
@@ -11,82 +11,71 @@ import handle
 _moduleLogger = logging.getLogger("channel.contact_list")
 
 
-class AbstractListChannel(
-		telepathy.server.ChannelTypeContactList,
-		telepathy.server.ChannelInterfaceGroup,
+class AllContactsListChannel(
+		tp.ChannelTypeContactList,
+		tp.ChannelInterfaceGroup,
 	):
-	"Abstract Contact List channels"
-
-	def __init__(self, connection, manager, props, h):
-		self._manager = manager
-		self._props = props
-
-		try:
-			# HACK Older python-telepathy way
-			telepathy.server.ChannelTypeContactList.__init__(self, connection, h)
-		except TypeError:
-			# HACK Newer python-telepathy way
-			telepathy.server.ChannelTypeContactList.__init__(self, connection, manager, props)
-		telepathy.server.ChannelInterfaceGroup.__init__(self)
-
-		self._session = connection.session
-
-
-class AllContactsListChannel(AbstractListChannel):
 	"""
 	The group of contacts for whom you receive presence
+
+	@bug On Maemo 5 this isn't even being created, I think
 	"""
 
-	def __init__(self, connection, manager, props, h):
-		AbstractListChannel.__init__(self, connection, manager, props, h)
+	def __init__(self, connection, manager, props, listHandle):
+		tp.ChannelTypeContactList.__init__(self, connection, manager, props)
+		tp.ChannelInterfaceGroup.__init__(self)
+
+		self.__manager = manager
+		self.__props = props
+		self.__session = connection.session
+		self.__listHandle = listHandle
 
 		self._callback = coroutines.func_sink(
 			coroutines.expand_positional(
 				self._on_contacts_refreshed
 			)
 		)
-		self._session.addressbook.updateSignalHandler.register_sink(
+		self.__session.addressbook.updateSignalHandler.register_sink(
 			self._callback
 		)
 
 		self.GroupFlagsChanged(0, 0)
 
 		addressbook = connection.session.addressbook
-		contacts = addressbook.get_contacts()
-		self._process_refresh(addressbook, contacts, [])
+		contacts = addressbook.get_numbers()
+		self._process_refresh(addressbook, set(contacts), set())
+
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def Close(self):
 		self.close()
 
 	def close(self):
-		self._session.addressbook.updateSignalHandler.unregister_sink(
+		_moduleLogger.debug("Closing contact list")
+		self.__session.addressbook.updateSignalHandler.unregister_sink(
 			self._callback
 		)
 		self._callback = None
 
-		telepathy.server.ChannelTypeContactList.Close(self)
-		if self._manager.channel_exists(self._props):
-			# HACK Older python-telepathy requires doing this manually
-			self._manager.remove_channel(self)
+		tp.ChannelTypeContactList.Close(self)
 		self.remove_from_connection()
 
-	@gobject_utils.async
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def _on_contacts_refreshed(self, addressbook, added, removed, changed):
 		self._process_refresh(addressbook, added, removed)
 
 	def _process_refresh(self, addressbook, added, removed):
+		_moduleLogger.info(
+			"%s Added: %r, Removed: %r" % (self.__listHandle.get_name(), len(added), len(removed))
+		)
 		connection = self._conn
 		handlesAdded = [
-			handle.create_handle(connection, "contact", contactId, phoneNumber)
-			for contactId in added
-			for (phoneType, phoneNumber) in addressbook.get_contact_details(contactId)
+			handle.create_handle(connection, "contact", contactNumber)
+			for contactNumber in added
 		]
 		handlesRemoved = [
-			handle.create_handle(connection, "contact", contactId, phoneNumber)
-			for contactId in removed
-			for (phoneType, phoneNumber) in addressbook.get_contact_details(contactId)
+			handle.create_handle(connection, "contact", contactNumber)
+			for contactNumber in removed
 		]
 		message = ""
 		actor = 0
@@ -100,32 +89,40 @@ class AllContactsListChannel(AbstractListChannel):
 		)
 
 
+_LIST_TO_FACTORY = {
+	# The group of contacts for whom you receive presence
+	'subscribe': AllContactsListChannel,
+	# The group of contacts who may receive your presence
+	'publish': AllContactsListChannel,
+	# A group of contacts who are on the publish list but are temporarily
+	# disallowed from receiving your presence
+	# This doesn't make sense to support
+	'hide': None,
+	# A group of contacts who may send you messages
+	# @todo Allow-List would be cool to support
+	'allow': None,
+	# A group of contacts who may not send you messages
+	# @todo Deny-List would be cool to support
+	'deny': None,
+	# On protocols where the user's contacts are stored, this contact list
+	# contains all stored contacts regardless of subscription status.
+	'stored': AllContactsListChannel,
+}
+
+
+_SUPPORTED_LISTS = frozenset(
+	name
+	for name in _LIST_TO_FACTORY.iterkeys()
+	if name is not None
+)
+
+
 def create_contact_list_channel(connection, manager, props, h):
-	if h.get_name() == 'subscribe':
-		# The group of contacts for whom you receive presence
-		ChannelClass = AllContactsListChannel
-	elif h.get_name() == 'publish':
-		# The group of contacts who may receive your presence
-		ChannelClass = AllContactsListChannel
-	elif h.get_name() == 'hide':
-		# A group of contacts who are on the publish list but are temporarily
-		# disallowed from receiving your presence
-		# This doesn't make sense to support
-		_moduleLogger.warn("Unsuported type %s" % h.get_name())
-	elif h.get_name() == 'allow':
-		# A group of contacts who may send you messages
-		# @todo Allow-List would be cool to support
-		_moduleLogger.warn("Unsuported type %s" % h.get_name())
-	elif h.get_name() == 'deny':
-		# A group of contacts who may not send you messages
-		# @todo Deny-List would be cool to support
-		_moduleLogger.warn("Unsuported type %s" % h.get_name())
-	elif h.get_name() == 'stored':
-		# On protocols where the user's contacts are stored, this contact list
-		# contains all stored contacts regardless of subscription status.
-		ChannelClass = AllContactsListChannel
-	else:
-		raise TypeError("Unknown list type : " + h.get_name())
-	return ChannelClass(connection, manager, props, h)
+	factory = _LIST_TO_FACTORY.get(h.get_name(), None)
+	if factory is None:
+		raise telepathy.errors.NotCapable("Unsuported type %s" % h.get_name())
+	return factory(connection, manager, props, h)
 
 
+def get_spported_lists():
+	return _SUPPORTED_LISTS