Merge lp:~rakete/zeitgeist-datasources/emacs-zeitgeist-ignore-files-merge-fix into lp:zeitgeist-datasources

[Andreas Raster]

Two main changes:

Give module developers and users a way to prevent zeitgeist from indexing certain files. Either by using a let closure like (let ((zeitgeist-preventt)) (anything in here is ignored by zeitgeist)) or by setting a global regular expression that matches filenames that should be ignored.

A variable to select which .desktop to associate with the files edited by emacs for users using a emacsserver/client setup. Or any custom emacs .desktop file instead of the default one.

If there is interest to merge this I can make this code a little nicer (defcustom instead of defvar). I am using this code since I've written it and never had problems, but I don't use the global regular expression actually, so I would test that too before actually merging.

[Siegfried Gevatter (rainct)]

> If there is interest to merge this

Yeah, why not? :)

Thanks for your interest in contributing to Zeitgeist!

[Andreas Raster (rakete)]

It has been a year, and I almost forgot about the whole thing, but I am still using the emacs zeitgeist-datasource with my own patch and would really like if this (or something similar) could be merged.

[Siegfried Gevatter (rainct)]

Hi Andreas,

Sorry for the extreme delay. I've merged your commit into the Git repository:

http://cgit.freedesktop.org/zeitgeist/zeitgeist-datasources/commit/?id=cdd1c219ed3afa9500403c3c499f49583d599034

Thanks, and happy holidays!

review: Approve

=== modified file 'emacs/zeitgeist.el'
--- emacs/zeitgeist.el	2012-02-11 20:10:02 +0000
+++ emacs/zeitgeist.el	2012-08-17 11:33:26 +0000
@@ -24,6 +24,12 @@
 (require 'cl)
 (require 'dbus)
 
+(defvar zeitgeist-emacs-application "application://emacs23.desktop")
+
+(defvar zeitgeist-ignore-files-re nil)
+
+(defvar zeitgeist-prevent-send nil)
+
 ;;** General Functions
 
 (defun zeitgeist-call (method &rest args)
@@ -140,7 +146,9 @@
 	  ;; Manifestation
 	  "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#UserActivity"
 	  ;; Actor (the application, aka emacs)
-	  "application://emacs23.desktop")
+	  ;;"application://emacs23.desktop"
+      zeitgeist-emacs-application
+      )
 	 ;; List of subjects (aas)
 	 (list
 	  (list
@@ -159,31 +167,37 @@
   "Send zeitgeist the EVENT with PROPS."
   (let ((event-interpretation (zeitgeist-event-interpretation event)))
     (condition-case err
-	(case event
-	  ;; File handling events
-	  ((zeitgeist-open-file-event
-	    zeitgeist-close-file-event
-	    zeitgeist-create-file-event
-	    zeitgeist-modify-file-event)
-	   (zeitgeist-call
-	    "InsertEvents"
-	    (zeitgeist-create-event
-	     event-interpretation
-	     (concat "file://" (plist-get props :file))
-	     "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Document"
-	     "http://www.semanticdesktop.org/ontologies/nfo#FileDataObject"
-	     (concat "file://" (file-name-directory (plist-get props :file)))
-	     (zeitgeist-get-mime-type)
-	     (file-name-nondirectory
-	      (file-name-sans-versions (plist-get props :file)))
-	     "")))
-	  ;; Email events
-	  ((zeitgeist-mail-read-event
-	    zeitgeist-mail-sent-event)
-	   ;; TODO: Implement me!
-	   ))
+        (case event
+          ;; File handling events
+          ((zeitgeist-open-file-event
+            zeitgeist-close-file-event
+            zeitgeist-create-file-event
+            zeitgeist-modify-file-event)
+           (unless (or zeitgeist-prevent-send
+                       (some (lambda (re)
+                               (string-match re (plist-get props :file)))
+                             zeitgeist-ignore-files-re))
+             (zeitgeist-call
+              "InsertEvents"
+              (zeitgeist-create-event
+               event-interpretation
+               (concat "file://" (plist-get props :file))
+               "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Document"
+               "http://www.semanticdesktop.org/ontologies/nfo#FileDataObject"
+               (concat "file://" (file-name-directory (plist-get props :file)))
+               (zeitgeist-get-mime-type)
+               (file-name-nondirectory
+                (file-name-sans-versions (plist-get props :file)))
+               ""))
+             (message "zeitgeist event: %s" (file-name-nondirectory
+                                             (file-name-sans-versions (plist-get props :file))))))
+          ;; Email events
+          ((zeitgeist-mail-read-event
+            zeitgeist-mail-sent-event)
+           ;; TODO: Implement me!
+           ))
       ;; Ouch, something failed when trying to communicate with zeitgeist!
-      (error (message "ERROR (ZEITGEIST): %s" (cadr err))))))
+      (error (message "ERROR (ZEITGEIST): %s" (prin1-to-string err))))))
 
 ;;** Usual File Reading/Editing