Merge lp:~jelmer/zeitgeist-datasources/lazy-bzr into lp:zeitgeist-datasources/0.8

[Jelmer Vernooij]

Modify bzr plugin to only load zeitgeist when it is actually being used, and to use bzr's infrastructure for printing warnings.

This helps with the startup time overhead of bzr.

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Approve

review: Approve

=== modified file 'bzr/__init__.py'
--- bzr/__init__.py	2010-11-01 16:32:39 +0000
+++ bzr/__init__.py	2011-08-31 13:18:22 +0000
@@ -23,6 +23,7 @@
 
 Copyright (C) 2009, Markus Korn <[e-mail]>
 Copyright (C) 2010, Stefano Candori <[e-mail]>
+Copyright (C) 2011, Jelmer Vernooij <[e-mail]>
 Published under the GNU GPLv2 or later
 
 Installation:
@@ -30,28 +31,42 @@
 """
 
 import time
-import logging
-from bzrlib import branch
-
-logging.basicConfig(filename="/dev/null")
-
-install_hook = True
-CLIENT = None
-
-try:
-    from zeitgeist.client import ZeitgeistClient
-    from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation
-except ImportError:
-    install_hook = False
-else:
-    try:
-        CLIENT = ZeitgeistClient()
-    except RuntimeError, e:
-        print "Unable to connect to Zeitgeist, won't send events. Reason: '%s'" %e
-        install_hook = False
+from bzrlib import (
+    branch,
+    trace,
+    )
+
+_client = None
+_client_checked = None
+
+def get_client():
+    global _client_checked, _client
+    if _client_checked:
+        return _client
+    _client_checked = True
+    try:
+        from zeitgeist.client import ZeitgeistClient
+    except ImportError:
+        _client = None
+        return _client
+    import dbus
+    try:
+        _client = ZeitgeistClient()
+    except dbus.DBusException, e:
+        trace.warning("zeitgeist: %s. No events will be sent." % e.message)
+        _client = None
+    except Exception, e:
+        trace.warning("Unable to connect to Zeitgeist, won't send events. "
+                      "Reason: '%s'" % e)
+        _client = None
+    return _client
 
 
 def post_commit(local, master, old_revno, old_revid, new_revno, new_revid):
+    client = get_client()
+    if client is None:
+        return
+    from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation
     revision = master.repository.get_revision(new_revid)
     if new_revno == 1:
         interpretation = Interpretation.CREATE_EVENT
@@ -77,9 +92,14 @@
         actor="application://bzr.desktop", #something usefull here, always olive-gtk?
         subjects=[subject,]
     )
-    CLIENT.insert_event(event)
+    client.insert_event(event)
+
 
 def post_pull(pull_result):
+    client = get_client()
+    if client is None:
+        return
+    from zeitgeist.datamodel import Event, Subject, Interpretation, Manifestation
     master = pull_result.master_branch
     revision = master.repository.get_revision(pull_result.new_revid)
     interpretation = Interpretation.RECEIVE_EVENT
@@ -102,10 +122,10 @@
         actor="application://bzr.desktop", #something usefull here, always olive-gtk?
         subjects=[subject,]
     )
-    CLIENT.insert_event(event)
-
-if install_hook:
-    branch.Branch.hooks.install_named_hook("post_commit", post_commit,
-                                           "Zeitgeist dataprovider for bzr")
-    branch.Branch.hooks.install_named_hook("post_pull", post_pull,
-                                           "Zeitgeist dataprovider for bzr")
+    client.insert_event(event)
+
+
+branch.Branch.hooks.install_named_hook("post_commit", post_commit,
+                                       "Zeitgeist dataprovider for bzr")
+branch.Branch.hooks.install_named_hook("post_pull", post_pull,
+                                       "Zeitgeist dataprovider for bzr")