Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use oauth2 lib and remove deferred dependency #14

Closed
wants to merge 16 commits into from
Closed

use oauth2 lib and remove deferred dependency #14

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
577d9c8
use oauth2 lib and remove deferred dependency
kidd Jul 22, 2018
902ba3b
remove unused a-token param
kidd Jul 22, 2018
8c3ac27
use asynchronous http requests
kidd Jul 22, 2018
df30932
removed useless parameters
kidd Jul 22, 2018
3db1dcf
fix end date param on POST
kidd Jul 22, 2018
5121427
add org-gcal--post-event-internal
kidd Jul 22, 2018
0cceb1e
Fix asynconicity with threads
kidd Jul 24, 2018
c357005
Merge branch 'master' into oauth2
kidd Jul 24, 2018
4fa4092
avoid multiple token fetch
kidd Jul 24, 2018
0e52bb0
fix function names and params missmatch
kidd Jul 24, 2018
9555a26
remove thread epxeriment
kidd Jul 25, 2018
e09fe27
remove call to non-existing function
kidd Jul 25, 2018
38c68fc
reduce the number of times plstore asks for a password
kidd Aug 2, 2018
dddfdcf
update dpendencies. require oauth2.el
kidd Aug 20, 2018
c3ee02a
Fix docstring
kidd Aug 20, 2018
d2861b0
port #19 to oauth2 branch
kidd Aug 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions org-gcal.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,15 @@ Predicate functions take an event, and if they return nil the

(defun rgc-cb (b cal skip-export)
(interactive)
(search-forward "\n\n")
(let ((json-object-type 'plist))
(org-gcal--sync cal (json-read) skip-export)))

(defun rgc-cb-sync (b cal skip-export)
(interactive)
(with-current-buffer b
(let ((json-object-type 'plist))
(org-gcal--sync cal (json-read) skip-export))))

;;;###autoload
(defun org-gcal-sync (&optional skip-export)
"Import events from calendars.
Expand All @@ -147,15 +152,18 @@ to non-nil to inhibit notifications."
(find-file-noselect (cdr i))
(org-gcal--archive-old-event))))
(dolist (cal org-gcal-file-alist)
(let ((b (oauth2-url-retrieve
(org-gcal-auth)
(format "%s?%s"
(format org-gcal-events-url (first cal))
(format "singleEvents=True&orderBy=startTime&timeMin=%s&timeMax=%s"
(org-gcal--subtract-time)
(org-gcal--add-time)))
'rgc-cb
(list cal skip-export)))))))
(make-thread (lambda ()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Emacs 26.1 only ?

Just an idea, but how about carrying extra variables as
symbol-plist of calendar-id or something ?

Copy link
Owner Author

@kidd kidd Jul 25, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nah, the make-thread was just a crazy test. I guess this branch is turning into an 'experimental' branch. sorry for the confusion.

I don't fully get you on the plist for the calendar-id. What would it solve?

The remaining problem here is that:

  • oauth2.el doesn't refresh the token automatically if used asynchronously.
  • using synchronous requests works, but for multiple calendars it can become a little sluggish.
  • as an "extra" annoyance, oauth2 uses plstore, and it looks like you have to enter the passphrase to decrypt the data of the tokens way to often and way too many times. This gives a shitty experience also.

I've been looking at google-contacts.el, calfw.el, and other similar packages and all of them have hacks around those. I'll revert the thread thing, but not sure what's the next thing to try :(. Feel free to throw ideas in.

(let ((b (oauth2-url-retrieve-synchronously
(org-gcal-auth)
(format "%s?%s"
(format org-gcal-events-url (first cal))
(format "singleEvents=True&orderBy=startTime&timeMin=%s&timeMax=%s"
(org-gcal--subtract-time)
(org-gcal--add-time)))
;; 'rgc-cb
;; (list cal skip-export)
)))
(rgc-cb-sync b cal skip-export))))))

(defun org-gcal--sync (x data &optional skip-export)
"An X. Also data."
Expand Down