Merge lp:~ted/lptools/review-changes into lp:~dobey/lptools/trunk

[Ted Gould]

[lp:~ted/lptools/review-changes]

22. By Ted Gould on 2009-09-12

Merging in from trunk

23. By Ted Gould on 2009-09-12

Ripping out our config file and using the same one as review-list

24. By Ted Gould on 2009-09-12

Using the thread code from the review-list

25. By Ted Gould on 2009-09-12

Switching around the property names to match the v2 naming for the messaging indicator.

26. By Ted Gould on 2009-09-12

Making it so that clicking on the main menu item brings up the list.

27. By Ted Gould on 2009-09-12

Merging in the worker queue branch.

Unmerged revisions

27. By Ted Gould on 2009-09-12

Merging in the worker queue branch.

26. By Ted Gould on 2009-09-12

Making it so that clicking on the main menu item brings up the list.

25. By Ted Gould on 2009-09-12

Switching around the property names to match the v2 naming for the messaging indicator.

24. By Ted Gould on 2009-09-12

Using the thread code from the review-list

23. By Ted Gould on 2009-09-12

Ripping out our config file and using the same one as review-list

22. By Ted Gould on 2009-09-12

Merging in from trunk

21. By Ted Gould on 2009-08-05

Merge in license info

20. By Ted Gould on 2009-08-05

Merging from trunk

19. By Ted Gould on 2009-08-05

A better review URL

18. By Ted Gould on 2009-08-05

Make a callback to brink up a webbrowser

=== modified file 'README'
--- README	2009-07-27 14:21:21 +0000
+++ README	2009-08-03 13:59:48 +0000
@@ -1,5 +1,5 @@
-This is a temporary repository with some review tools for the Ubuntu One
-projects.
+This is a temporary repository with some review tools for projects on
+Launchpad.
 
 review-notifier <project1> [[project2] ...]
 
@@ -10,10 +10,9 @@
 review-list <project1> [[project2] ...]
 
 This tool will present a list of all the branches currently in the
-Needs Review state. It includes the current list of Ubuntu One projects to
-monitor, and additional projects can be passed in on the command line. The
-list includes the branch name, and the votes on the proposal. You can
-double-click on a row to open the merge proposal page in your browser.
+Needs Review state. The list includes the branch name, and the votes
+on the proposal. You can double-click on a row to open the merge
+proposal page in your browser.
 
 
 Both tools use launchpadlib, and refresh automatically every 5 minutes

=== modified file 'review-list'
--- review-list	2009-07-29 18:41:26 +0000
+++ review-list	2009-08-05 18:19:07 +0000
@@ -14,6 +14,7 @@
 import sys
 
 from xdg.BaseDirectory import xdg_cache_home
+from xdg.BaseDirectory import xdg_config_home
 
 from threading import Thread
 
@@ -84,23 +85,30 @@
 
             self.me = self.launchpad.me
 
-            print "Allo, %s" % self.me.name
             self.show()
 
             # Need to move this to a config file instead of hardcoding
-            self.projects = [ "ubunet",
-                              "ubuntuone-storage-protocol",
-                              "ubuntuone-client",
-                              "ubuntuone-testing",
-                              "desktopcouch",
-                              "bindwood",
-                              "couchdb-glib",
-                              "evolution-couchdb",
-                              ]
+            self.projects = [ ]
             for arg in sys.argv:
                   if arg is not sys.argv[0]:
                         self.projects.append(arg)
 
+            projectlst = os.path.join(xdg_config_home, "review-tools", "project-list")
+            try:
+                f = open(projectlst)
+                prjlist = f.readlines()
+                for i in prjlist:
+                    self.projects.append(i.strip())
+                f.close
+            except IOError:
+                print "IO Error"
+            except:
+                pass
+
+            if len(self.projects) == 0:
+                print "No projects specified"
+                sys.exit(1)
+
             self.thread = None
 
             self.__timeout()

=== modified file 'review-notifier'
--- review-notifier	2009-07-27 14:20:10 +0000
+++ review-notifier	2009-08-05 00:50:01 +0000
@@ -11,20 +11,38 @@
 
 import os
 import sys
+import subprocess
 
 from xdg.BaseDirectory import xdg_cache_home
+from xdg.BaseDirectory import xdg_config_home
 
 from launchpadlib.launchpad import Launchpad, EDGE_SERVICE_ROOT
 from launchpadlib.credentials import Credentials
 
+import indicate
+from time import time
+
 ICON_NAME = "bzr-icon-64"
 
+def indicator_display (indicator):
+    name = indicator.get_property("sender")
+    url = "http://code.launchpad.net/" + name + "/+activereviews"
+    ret = subprocess.call(["xdg-open", url])
+    if ret != 0:
+        sys.stderr.write("Failed to run 'xdg-open %s'\n" % url)
+
 class Main(object):
 
     def __init__(self):
         self.id = 0
         self.cached_candidates = {}
 
+        self.indicators = { }
+        server = indicate.indicate_server_ref_default()
+        server.set_type("message.instant")
+        server.set_desktop_file(os.path.join(os.getcwd(), "review-tools.desktop"))
+        server.show()
+
         self.cachedir = os.path.join(xdg_cache_home, "review-notifier")
         credsfile = os.path.join(self.cachedir, "credentials")
 
@@ -45,14 +63,37 @@
 
         self.me = self.launchpad.me
 
-        print "Allo, %s" % self.me.name
-
         self.projects = []
 
         for arg in sys.argv:
             if not arg.endswith("review-notifier"):
                 self.projects.append(arg)
 
+        projectlst = os.path.join(xdg_config_home, "review-tools", "project-list")
+        try:
+            f = open(projectlst)
+            prjlist = f.readlines()
+            for i in prjlist:
+                self.projects.append(i.strip())
+            f.close
+        except IOError:
+            print "IO Error"
+        except:
+            pass
+
+        if len(self.projects) == 0:
+            print "No Projects specified"
+            sys.exit(1)
+
+        for project in self.projects:
+            ind = indicate.IndicatorMessage()
+            ind.set_property("subtype", "im")
+            ind.set_property("sender", project)
+            ind.set_property_time("time", time())
+            ind.connect("user-display", indicator_display)
+            ind.hide()
+            self.indicators[project] = ind
+
         pynotify.init("Review Notifier")
         self.timeout()
 
@@ -77,6 +118,7 @@
             trunk = focus
 
             if trunk.landing_candidates:
+                self.indicators[project].show()
                 for c in trunk.landing_candidates:
                     c_name = c.source_branch.unique_name
                     status = None
@@ -131,9 +173,13 @@
 
                     if updated:
                         n.set_urgency(pynotify.URGENCY_LOW)
+                        n.set_hint("x-canonical-append", "allow")
                         n.show()
+                        self.indicators[project].set_property_time("time", time())
                     else:
                         n.close()
+            else:
+                self.indicators[project].hide()
 
         return True
 

=== added file 'review-tools.desktop'
--- review-tools.desktop	1970-01-01 00:00:00 +0000
+++ review-tools.desktop	2009-08-04 23:32:09 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Launchpad Reviews
+GenericName=Code Review Notifier
+Comment=Notify when new code reviews appear
+Exec=review-list
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Network;