Merge lp:~seif/docky/zg-docky into lp:docky

[Seif Lotfy]

[lp:~seif/docky/zg-docky]

1304. By Seif Lotfy <seif@Gary> on 2010-04-25

fixed Author name

1305. By Seif Lotfy <seif@Gary> on 2010-04-26

remove prints

1306. By Seif Lotfy <seif@Gary> on 2010-04-26

remove uris2

1307. By Seif Lotfy <seif@Gary> on 2010-04-26

fixes

=== modified file 'AUTHORS'
--- AUTHORS	2009-12-16 22:06:15 +0000
+++ AUTHORS	2010-04-26 10:25:45 +0000
@@ -13,6 +13,6 @@
 Robert Dyer <[e-mail]>
 Chris Szikszoy <[e-mail]>
 Rico Tzschichholz <[e-mail]>
-Seif Lofty <[e-mail]>
+Seif Lotfy <[e-mail]>
 Chris Halse Rogers <[e-mail]>
 Alex Launi <[e-mail]>

=== modified file 'Docky/Docky/Docky.cs'
--- Docky/Docky/Docky.cs	2010-04-14 09:13:53 +0000
+++ Docky/Docky/Docky.cs	2010-04-26 10:25:45 +0000
@@ -119,7 +119,7 @@
 				"Robert Dyer <[e-mail]>",
 				"Chris Szikszoy <[e-mail]>",
 				"Rico Tzschichholz <[e-mail]>",
-				"Seif Lofty <[e-mail]>",
+				"Seif Lotfy <[e-mail]>",
 				"Chris Halse Rogers <[e-mail]>",
 				"Alex Launi <[e-mail]>"
 			};

=== modified file 'scripts/zeitgeist_docky.py'
--- scripts/zeitgeist_docky.py	2010-01-16 15:08:04 +0000
+++ scripts/zeitgeist_docky.py	2010-04-26 10:25:45 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 #  
-#  Copyright (C) 2009 Jason Smith, Seif Lofty
+#  Copyright (C) 2009 Jason Smith, Seif Lotfy
 # 
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -40,9 +40,9 @@
 try:
 	CLIENT = ZeitgeistClient()
 	version = [int(x) for x in CLIENT.get_version()]
-	MIN_VERSION = [0, 3, 1, 0]
+	MIN_VERSION = [0, 3, 2, 0]
 	if version < MIN_VERSION:
-		print "PLEASE USE ZEITGEIST 0.3.1 or above"
+		print "PLEASE USE ZEITGEIST 0.3.2 or above"
 		exit()
 		
 
@@ -53,6 +53,7 @@
 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
@@ -66,31 +67,42 @@
 
 		def _handle_get_events(events):
 			uris = []
-			counter = 0
+			uris_counter = {}
 			for event in events:
-				if counter < 5:
-					for subject in event.subjects:
-						if counter < 5 and exists(subject.uri):
-							uris.append(subject)
-							counter+=1
-						elif counter >= 5:
-							break
-						else:
-							pass
-							#print "skipping", subject.uri
-				else:
-					break
-			handler(uris)
+				for subject in event.subjects:
+					if exists(subject.uri):
+						if not subject.uri in uris:
+							uris.append(subject.uri)
+							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])
+			handler(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, 4) 
+			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, 4) 
+			self._zg.find_events_for_templates([event],_handle_get_events, [delta, today], StorageState.Any, 0, 0)  
+
 
 class DockyZGItem(DockyItem):
 	def __init__(self, path):
@@ -108,10 +120,17 @@
 			return
 		self.mostusedprovider.get_path_most_used (self.uri, self._handle_get_most_used, self.iface.GetOwnsUri ())
 
-	def _handle_get_most_used(self, uris):
-		for subject in uris:
-			menu_id = self.iface.AddFileMenuItem(subject.uri,"Most Used Items")
-			self.id_map[menu_id] = subject.uri
+	def _handle_get_most_used(self, results):
+		uris = results[0]
+		if len(uris) > 0:
+			for subject in uris:
+				menu_id = self.iface.AddFileMenuItem(subject ,"Other Recently Used Items")
+				self.id_map[menu_id] = subject
+		uris = results[1]
+		if len(uris) > 0:
+			for subject in uris:
+				menu_id = self.iface.AddFileMenuItem(subject[1], "Most Used Items")
+				self.id_map[menu_id] = subject
 
 class DockyZGSink(DockySink):
 	def item_path_found(self, pathtoitem, item):