Merge lp:~cando/zeitgeist-datasources/bzr into lp:zeitgeist-datasources/0.8

[Stefano Candori]

In this branch i've:
 * added the support for Zeitgeist to register a Pull event from bzr;
 * improved the displayed text for a Commit event;
 * added a bzr-icon, not present before.

[lp:~cando/zeitgeist-datasources/bzr]

95. By Stefano Candori on 2010-10-31

Fixed bzr Makefile for global install

[Michal Hruby (mhr3)]

While we're at it could you please change the subject interpretation to Interpretation.FOLDER? Seems like we had that wrong all the time...

review: Needs Fixing

[lp:~cando/zeitgeist-datasources/bzr]

96. By Stefano Candori on 2010-11-01

Changed subject intepretation to Interpretation.FOLDER

[Stefano Candori (cando)]

> While we're at it could you please change the subject interpretation to
> Interpretation.FOLDER? Seems like we had that wrong all the time...
here you are...

[Michal Hruby (mhr3)]

Sorry for forgetting about this... Merged.

review: Approve

=== modified file 'bzr/Makefile.am'
--- bzr/Makefile.am	2010-06-07 19:50:44 +0000
+++ bzr/Makefile.am	2010-11-01 16:35:59 +0000
@@ -1,13 +1,22 @@
+EXTRA_DIST = bzr-icon-64.png
+
 bzrplugindir = $(datadir)/pyshared/bzrlib/plugins/zeitgeist
 bzrplugin_DATA = __init__.py
 
+bzricondir = $(datadir)/pixmaps
+bzricon_DATA = bzr-icon-64.png
+
 # we want to allow also local install
 BZR_PLUGIN_HOME_DIR = ~/.bazaar/plugins/zeitgeist
+BZR_ICON_DIR = ~/.local/share/icons
 
 local-install:
 	mkdir -p $(BZR_PLUGIN_HOME_DIR)
 	cp __init__.py $(BZR_PLUGIN_HOME_DIR)
+	mkdir -p $(BZR_ICON_DIR)
+	cp bzr-icon-64.png $(BZR_ICON_DIR)
 
 local-uninstall:
 	-rm -rf $(BZR_PLUGIN_HOME_DIR)
+	-rm -rf $(BZR_ICON_DIR)
 

=== modified file 'bzr/__init__.py'
--- bzr/__init__.py	2010-06-04 20:31:58 +0000
+++ bzr/__init__.py	2010-11-01 16:35:59 +0000
@@ -22,6 +22,7 @@
 Requires bzr 0.15 or higher.
 
 Copyright (C) 2009, Markus Korn <[e-mail]>
+Copyright (C) 2010, Stefano Candori <[e-mail]>
 Published under the GNU GPLv2 or later
 
 Installation:
@@ -56,11 +57,42 @@
         interpretation = Interpretation.CREATE_EVENT
     else:
         interpretation = Interpretation.MODIFY_EVENT
-    subject = Subject.new_for_values(
-        uri=unicode(master.base),
-        interpretation=unicode(Interpretation.SOURCE_CODE),
-        manifestation=unicode(Manifestation.FILE_DATA_OBJECT),
-        text=unicode(revision.message.rstrip()),
+    _text  = _("Commited on: ")
+    _text += master.base[7:-1] #don't considere file://
+    _text += _(" Revision no. : ")
+    _text += str(new_revno) + "\n"
+    _text += revision.message.rstrip()
+
+    subject = Subject.new_for_values(
+        uri=unicode(master.base),
+        interpretation=unicode(Interpretation.FOLDER),
+        manifestation=unicode(Manifestation.FILE_DATA_OBJECT),
+        text=unicode(_text),
+        origin=unicode(master.base),
+    )
+    event = Event.new_for_values(
+        timestamp=int(time.time()*1000),
+        interpretation=unicode(interpretation),
+        manifestation=unicode(Manifestation.USER_ACTIVITY),
+        actor="application://bzr.desktop", #something usefull here, always olive-gtk?
+        subjects=[subject,]
+    )
+    CLIENT.insert_event(event)
+
+def post_pull(pull_result):
+    master = pull_result.master_branch
+    revision = master.repository.get_revision(pull_result.new_revid)
+    interpretation = Interpretation.RECEIVE_EVENT
+    _text = _("Pulled ")
+    _text += master.base[7:-1] #don't considere file://
+    _text += (" to revision ")
+    _text += str(master.revno())+":\n"
+    _text += revision.get_summary()
+    subject = Subject.new_for_values(
+        uri=unicode(master.base),
+        interpretation=unicode(Interpretation.FOLDER),
+        manifestation=unicode(Manifestation.FILE_DATA_OBJECT),
+        text=unicode(_text),
         origin=unicode(master.base),
     )
     event = Event.new_for_values(
@@ -75,3 +107,5 @@
 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")

=== added file 'bzr/bzr-icon-64.png'
Binary files bzr/bzr-icon-64.png	1970-01-01 00:00:00 +0000 and bzr/bzr-icon-64.png	2010-11-01 16:35:59 +0000 differ