Merge lp:~seif/dockmanager/enhance-zeitgeist-menus into lp:dockmanager

[Seif Lotfy]

I enhanced the menus by allowing them to update themselves on the fly using the zeitgeist monitors as well as use reduce memory consumption by using negations in queries (no need to ask for all events)

[Rico Tzschichholz (ricotz)]

Nice to see you working on it :)

But the version check isn't working the current natty version 0.5.2 doesn't fit the check. Also the added items aren't right. So currently it is quite broken for me :(

review: Needs Fixing

[Seif Lotfy (seif)]

ah Shit I know why. There is a bug in Zeitgeist that did not get released.
Let me work aroudn that.

On Wed, Dec 15, 2010 at 8:17 AM, Rico Tzschichholz <email address hidden>wrote:

> Review: Needs Fixing
> Nice to see you working on it :)
>
> But the version check isn't working the current natty version 0.5.2 doesn't
> fit the check. Also the added items aren't right. So currently it is quite
> broken for me :(
>
>
> --
>
> https://code.launchpad.net/~seif/dockmanager/enhance-zeitgeist-menus/+merge/43714
> You are the owner of lp:~seif/dockmanager/enhance-zeitgeist-menus.
>

--
This is me doing some advertisement for my blog http://seilo.geekyogre.com

[Seif Lotfy (seif)]

The remaining issue is from you side guys. I finished my part.

[lp:~seif/dockmanager/enhance-zeitgeist-menus]

78. By Robert Dyer on 2010-12-19

fix the add_menu_with_uri calls to properly fall back on add_menu_item

[Rico Tzschichholz (ricotz)]

The menu_pressed method need some work. Now it will throw a exception in too many cases and if it fails it might not use the right application.
I think it is better to use:

if uri.endswith(".desktop"):
    try:
        appinfo = gio.unix.DesktopAppInfo(uri)
        if appinfo:
            appinfo.launch(self.ids[menu_id]])
    except ...

review: Needs Fixing

[lp:~seif/dockmanager/enhance-zeitgeist-menus]

79. By Robert Dyer on 2010-12-20

better code

[Rico Tzschichholz (ricotz)]

review: Approve

[lp:~seif/dockmanager/enhance-zeitgeist-menus]

80. By Rico Tzschichholz on 2010-12-20

update zeitgeist-menu-helper

enhanced the menus by allowing them to update themselves on the fly
using the zeitgeist monitors as well as use reduce memory consumption
by using negations in queries (no need to ask for all events

merge lp:~seif/dockmanager/enhance-zeitgeist-menus

=== modified file 'scripts/zeitgeist_menus.py'
--- scripts/zeitgeist_menus.py	2010-08-06 23:14:20 +0000
+++ scripts/zeitgeist_menus.py	2010-12-20 16:08:12 +0000
@@ -28,11 +28,14 @@
 import urllib
 import os
 import subprocess
+import gio
+
+home = "file://" + os.path.expanduser("~")
 
 try:
 	from dockmanager.dockmanager import DockManagerItem, DockManagerSink, DOCKITEM_IFACE
 	from zeitgeist.client import ZeitgeistClient
-	from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation, StorageState
+	from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation, StorageState, TimeRange
 	from signal import signal, SIGTERM
 	from sys import exit
 except ImportError, e:
@@ -41,9 +44,9 @@
 try:
 	CLIENT = ZeitgeistClient()
 	version = [int(x) for x in CLIENT.get_version()]
-	MIN_VERSION = [0, 3, 2, 0]
+	MIN_VERSION = [0, 4, 0, 0]
 	if version < MIN_VERSION:
-		print "PLEASE USE ZEITGEIST 0.3.2 or above"
+		print "PLEASE USE ZEITGEIST 0.4.0 or above"
 		exit()
 		
 
@@ -51,105 +54,146 @@
 	print "Unable to connect to Zeitgeist, won't send events. Reason: '%s'" %e
 	exit()
 	
-class MostUsedProvider():
-	def __init__(self):
-		self._zg = CLIENT
-		self.results = []
-
-	def get_path_most_used(self, path, handler, is_directoy=True):
-		today = time.time() * 1000
-		delta = (today - 14 * 86400000)
-
-		def exists(uri):
-		 	return not uri.startswith("file://") or os.path.exists(urllib.unquote(str(uri[7:])))
-
-		def _handle_find_events(ids):
-			self._zg.get_events(ids, _handle_get_events)
-
-		def _handle_get_events(events):
-			uris = []
-			uris_counter = {}
-			titles = {}
-			for event in events:
-				for subject in event.subjects:
-					if exists(subject.uri):
-						if not subject.uri in uris:
-							uris.append(subject.uri)
-							titles[subject.uri] = subject.text
-							uris_counter[subject.uri] = 0
-						uris_counter[subject.uri] += 1
-						
-			counter = []
-			for k, v in uris_counter.iteritems():
-				counter.append((v, k))
-			counter.sort(reverse = True)
-
-			recent =[]
-			temp = [i[1] for i in counter]
-			for uri in uris:
-				if not uri in temp[0:5]:
-					recent.append(uri)
-			results = []
-			results.append(recent[0:5])
-
-			results.append(counter[0:5])
-
-			# add also titles to the result list
-			new_results = []
-			new_results.append(map(lambda x: (x, titles[x]), results[0]))
-			new_results.append(map(lambda x: (x[1], titles[x[1]]), results[1]))
-			
-			handler(new_results)
-		
-		event = Event()
-		if is_directoy:
-			subject = Subject()
-			subject.set_origin(path)
-			event.set_subjects([subject])
-			self._zg.find_events_for_templates([event],_handle_get_events, [delta, today], StorageState.Any, 0, 0)
-		else:
-			path = "application://" + path.split("/")[-1]
-			event.set_actor(path)
-			self._zg.find_events_for_templates([event],_handle_get_events, [delta, today], StorageState.Any, 0, 0)
-
-
 class ZGItem(DockManagerItem):
 	def __init__(self, sink, path):
 		DockManagerItem.__init__(self, sink, path)
-		self.mostusedprovider = MostUsedProvider()
-		self.update_most_used()
-	
-	def update_most_used(self):
-		has_uri = True
+		self.monitor = None 
+		self.recent = []
+		self.most = []
+		self.ids = {}
+
+		self.has_uri = True
 		self.uri = self.iface.Get(DOCKITEM_IFACE, "Uri", dbus_interface="org.freedesktop.DBus.Properties")
-		
 		if not self.uri:
-			has_uri = False
+			self.has_uri = False
 			self.uri = self.iface.Get(DOCKITEM_IFACE, "DesktopFile", dbus_interface="org.freedesktop.DBus.Properties")
 			self.uri = 'application://%s' % self.uri[self.uri.rfind('/')+1:]
+
+		self.app_info = None
+		app_uri = self.iface.Get(DOCKITEM_IFACE, "DesktopFile", dbus_interface="org.freedesktop.DBus.Properties")
+		apps = gio.app_info_get_all()
+		app = None
+		t_app = app_uri.split("/")[-1].replace(".desktop", "")
+		if t_app:
+			for app in apps:
+				if t_app in app.get_executable():
+					self.app_info = app
+					break
+
+		self.update_entries()
 		
+	def update_entries(self, x=None, y=None, z=None):
+		self.recent = []
+		self.most = []
+
 		if not self.uri:
 			return
 		
-		self.mostusedprovider.get_path_most_used (self.uri, self._handle_get_most_used, has_uri)
-
-	def _handle_get_most_used(self, results):
-		uris = results[0]
-		if len(uris) > 0:
-			for uri, title in uris:
-				self.add_menu_item_uri(uri, "Other Recently Used Items", title)
-		uris = results[1]
-		if len(uris) > 0:
-			for uri, title in uris:
-				self.add_menu_item_uri(uri, "Most Used Items", title)
-
+		def reformat_strings():
+			titles = {}
+			for r in self.recent:
+				if not r[1] in titles:
+					titles[r[1]] = []
+				titles[r[1]].append(r)
+			for m in self.most:
+				if not m[1] in titles:
+					titles[m[1]] = []
+				titles[m[1]].append(m)
+			for t in titles:
+				if len(titles[t]) > 1:
+					for l in titles[t]:
+						for i, r in enumerate(self.recent):	
+							if l == r:
+								self.recent[i][1] = r[1] + " (" + r[0].replace(home, "~") + ")"
+								break
+						for i, r in enumerate(self.most):	
+							if l == r:
+								self.most[i][1] = r[1] + " (" + r[0].replace(home, "~") + ")"
+								break
+						
+		def exists(uri):
+		 	return uri.startswith("note://") or os.path.exists(urllib.unquote(str(uri[7:])))
+		 
+		def handle_most(results):
+			self.most = []
+			for event in results:
+				if exists(event.subjects[0].uri):
+					self.most.append([event.subjects[0].uri, event.subjects[0].text])
+				if len(self.most) >= 5:
+					break
+			reformat_strings()
+			self.update_menu()
+				
+		def handle_recent(results):
+			self.recent = []
+			for event in results:
+				if exists(event.subjects[0].uri):
+					self.recent.append([event.subjects[0].uri, event.subjects[0].text])
+					subj = Subject()
+					subj.uri = "!"+event.subjects[0].uri
+					template.subjects.append(subj)
+				if len(self.recent) >= 5:
+					break
+			CLIENT.find_events_for_templates([template], handle_most, num_events = 1000, result_type = 4)
+		 
+		template = Event()
+		if self.has_uri:
+			subj = Subject()
+			subj.set_uri(self.uri+"/*")
+			template.set_subjects([subj])
+		else:
+			template.set_actor(self.uri)
+
+		CLIENT.find_events_for_templates([template], handle_recent, num_events = 1000, result_type = 2)
+
+		if not self.monitor:
+			self.monitor = CLIENT.install_monitor(TimeRange.always(), [template], self.update_entries, self.update_entries)
+
+	def update_menu(self):
+		for id in self.ids:
+			self.remove_menu_item(id)
+		self.ids.clear()
+		uris = self.most
+		for uri in uris:
+			uri, title = uri[0], uri[1]
+			icon = self.get_icon(uri)
+			self.ids[(self.add_menu_item(title, icon, "Other Popular"))] = uri
+		uris = self.recent
+		for uri in uris:
+			uri, title = uri[0], uri[1]
+			icon = self.get_icon(uri)
+			print icon
+			self.ids[(self.add_menu_item(title, icon, "Latest"))] = uri
+	
+	def get_icon(self, uri):
+		if uri.startswith("note://"):
+			return "tomboy-note"
+ 		file_ = gio.File(uri)
+		info = file_.query_info('standard::icon,thumbnail::path')
+		thumbnail_path = info.get_attribute_as_string('thumbnail::path')
+		if thumbnail_path:
+			return thumbnail_path
+		else:
+		 	icon = info.get_icon() 
+		 	icon_path = None
+		 	if isinstance(icon, gio.ThemedIcon): 
+				icon_path  = icon.get_names()[0]
+			elif isinstance(icon, gio.FileIcon): 
+				icon_path = icon.get_file().get_path()
+			return icon_path
+		
+	def menu_pressed(self, menu_id):
+		if menu_id in self.ids:
+			if self.app_info:
+				self.app_info.launch([gio.File(self.ids[menu_id])])	
+			else:
+				subprocess.Popen(['xdg-open', self.ids[menu_id]])
 
 class ZGSink(DockManagerSink):
 	def item_path_found(self, pathtoitem, item):
 		if item.Get(DOCKITEM_IFACE, "Uri", dbus_interface="org.freedesktop.DBus.Properties") != "" or item.Get(DOCKITEM_IFACE, "DesktopFile", dbus_interface="org.freedesktop.DBus.Properties") != "":
 			self.items[pathtoitem] = ZGItem(self, pathtoitem)
 
-
 zgsink = ZGSink()
 
 def cleanup ():
@@ -157,10 +201,7 @@
 
 if __name__ == "__main__":
 	mainloop = gobject.MainLoop(is_running=True)
-
 	atexit.register (cleanup)
-	
 	signal(SIGTERM, lambda signum, stack_frame: exit(1))
-
 	while mainloop.is_running():
 		mainloop.run()