-
Notifications
You must be signed in to change notification settings - Fork 20
/
os.el
933 lines (791 loc) · 31.5 KB
/
os.el
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
;;; os.el --- Synchronize Org documents with external services
;; Copyright (C) 2012 Aurelien Aptel
;;
;; Author: Aurelien Aptel <aurelien dot aptel at gmail dot com>
;; Keywords: org, synchronization
;; Homepage: http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/org-sync
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; This file is not part of GNU Emacs.
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; This package implements an extension to org-mode that synchnonizes
;; org document with external services. It provides an interface that
;; can be implemented in backends. The current focus is on
;; bugtrackers services.
;; The entry points are `os-import', `os-sync' and `os'. The first
;; one prompts for a URL to import, the second one pulls, merges and
;; pushes every buglists in the current buffer and the third one
;; combines the others in one function: if nothing in the buffer can
;; be synchronized, ask for an URL to import.
;; The usual workflow is first to import your buglist with
;; `os-import', modify it or add a bug and run `os-sync'.
;; A buglist is a top-level headline which has a :url: in its
;; PROPERTIES block. This headline is composed of a list of
;; subheadlines which corresponds to bugs. The requirement for a bug
;; is to have a state, a title and an id. If you add a new bug, it
;; wont have an id but it will get one once you sync. If you omit the
;; status, OPEN is chose.
;; The status is an org TODO state. It can be either OPEN or CLOSED.
;; The title is just the title of the headline. The id is a number in
;; the PROPERTIES block of the headline.
;; Org DEADLINE timestamp are also handled and can be inserted in a
;; bug headline which can then be used by the backend if it supports
;; it.
;; Paragraphs under bug-headlines are considered as their description.
;; Additionnal data used by the backend are in the PROPERTIES block of
;; the bug.
;; To add a bug, just insert a new headline under the buglist you want
;; to modify e.g.:
;; ** OPEN my new bug
;; Then simply call `os-sync'.
;;; Code:
;; The data structures used to represent bugs and buglists are simple
;; plists. It is what backend have to handle, process or return.
;; Buglist example:
;; '(:title "My buglist"
;; :url "http://github.com/repos/octocat/Hello-World"
;; :bugs (BUGS...))
;; Bug example:
;; '(:id 3
;; :status 'open or 'closed
;; :sync 'conflict-local or 'conflict-remote
;; :title "foo"
;; :desc "blah"
;; :priority "major"
;; :tags ("a" "b" "c")
;; :author "Aurélien"
;; :assignee "Foo"
;; :milestone "foo"
;; ;; dates are regular emacs time object
;; :date-deadline ...
;; :date-creation ...
;; :date-modification ...
;; ;; backend-specific properties
;; ;; ...
;; )
;; Some accesors are available for both structure. See `os-set-prop',
;; and `os-get-prop'.
;; When importing an URL, Org-sync matches the URL against the
;; variable `os-backend-alist' which maps regexps to backend symbols.
;; The backend symbol is then used to call the backend functions.
;; When these functions are called, the variable `os-backend' and
;; `os-base-url' are dynamically bound to respectively the backend
;; symbol and the cannonical URL for the thing you are synching with.
;; The symbol part in a `os-backend-alist' pair must be a variable
;; defined in the backend. It is an alist that maps verb to function
;; symbol. Each backend must implement at least 3 verbs:
;; * base-url (param: URL)
;; Given the user URL, returns the cannonical URL to represent it.
;; This URL will be available dynamically to all of your backend
;; function through the `os-base-url' variable.
;; * fetch-buglist (param: LAST-FETCH-TIME)
;; Fetch the buglist at `os-base-url'. If LAST-FETCH-TIME is non-nil,
;; and you only fetched things modified since it, you are expected to
;; set the property :since to it in the buglist you return. You can
;; add whatever properties you want in a bug. The lisp printer is
;; used to persist them in the buffer.
;; * send-buglist (param: BUGLIST)
;; Send BUGLIST to the repo at `os-base-url' and return the new bugs
;; created that way. A bug without an id in BUGLIST is a new bug, the
;; rest are modified bug.
;; When synchronizing, Org-sync parses the current buffer using
;; org-element and convert any found buglist headline to a buglist
;; data structure. See `os-headline-to-buglist',
;; `os-headline-to-bug'.
;; When writing buglists back to the document, Org-sync converts them
;; to elements -- the data structure used by org-element -- which are
;; then interpreted by `org-element-interpret-data'. The resulting
;; string is then inserted in the buffer. See `os-buglist-to-element'
;; and `os-bug-to-element'.
(eval-when-compile (require 'cl))
(require 'org)
(require 'org-element)
(defvar os-backend nil
"Org-sync current backend.")
(defvar os-base-url nil
"Org-sync current base url.")
(defvar os-backend-alist
'(("github.com/\\(?:repos/\\)?[^/]+/[^/]+" . os-github-backend)
("bitbucket.org/[^/]+/[^/]+" . os-bb-backend)
("/projects/[^/]+" . os-rmine-backend)
("rememberthemilk.com" . os-rtm-backend))
"Alist of url patterns vs corresponding org-sync backend.")
(defvar os-cache-file (concat user-emacs-directory "org-sync-cache")
"Path to Org-sync cache file.")
(defvar os-cache-alist nil
"Org-sync cache for buglists.
Maps URLs to buglist cache.")
(defvar os-conflict-buffer "*Org-sync conflict*"
"Name of the conflict buffer")
(defvar os-sync-props nil
"List of property to sync or nil to sync everything.")
(defun os-action-fun (action)
"Return current backend ACTION function or nil."
(unless (or (null action) (null os-backend))
(let ((fsym (assoc-default action (eval os-backend))))
(when (fboundp fsym)
fsym))))
(defun os-get-backend (url)
"Return backend symbol matching URL from `os-backend-alist'."
(assoc-default url os-backend-alist 'string-match))
(defmacro os-with-backend (backend &rest body)
"Eval BODY with os-backend set to corresponding BACKEND.
If BACKEND evals to a string it is passed to os-get-backend, the
resulting symbol is dynamically assigned to os-backend. The url
is passed to os--base-url and dynamically assigned to
os-base-url.
Else BACKEND should be a backend symbol. It is
assigned to os-backend."
(declare (indent 1) (debug t))
(let ((res (gensym))
(url (gensym)))
`(let* ((,res ,backend)
(,url))
(when (stringp ,res)
(setq ,url ,res)
(setq ,res (os-get-backend ,url)))
(unless (symbolp ,res)
(error "Backend %s does not evaluate to a symbol."
(prin1-to-string ',backend)))
(let* ((os-backend ,res)
(os-base-url (os--base-url ,url)))
,@body))))
(defun os-set-cache (url buglist)
"Update URL to BUGLIST in `os-cache-alist'."
(let ((cell (assoc url os-cache-alist)))
(if cell
(setcdr cell buglist)
(push (cons url buglist) os-cache-alist))))
(defun os-get-cache (url)
"Return the buglist at URL in cache or nil."
(cdr (assoc url os-cache-alist)))
(defun os-write-cache ()
"Write Org-sync cache to `os-cache-file'."
(with-temp-file os-cache-file
(prin1 `(setq os-cache-alist ',os-cache-alist) (current-buffer))))
(defun os-load-cache ()
"Load Org-sync cache from `os-cache-file'."
(load os-cache-file 'noerror nil))
(defun os-plist-to-alist (plist)
"Return PLIST as an association list."
(let* (alist cell q (p plist))
(while p
(setq cell (cons (car p) (cadr p)))
(if alist
(progn
(setcdr q (cons cell nil))
(setq q (cdr q)))
(setq alist (cons cell nil))
(setq q alist))
(setq p (cddr p)))
alist))
(defun os-propertize (sym)
"Return sym as a property i.e. prefixed with :."
(intern (concat ":" (if (symbolp sym)
(symbol-name sym)
sym))))
(defun os-get-prop (key b)
"Return value of the property KEY in buglist or bug B."
(plist-get b key))
(defun os-set-prop (key val b)
"Set KEY to VAL in buglist or bug B."
(plist-put b key val))
(defun os-append! (elem list)
"Add ELEM at the end of LIST by side effect if it isn't present.
Return ELEM if it was added, nil otherwise."
(catch :exit
(let ((p list))
(while (cdr p)
(when (equal (car p) elem)
(throw :exit nil))
(setq p (cdr p)))
(setcdr p (cons elem nil))
elem)))
(defun os--send-buglist (buglist)
"Send a BUGLIST on the bugtracker."
(let ((f (os-action-fun 'send-buglist)))
(if f
(funcall f buglist)
(error "No send backend available."))))
(defun os--fetch-buglist (last-update)
"Return the buglist at url REPO."
(let ((f (os-action-fun 'fetch-buglist)))
(if f
(funcall f last-update)
(error "No fetch backend available."))))
(defun os--base-url (url)
"Return the base url of URL."
(let ((f (os-action-fun 'base-url)))
(if f
(funcall f url)
(error "No base-url backend available."))))
(defun os-url-param (url param)
"Return URL with PARAM alist appended."
(let* ((split (split-string url "\\?" t))
(base (car split))
(rest (cadr split))
(final))
;; read all param
(when rest
(mapc
(lambda (s)
(let* ((split (split-string s "=" t))
(var (car split))
(val (cadr split))
(cell (assoc var final)))
(if cell
(setcdr cell val)
(push (cons var val) final))))
(split-string rest "&" t)))
;; add params from arg
(mapc (lambda (p)
(let* ((var (car p))
(val (cdr p))
(cell (assoc var final)))
(if cell
(setcdr cell val)
(push p final))))
param)
;; output new url
(concat
base
"?"
(mapconcat (lambda (p)
(concat
(url-hexify-string (car p))
"="
(url-hexify-string (cdr p))))
final "&"))))
;; OPEN bugs sorted by mod time then CLOSED bugs sorted by mod time
(defun os-bug-sort (a b)
"Return non-nil if bug A should appear before bug B."
(flet ((time-less-safe (a b)
(if (and a b)
(time-less-p a b)
(or a b))))
(let* ((ao (eq 'open (os-get-prop :status a)))
(bc (not (eq 'open (os-get-prop :status b))))
(am (time-less-safe
(os-get-prop :date-modification b)
(os-get-prop :date-modification a))))
(or
(and ao am)
(and bc am)
(and ao bc)))))
(defun os-buglist-to-element (bl)
"Return buglist BL as an element."
(let* ((skip '(:title :bugs :date-cache))
(sorted (sort (os-get-prop :bugs bl) 'os-bug-sort))
(elist (delq nil (mapcar 'os-bug-to-element sorted)))
(title (os-get-prop :title bl))
(url (os-get-prop :url bl))
(props (sort (mapcar
;; stringify prop name
(lambda (x)
(cons (substring (symbol-name (car x)) 1) (cdr x)))
;; remove skipped prop
(remove-if (lambda (x)
(memq (car x) skip))
(os-plist-to-alist bl)))
;; sort prop by key
(lambda (a b)
(string< (car a) (car b))))))
(os-set-prop :bugs sorted bl)
`(headline
(:level 1 :title (,title))
(section
nil
(property-drawer (:properties ,props)))
,@elist)))
(defun os-filter-list (list minus)
"Return a copy of LIST without elements in MINUS."
(let ((final (copy-seq list)))
(mapc (lambda (x)
(delq x final)) minus)
final))
(defun os-bug-to-element (b)
"Return bug B as a TODO element if it is visible or nil."
;; not in PROPERTIES block
(let* ((skip '(:title :status :desc :old-bug
:date-deadline :date-creation :date-modification))
(title (os-get-prop :title b))
(dtime (os-get-prop :date-deadline b))
(ctime (os-get-prop :date-creation b))
(mtime (os-get-prop :date-modification b))
(prop-alist (loop for (a b) on b by #'cddr
if (and b (not (memq a skip)))
collect (cons (substring (symbol-name a) 1)
(prin1-to-string b)))))
(unless (os-get-prop :delete b)
;; add date-xxx props manually in a human readable way.
(push (cons
"date-creation"
(os-time-to-string ctime)) prop-alist)
(push (cons
"date-modification"
(os-time-to-string mtime)) prop-alist)
;; sort PROPERTIES by property name
(setq prop-alist (sort prop-alist
(lambda (a b)
(string< (car b) (car a)))))
`(headline
(:title ,(concat
title
(when dtime
(concat
" DEADLINE: "
(format-time-string (org-time-stamp-format) dtime))))
:level 2
:todo-type todo
:todo-keyword ,(upcase (symbol-name (os-get-prop :status b))))
(section
nil
(property-drawer
(:properties ,prop-alist))
(fixed-width (:value ,(os-get-prop :desc b))))))))
(defun os-headline-url (e)
"Returns the url of the buglist in headline E."
(cdr (assoc "url"
(org-element-property
:properties
(car (org-element-contents
(car (org-element-contents e))))))))
(defun os-buglist-headline-p (elem)
"Return t if ELEM is a buglist headline."
(and
(eq (org-element-type elem) 'headline)
(stringp (os-headline-url elem))))
(defun os-headline-to-buglist (h)
"Return headline H as a buglist."
(let* ((skip '(:url))
(alist (org-element-property
:properties
(car (org-element-contents
(car (org-element-contents h))))))
(title (car (org-element-property :title h)))
(url (cdr (assoc "url" alist)))
(bugs (mapcar
'os-headline-to-bug
(nthcdr 1 (org-element-contents
(car (org-element-contents h))))))
(bl `(:title ,title
:url ,url
:bugs ,bugs)))
;; add all other properties
(mapc (lambda (x)
(let ((k (os-propertize (car x)))
(v (cdr x)))
(unless (memq k skip)
(os-set-prop k v bl))))
alist)
bl))
(defun os-headline-to-bug (h)
"Return headline H as a bug."
(let* ((todo-keyword (org-element-property :todo-keyword h))
;; properties to skip when looking at the PROPERTIES block
(skip '(:status :title :desc :date-deadline :date-creation :date-modification))
(status (intern (downcase (or todo-keyword "open"))))
(dtime (os-parse-date (org-element-property :deadline h)))
(title (car (org-element-property :title h)))
(section (org-element-contents (car (org-element-contents h))))
(headline-alist (org-element-property
:properties
(car
(org-element-contents
(car (org-element-contents h))))))
(ctime (os-parse-date (cdr (assoc "date-creation" headline-alist))))
(mtime (os-parse-date (cdr (assoc "date-modification" headline-alist))))
desc
bug)
(dolist (e section)
(let ((type (org-element-type e))
(content (org-element-contents e)))
(cond
;; interpret quote block as actual text
((eq type 'fixed-width)
(setq desc (concat desc (org-element-property :value e))))
;; ignore these
((or (eq type 'property-drawer)
(eq type 'planning)
(and (eq type 'paragraph)
(string-match "^ *DEADLINE: " (car content))))
nil)
;; else, interpret via org-element
(t
(setq desc (concat desc (org-element-interpret-data e)))))))
;; deadlines can be either on the same line as the headline or
;; on the next one. org-element doesn't parse it the same way
;; when on the same line, remove DEADLINE tag from title
;; else ignore DEADLINE tag in paragraph
(when dtime
(setq title (replace-regexp-in-string " DEADLINE: " "" title)))
(setq bug (list
:status status
:title title
:desc desc
:date-deadline dtime
:date-creation ctime
:date-modification mtime))
;; add all properties
(mapc (lambda (x)
(let ((k (os-propertize (car x)))
(v (when (and (cdr x) (not (equal (cdr x) "")))
(read (cdr x)))))
(unless (memq k skip)
(setq bug (cons k (cons v bug)))))) headline-alist)
bug))
(defun os-find-buglists (elem)
"Return every buglist headlines in ELEM."
(let ((type (org-element-type elem))
(contents (org-element-contents elem)))
(cond
;; if it's a buglist, return it
((os-buglist-headline-p elem)
elem)
;; else if it contains elements, look recursively in it
((or (eq type 'org-data) (memq type org-element-greater-elements))
(let (buglist)
(mapc (lambda (e)
(let ((h (os-find-buglists e)))
(when h
(setq buglist (cons h buglist)))))
contents)
buglist))
;; terminal case
(t
nil))))
(defun os-add-keyword (tree key val)
"Add KEY:VAL as a header in TREE by side-effects and return TREE.
If KEY is already equal to VAL, no change is made."
(catch :exit
(let* ((section (first (org-element-contents tree))))
(when (and (eq 'org-data (org-element-type tree))
(eq 'section (org-element-type section)))
(dolist (e (org-element-contents section))
(let* ((type (org-element-type e))
(ekey (org-element-property :key e))
(eval (org-element-property :value e)))
(when (and (eq 'keyword type)
(string= ekey key)
(string= eval val))
(throw :exit nil))))
(setf (nthcdr 2 section)
(cons
`(keyword (:key ,key :value ,val))
(org-element-contents section))))))
tree)
(defun os-org-reparse ()
"Reparse current buffer."
;; from org-ctrl-c-ctrl-c, thanks to vsync in #org-mode
(let ((org-inhibit-startup-visibility-stuff t)
(org-startup-align-all-tables nil))
(when (boundp 'org-table-coordinate-overlays)
(mapc 'delete-overlay org-table-coordinate-overlays)
(setq org-table-coordinate-overlays nil))
(org-save-outline-visibility 'use-markers (org-mode-restart))))
(defun os-import (url)
"Fetch and insert at point bugs from URL."
(interactive "sURL: ")
(os-with-backend url
(let* ((buglist (os--fetch-buglist nil))
(elem (os-buglist-to-element buglist))
(bug-keyword '(sequence "OPEN" "|" "CLOSED")))
;; we add the buglist to the cache
(os-set-prop :date-cache (current-time) buglist)
(os-set-cache os-base-url buglist)
(save-excursion
(insert (org-element-interpret-data
`(org-data nil ,elem)))
(unless (member bug-keyword org-todo-keywords)
(goto-char (point-min))
(insert "#+TODO: OPEN | CLOSED\n")
(add-to-list 'org-todo-keywords bug-keyword)
;; the buffer has to be reparsed in order to have the new
;; keyword taken into account
(os-org-reparse)))))
(message "Import complete."))
(defun os-get-bug-id (buglist id)
"Return bug ID from BUGLIST."
(when id
(catch :exit
(mapc (lambda (x)
(let ((current-id (os-get-prop :id x)))
(when (and (numberp current-id) (= current-id id))
(throw :exit x))))
(os-get-prop :bugs buglist))
nil)))
(defun os-buglist-dups (buglist)
"Return non-nil if BUGLIST contains bugs with the same id.
The value returned is a list of duplicated ids."
(let ((hash (make-hash-table))
(dups))
(mapc (lambda (x)
(let ((id (os-get-prop :id x)))
(puthash id (1+ (gethash id hash 0)) hash)))
(os-get-prop :bugs buglist))
(maphash (lambda (id nb)
(when (> nb 1)
(push id dups))) hash)
dups))
(defun os-time-max (&rest timelist)
"Return the largest time in TIMELIST."
(reduce (lambda (a b)
(if (and a b)
(if (time-less-p a b) b a))
(or a b))
timelist))
(defun os-buglist-last-update (buglist)
"Return the most recent creation/modi date in BUGLIST."
(apply 'os-time-max (loop for x in (os-get-prop :bugs buglist)
collect (os-get-prop :date-creation x) and
collect (os-get-prop :date-modification x))))
(defun os-set-equal (a b)
"Return t if list A and B have the same elements, no matter the order."
(catch :exit
(mapc (lambda (e)
(unless (member e b)
(throw :exit nil)))
a)
(mapc (lambda (e)
(unless (member e a)
(throw :exit nil)))
b)
t))
(defun os-parse-date (date)
"Parse and return DATE as a time or nil."
(when (and (stringp date) (not (string= date "")))
(date-to-time date)))
(defun os-time-to-string (time)
"Return TIME as a full ISO 8601 date string."
(format-time-string "%Y-%m-%dT%T%z" time))
(defun os-bug-diff (a b)
"Return an alist of properties that differs in A and B or nil if A = B.
The form of the alist is ((:property . (valueA valueB)...)"
(let ((diff)
(props-list
(append
(loop for (akey aval) on a by #'cddr collect akey)
(loop for (bkey bval) on b by #'cddr collect bkey))))
(delete-dups props-list)
(dolist (key props-list diff)
(let ((va (os-get-prop key a))
(vb (os-get-prop key b)))
(unless (equal va vb)
(setq diff (cons `(,key . (,va ,vb)) diff)))))))
(defun os-bug-prop-equalp (prop a b)
"Return t if bug A PROP = bug B PROP, nil otherwise."
(equal (os-get-prop prop a) (os-get-prop prop b)))
(defun os-buglist-diff (a b)
"Return a diff buglist which turns buglist A to B when applied.
This function makes the assumption that A ⊂ B."
(let (diff)
(dolist (bbug (os-get-prop :bugs b))
(let ((abug (os-get-bug-id a (os-get-prop :id bbug))))
(when (or (null abug) (os-bug-diff abug bbug))
(push bbug diff))))
`(:bugs ,diff)))
(defun os-merge-diff (local remote)
"Return the merge of LOCAL diff and REMOTE diff.
The merge is the union of the diff. Conflicting bugs are tagged
with :sync conflict-local or conflict-remote."
(let ((added (make-hash-table))
merge)
;; add all local bugs
(dolist (lbug (os-get-prop :bugs local))
(let* ((id (os-get-prop :id lbug))
(rbug (os-get-bug-id remote id))
rnew lnew)
;; if there's a remote bug with the same id, we have a
;; conflict
;; if the local bug has a sync prop, it was merged by the
;; user, so we keep the local one (which might be the
;; remote from a previous sync)
(if (and rbug (null (os-get-prop :sync lbug)) (os-bug-diff lbug rbug))
(progn
(setq lnew (copy-tree lbug))
(os-set-prop :sync 'conflict-local lnew)
(setq rnew (copy-tree rbug))
(os-set-prop :sync 'conflict-remote rnew)
(push rnew merge)
(push lnew merge))
(progn
(push lbug merge)))
;; mark it
(puthash id t added)))
;; add new remote bug which are the unmarked bugs in remote
(dolist (rbug (os-get-prop :bugs remote))
(unless (gethash (os-get-prop :id rbug) added)
(push rbug merge)))
`(:bugs ,merge)))
(defun os-update-buglist (base diff)
"Apply buglist DIFF to buglist BASE and return the result.
This is done according to `os-sync-props'."
(let ((added (make-hash-table))
new)
(dolist (bug (os-get-prop :bugs base))
(let* ((id (os-get-prop :id bug))
(diff-bug (os-get-bug-id diff id))
new-bug)
(if (and os-sync-props diff-bug)
(progn
(setq new-bug bug)
(mapc (lambda (p)
(os-set-prop p (os-get-prop p diff-bug) new-bug))
os-sync-props))
(setq new-bug (or diff-bug bug)))
(push new-bug new)
(puthash id t added)))
(dolist (bug (os-get-prop :bugs diff))
(let ((id (os-get-prop :id bug)))
(when (or (null id) (null (gethash id added)))
(push bug new))))
(let ((new-buglist (copy-list base)))
(os-set-prop :bugs new new-buglist)
new-buglist)))
(defun os-remove-unidentified-bug (buglist)
"Remove bugs without id from BUGLIST."
(let ((new-bugs))
(dolist (b (os-get-prop :bugs buglist))
(when (os-get-prop :id b)
(push b new-bugs)))
(os-set-prop :bugs new-bugs buglist)
buglist))
(defun os-replace-headline-by-buglist (headline buglist)
"Replace HEADLINE by BUGLIST by side effects."
(let ((new-headline (os-buglist-to-element buglist)))
(setf (car headline) (car new-headline)
(cdr headline) (cdr new-headline))))
(defun os-show-conflict (buglist url)
"Show conflict in BUGLIST at URL in conflict window."
(let ((buf (get-buffer-create os-conflict-buffer)))
(with-help-window buf
(with-current-buffer buf
(erase-buffer)
(org-mode)
(insert "There were some conflicts while merging. Here
are the problematic items. Look at the :sync property to know
their origin. Copy what you want to keep in your org buffer and
sync again.\n\n")
(dolist (b (os-get-prop :bugs buglist))
(when (and b (os-get-prop :sync b))
(insert (org-element-interpret-data (os-bug-to-element b))
"\n")))))))
(defun os-getalist (obj &rest keys)
"Apply assoc in nested alist OBJ with KEYS."
(let ((p obj))
(dolist (k keys p)
(setq p (cdr (assoc k p))))))
(defun os-filter-bug (bug)
"Filter BUG according to `os-sync-props'."
(if os-sync-props
(let ((new-bug `(:id ,(os-get-prop :id bug))))
(mapc (lambda (x)
(os-set-prop x (os-get-prop x bug) new-bug))
os-sync-props)
new-bug)
bug))
(defun os-filter-diff (diff)
"Filter DIFF according to `os-sync-props'."
(when os-sync-props
(let (final)
(dolist (b (os-get-prop :bugs diff))
(let ((id (os-get-prop :id b)))
;; drop new bugs
(when id
(push (os-filter-bug b) final))))
(os-set-prop :bugs final diff)))
diff)
(defun os-sync ()
"Update buglists in current buffer."
(interactive)
(ignore-errors (kill-buffer os-conflict-buffer))
;; parse the buffer and find the buglist-looking headlines
(let* ((local-doc (org-element-parse-buffer))
(local-headlines (os-find-buglists local-doc)))
;; for each of these headlines, convert it to buglist
(dolist (headline local-headlines)
(let* ((local (os-headline-to-buglist headline))
(url (os-get-prop :url local)))
;; if it has several bug with the same id, stop
(when (os-buglist-dups local)
(error
"Buglist \"%s\" contains unmerged bugs."
(os-get-prop :title local)))
;; local cache remote
;; \ / \ /
;; parse load load fetch
;; \ / \ /
;; local-diff remote-diff
;; \ /
;; \ /
;; merged-diff --------send-------->
;; (...)
;; local <--recv-updated-diff---
;; v
;; merged
;; v
;; new cache/local/remote
;; handle buglist with the approriate backend
(os-with-backend url
(let* ((cache (os-get-cache os-base-url))
(last-fetch (os-get-prop :date-cache cache))
(local-diff (os-buglist-diff cache local))
remote remote-diff merged merged-diff)
;; fetch remote buglist
(if last-fetch
;; make a partial fetch and apply it to cache if the backend
;; supports it
(let* ((partial-fetch (os--fetch-buglist last-fetch)))
(if (os-get-prop :since partial-fetch)
(setq remote (os-update-buglist cache partial-fetch))
(setq remote partial-fetch)))
(setq remote (os--fetch-buglist nil)))
;; at this point remote is the full remote buglist
(setq remote-diff (os-buglist-diff cache remote))
(setq merged-diff (os-merge-diff local-diff remote-diff))
;; filter according to os-sync-props
(os-filter-diff merged-diff)
(setq merged (os-update-buglist local merged-diff))
;; if merged-diff has duplicate bugs, there's a conflict
(let ((dups (os-buglist-dups merged-diff)))
(if dups
(progn
(message "Synchronization failed, manual merge needed.")
(os-show-conflict merged-diff os-base-url))
;; else update buffer and cache
(setq merged
(os-remove-unidentified-bug
(os-update-buglist merged (os--send-buglist merged-diff))))
(os-set-prop :date-cache (current-time) merged)
(os-set-cache os-base-url merged)
(message "Synchronization complete.")))
;; replace headlines in local-doc
(os-replace-headline-by-buglist headline merged)))))
(os-add-keyword local-doc "TODO" "OPEN | CLOSED")
;; since we replace the whole buffer, save-excusion doesn't work so
;; we manually (re)store the point
(let ((oldpoint (point)))
(delete-region (point-min) (point-max))
(goto-char (point-min))
(insert (org-element-interpret-data local-doc))
(goto-char oldpoint))))
(defun os ()
"Synchronize current buffer or import an external document.
If no Org-sync elements are present in the buffer, ask for a URL
to import otherwise synchronize the buffer."
(interactive)
(let* ((local-doc (org-element-parse-buffer)))
(if (os-find-buglists local-doc)
(os-sync)
(call-interactively 'os-import))))
(provide 'os)
;;; os.el ends here