Start factoring out the presence stuff from chat UI... very very very broken right now

sugar/chat/chat.py

@@ -460,12 +460,8 @@ class BuddyIconRequestHandler(object):
 
 
 class GroupChat(Chat):
-
-	_MODEL_COL_NICK = 0
-	_MODEL_COL_ICON = 1
-	_MODEL_COL_BUDDY = 2
-	
 	def __init__(self):
+		self._group = Group.get_from_id('local')
 		self._act_name = "Chat"
 		self._chats = {}
 		self._buddy_icon_tries = 0
@@ -480,11 +476,6 @@ class GroupChat(Chat):
 		return self._buddy_stream.new_writer(service)
 
 	def _start(self):
-		self._group = LocalGroup()
-		self._group.add_presence_listener(self._on_group_presence_event)
-		self._group.add_service_listener(self._on_group_service_event)
-		self._group.join()
-
 		name = self._group.get_owner().get_nick_name()
 
 		# Group controls the Stream for incoming messages for
@@ -505,62 +496,11 @@ class GroupChat(Chat):
 		self._group_stream.set_data_listener(self._group_recv_message)
 		self._stream_writer = self._group_stream.new_writer()
 
-	def _create_sidebar(self):
-		vbox = gtk.VBox(False, 6)
-		
-		label = gtk.Label("Who's around:")
-		label.set_alignment(0.0, 0.5)
-		vbox.pack_start(label, False)
-		label.show()
-
-		self._buddy_list_model = gtk.ListStore(gobject.TYPE_STRING, gtk.gdk.Pixbuf, gobject.TYPE_PYOBJECT)
-
-		image_path = sugar.env.get_data_file('bubbleOutline.png')
-		self._pixbuf_active_chat = gtk.gdk.pixbuf_new_from_file(image_path)
-		
-		image_path = sugar.env.get_data_file('bubble.png')
-		self._pixbuf_new_message = gtk.gdk.pixbuf_new_from_file(image_path)
-
-		sw = gtk.ScrolledWindow()
-		sw.set_shadow_type(gtk.SHADOW_IN)
-		sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-
-		self._buddy_list_view = gtk.TreeView(self._buddy_list_model)
-		self._buddy_list_view.set_headers_visible(False)
-		self._buddy_list_view.connect("cursor-changed", self._on_buddyList_buddy_selected)
-		self._buddy_list_view.connect("row-activated", self._on_buddyList_buddy_double_clicked)
-
-		sw.set_size_request(120, -1)
-		sw.add(self._buddy_list_view)
-		self._buddy_list_view.show()
-
-		renderer = gtk.CellRendererPixbuf()
-		column = gtk.TreeViewColumn("", renderer, pixbuf=self._MODEL_COL_ICON)
-		column.set_resizable(False)
-		column.set_expand(False);
-		self._buddy_list_view.append_column(column)
-
-		renderer = gtk.CellRendererText()
-		column = gtk.TreeViewColumn("", renderer, text=self._MODEL_COL_NICK)
-		column.set_resizable(True)
-		column.set_sizing("GTK_TREE_VIEW_COLUMN_GROW_ONLY");
-		column.set_expand(True);
-		self._buddy_list_view.append_column(column)
-
-		vbox.pack_start(sw)
-		sw.show()
-
-		return vbox
-
 	def _ui_setup(self, base):
 		Chat._ui_setup(self, base)
 
 		vbox = gtk.VBox(False, 12)
 
-		sidebar = self._create_sidebar()
-		vbox.pack_start(sidebar)
-		sidebar.show()
-		
 		toolbox = self._create_toolbox()
 		vbox.pack_start(toolbox, False)
 		toolbox.show()
@@ -582,81 +522,6 @@ class GroupChat(Chat):
 		Chat.on_disconnected_from_shell(self)
 		gtk.main_quit()
 
-	def _on_buddyList_buddy_selected(self, widget, *args):
-		(model, aniter) = widget.get_selection().get_selected()
-		name = self._buddy_list_model.get(aniter, self._MODEL_COL_NICK)
-
-	def _on_buddyList_buddy_double_clicked(self, widget, *args):
-		""" Select the chat for this buddy or group """
-		(model, aniter) = widget.get_selection().get_selected()
-		chat = None
-		buddy = self._buddy_list_model.get_value(aniter, self._MODEL_COL_BUDDY)
-		if buddy and not self._chats.has_key(buddy):
-			chat = BuddyChat(self, buddy)
-			self._chats[buddy] = chat
-			chat.connect_to_shell()
-
-	def _request_buddy_icon_cb(self, result_status, response, user_data):
-		icon = response
-		buddy = user_data
-		if result_status == network.RESULT_SUCCESS:
-			if icon and len(icon):
-				icon = base64.b64decode(icon)
-				print "Buddy icon for '%s' is size %d" % (buddy.get_nick_name(), len(icon))
-				buddy.set_icon(icon)
-
-		if (result_status == network.RESULT_FAILED or not icon) and self._buddy_icon_tries < 3:
-			self._buddy_icon_tries = self._buddy_icon_tries + 1
-			print "Failed to retrieve buddy icon for '%s' on try %d of %d" % (buddy.get_nick_name(), \
-					self._buddy_icon_tries, 3)
-			gobject.timeout_add(1000, self._request_buddy_icon, buddy)
-		return False
-
-	def _request_buddy_icon(self, buddy):
-		writer = self.new_buddy_writer(buddy)
-		icon = writer.custom_request("get_buddy_icon", self._request_buddy_icon_cb, buddy)
-
-	def _on_group_service_event(self, action, service):
-		if action == Group.SERVICE_ADDED:
-			# Look for the olpc chat service
-			if service.get_type() == CHAT_SERVICE_TYPE:
-				# Find the buddy this service belongs to
-				buddy = self._group.get_buddy(service.get_name())
-				if buddy and buddy.get_address() == service.get_address():
-					# Try to get the buddy's icon
-					if buddy.get_nick_name() != self._group.get_owner().get_nick_name():
-						print "Requesting buddy icon from '%s'." % buddy.get_nick_name()
-						gobject.idle_add(self._request_buddy_icon, buddy)
-		elif action == Group.SERVICE_REMOVED:
-			pass
-			
-	def __buddy_icon_changed_cb(self, buddy):
-		it = self._get_iter_for_buddy(buddy)
-		self._buddy_list_model.set(it, self._MODEL_COL_ICON, buddy.get_icon_pixbuf())
-
-	def _on_group_presence_event(self, action, buddy):
-		if buddy.get_nick_name() == self._group.get_owner().get_nick_name():
-			# Do not show ourself in the buddy list
-			pass
-		elif action == Group.BUDDY_JOIN:
-			aniter = self._buddy_list_model.append(None)
-			self._buddy_list_model.set(aniter,
-									   self._MODEL_COL_NICK, buddy.get_nick_name(),
-									   self._MODEL_COL_BUDDY, buddy)
-			buddy.connect('icon-changed', self.__buddy_icon_changed_cb)
-		elif action == Group.BUDDY_LEAVE:
-			aniter = self._get_iter_for_buddy(buddy)
-			if aniter:
-				self._buddy_list_model.remove(aniter)
-
-	def _get_iter_for_buddy(self, buddy):
-		aniter = self._buddy_list_model.get_iter_first()
-		while aniter:
-			list_buddy = self._buddy_list_model.get_value(aniter, self._MODEL_COL_BUDDY)
-			if buddy == list_buddy:
-				return aniter
-			aniter = self._buddy_list_model.iter_next(aniter)
-
 	def _group_recv_message(self, buddy, msg):
 		self.recv_message(buddy, msg)
 

sugar/p2p/Group.py

@@ -11,17 +11,29 @@ import presence
 _OLPC_SERVICE_TYPE_PREFIX = "_olpc"
 
 class Group:
+	_groups = {}
+
 	SERVICE_ADDED = "service_added"
 	SERVICE_REMOVED = "service_removed"
 
 	BUDDY_JOIN = "buddy_join"
 	BUDDY_LEAVE = "buddy_leave"
 	
-	def __init__(self):
+	def get_from_id(group_id):
+		if group_id == 'local' and not Group._groups.has_key(group_id):
+			return LocalGroup()
+		else:
+			group = Group._groups[group_id]
+	get_from_id = staticmethod(get_from_id)
+
+	def __init__(self, group_id):
+		self._group_id = group_id
 		self._service_listeners = []
 		self._presence_listeners = []
 		self._store = Store(self)
 		
+		Group._groups[group_id] = self
+	
 	def get_store(self):
 		return self._store
 	
@@ -52,7 +64,7 @@ class Group:
 
 class LocalGroup(Group):
 	def __init__(self):
-		Group.__init__(self)
+		Group.__init__(self, 'local')
 
 		self._services = {}
 		self._buddies = {}

sugar/shell/PresenceWindow.py

@@ -0,0 +1,145 @@
+import pygtk
+pygtk.require('2.0')
+import gtk
+import gobject
+
+from sugar.p2p.Group import Group
+from sugar.p2p.Stream import Stream
+
+class PresenceWindow(gtk.Window):
+	_MODEL_COL_NICK = 0
+	_MODEL_COL_ICON = 1
+	_MODEL_COL_BUDDY = 2
+	
+	def __init__(self):
+		gtk.Window.__init__(self)
+
+		self._group = Group.get_from_id('local')
+		self._group.add_presence_listener(self._on_group_presence_event)
+		self._group.add_service_listener(self._on_group_service_event)
+		self._group.join()
+		
+		self._setup_ui()
+
+	def _setup_ui(self):
+		vbox = gtk.VBox(False, 6)
+		
+		label = gtk.Label("Who's around:")
+		label.set_alignment(0.0, 0.5)
+		vbox.pack_start(label, False)
+		label.show()
+
+		self._buddy_list_model = gtk.ListStore(gobject.TYPE_STRING,
+											   gtk.gdk.Pixbuf,
+											   gobject.TYPE_PYOBJECT)
+
+		sw = gtk.ScrolledWindow()
+		sw.set_shadow_type(gtk.SHADOW_IN)
+		sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+
+		self._buddy_list_view = gtk.TreeView(self._buddy_list_model)
+		self._buddy_list_view.set_headers_visible(False)
+		self._buddy_list_view.connect("cursor-changed", self._on_buddyList_buddy_selected)
+		self._buddy_list_view.connect("row-activated", self._on_buddyList_buddy_double_clicked)
+
+		sw.set_size_request(120, -1)
+		sw.add(self._buddy_list_view)
+		self._buddy_list_view.show()
+
+		renderer = gtk.CellRendererPixbuf()
+		column = gtk.TreeViewColumn("", renderer, pixbuf=self._MODEL_COL_ICON)
+		column.set_resizable(False)
+		column.set_expand(False);
+		self._buddy_list_view.append_column(column)
+
+		renderer = gtk.CellRendererText()
+		column = gtk.TreeViewColumn("", renderer, text=self._MODEL_COL_NICK)
+		column.set_resizable(True)
+		column.set_sizing("GTK_TREE_VIEW_COLUMN_GROW_ONLY");
+		column.set_expand(True);
+		self._buddy_list_view.append_column(column)
+
+		vbox.pack_start(sw)
+		sw.show()
+
+		self.add(vbox)
+		vbox.show()
+	
+	def _on_buddyList_buddy_selected(self, widget, *args):
+		(model, aniter) = widget.get_selection().get_selected()
+		name = self._buddy_list_model.get(aniter, self._MODEL_COL_NICK)
+
+	def _on_buddyList_buddy_double_clicked(self, widget, *args):
+		""" Select the chat for this buddy or group """
+		(model, aniter) = widget.get_selection().get_selected()
+		chat = None
+		buddy = self._buddy_list_model.get_value(aniter, self._MODEL_COL_BUDDY)
+		if buddy and not self._chats.has_key(buddy):
+			chat = BuddyChat(self, buddy)
+			self._chats[buddy] = chat
+			chat.connect_to_shell()
+
+	def _request_buddy_icon_cb(self, result_status, response, user_data):
+		icon = response
+		buddy = user_data
+		if result_status == network.RESULT_SUCCESS:
+			if icon and len(icon):
+				icon = base64.b64decode(icon)
+				print "Buddy icon for '%s' is size %d" % (buddy.get_nick_name(), len(icon))
+				buddy.set_icon(icon)
+
+		if (result_status == network.RESULT_FAILED or not icon) and self._buddy_icon_tries < 3:
+			self._buddy_icon_tries = self._buddy_icon_tries + 1
+			print "Failed to retrieve buddy icon for '%s' on try %d of %d" % (buddy.get_nick_name(), \
+					self._buddy_icon_tries, 3)
+			gobject.timeout_add(1000, self._request_buddy_icon, buddy)
+		return False
+
+	def _request_buddy_icon(self, buddy):
+		# FIXME need to use the new presence service when it's done
+		service = buddy.get_service('_olpc_chat._tcp')
+		buddy_stream = Stream.new_from_service(service, self._group)
+		writer = buddy_stream.new_writer(service)
+		icon = writer.custom_request("get_buddy_icon", self._request_buddy_icon_cb, buddy)
+
+	def _on_group_service_event(self, action, service):
+		if action == Group.SERVICE_ADDED:
+			# Look for the olpc chat service
+			# FIXME need to use the new presence service when it's done
+			if service.get_type() == '_olpc_chat._tcp':
+				# Find the buddy this service belongs to
+				buddy = self._group.get_buddy(service.get_name())
+				if buddy and buddy.get_address() == service.get_address():
+					# Try to get the buddy's icon
+					if buddy.get_nick_name() != self._group.get_owner().get_nick_name():
+						print "Requesting buddy icon from '%s'." % buddy.get_nick_name()
+						gobject.idle_add(self._request_buddy_icon, buddy)
+		elif action == Group.SERVICE_REMOVED:
+			pass
+			
+	def __buddy_icon_changed_cb(self, buddy):
+		it = self._get_iter_for_buddy(buddy)
+		self._buddy_list_model.set(it, self._MODEL_COL_ICON, buddy.get_icon_pixbuf())
+
+	def _on_group_presence_event(self, action, buddy):
+		if buddy.get_nick_name() == self._group.get_owner().get_nick_name():
+			# Do not show ourself in the buddy list
+			pass
+		elif action == Group.BUDDY_JOIN:
+			aniter = self._buddy_list_model.append(None)
+			self._buddy_list_model.set(aniter,
+									   self._MODEL_COL_NICK, buddy.get_nick_name(),
+									   self._MODEL_COL_BUDDY, buddy)
+			buddy.connect('icon-changed', self.__buddy_icon_changed_cb)
+		elif action == Group.BUDDY_LEAVE:
+			aniter = self._get_iter_for_buddy(buddy)
+			if aniter:
+				self._buddy_list_model.remove(aniter)
+
+	def _get_iter_for_buddy(self, buddy):
+		aniter = self._buddy_list_model.get_iter_first()
+		while aniter:
+			list_buddy = self._buddy_list_model.get_value(aniter, self._MODEL_COL_BUDDY)
+			if buddy == list_buddy:
+				return aniter
+			aniter = self._buddy_list_model.iter_next(aniter)

sugar/shell/shell.py

@@ -1,11 +1,14 @@
 import dbus
 import dbus.service
 import dbus.glib
+
 import pygtk
 pygtk.require('2.0')
 import gtk
 import pango
 
+from sugar.shell.PresenceWindow import PresenceWindow
+
 activity_counter = 0
 
 class ActivityHost(dbus.service.Object):
@@ -346,10 +349,13 @@ def main():
 	session_bus = dbus.SessionBus()
 	service = dbus.service.BusName("com.redhat.Sugar.Shell", bus=session_bus)
 
-	activityContainer = ActivityContainer(service, session_bus)
+	activity_container = ActivityContainer(service, session_bus)
-	activityContainer.show()
+	activity_container.show()
 	
-	console.set_parent_window(activityContainer.window)
+	presence_window = PresenceWindow()
+	presence_window.show()
+	
+	console.set_parent_window(activity_container.window)
 	
 if __name__ == "__main__":
 	main()