Re: patch to make org-mac-iCal work with calendar "groups"

From: Carsten Dominik <carsten.dominik@gmail.com>
To: Doug Hellmann <doug.hellmann@gmail.com>
Cc: suckling@gmail.com, org-mode mailing list <emacs-orgmode@gnu.org>
Subject: Re: patch to make org-mac-iCal work with calendar "groups"
Date: Tue, 3 Nov 2009 05:39:18 +0100	[thread overview]
Message-ID: <AB029ADE-FC04-4232-9B29-7530E69D0D14@gmail.com> (raw)
In-Reply-To: <9A9B7E30-62EC-44BA-A9F9-E7BD33E7B9B7@gmail.com>

Applied, thanks.

- Carsten

On Nov 2, 2009, at 3:24 PM, Doug Hellmann wrote:

> Some calendar systems (Google, Zimbra) handle subscriptions to  
> multiple calendars (or to an account) by grouping them under a  
> single caldav directory in the calendar tree.  org-mac-iCal assumes  
> there is only one ics file created per caldav directory, so while it  
> *creates* all of the needed merged ics files, it only copies one of  
> them to ~/Library/Calendar before importing the contents into the  
> diary.
>
> The patch below fixes the problem.
>
> Doug
>
>
> --------------------
>
> diff --git a/contrib/lisp/org-mac-iCal.el b/contrib/lisp/org-mac- 
> iCal.el
> index 015eab4..0d0b4f8 100644
> --- a/contrib/lisp/org-mac-iCal.el
> +++ b/contrib/lisp/org-mac-iCal.el
> @@ -96,17 +96,20 @@ the the Emacs diary"
>                                      (omi-checked x))
>                                    all-calendars)))
>
> -  ;; for each caledar, concatenate individual events into a single  
> ics file
> +  ;; for each calendar, concatenate individual events into a single  
> ics file
>   (with-temp-buffer
>     (shell-command "sw_vers" " *temp*")
>     (when (re-search-backward "10.5" nil t)
>       (omi-concat-leopard-ics all-calendars)))
>
> -  ;; move any caldav ics files to the same place as local ics files
> +  ;; move all caldav ics files to the same place as local ics files
>   (mapc
>    (lambda (x)
> -     (when (directory-files x 1 ".*ics$")
> -       (rename-file (car (directory-files x 1 ".*ics$")) (concat "~/ 
> Library/Cal
> +     (mapc
> +      (lambda (y)
> +        (rename-file (concat x "/" y);
> +                     (concat "~/Library/Calendars/" y)))
> +      (directory-files x nil ".*ics$")))
>    caldav-folders)
>
>   ;; check calendar has contents and import
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Remember: use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

- Carsten