sqrtminusone/elfeed-sync
1
0
Fork 0
mirror of https://github.com/SqrtMinusOne/elfeed-sync.git synced 2025-12-10 20:13:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: reorder definitions

Browse source
This commit is contained in:
Pavel Korytov 2022-05-29 12:38:13 +03:00
parent 28e64aff09
commit 960a73d3c8
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
elfeed-sync.el
View file

@ -184,6 +184,28 @@ with exceptions."
(insert-buffer-substring (current-buffer)) (insert-buffer-substring (current-buffer))
(error "Error reading JSON: %s" (buffer-string))))) (error "Error reading JSON: %s" (buffer-string)))))
(defmacro elfeed-sync--handler (&rest body)
"Default response handler for tt-rss.
tt-rss often returns a non-zero status key in the response
object instead of an HTTP code. The handler checks for this.
Also handles the case where the session ID is invalid, and
resets it.
Execute BODY with the data variable scoped."
`(cl-function
(lambda (&key data &allow-other-keys)
(if (= (alist-get 'status data) 0)
(progn
,@body)
(message "Error!: %S" (alist-get 'content data))
(when (string-equal
"NOT_LOGGED_IN"
(alist-get 'error (alist-get 'content data)))
(message "Login error. Try again")
(setq elfeed-sync--tt-rss-sid nil))))))
(defun elfeed-sync--with-session (callback) (defun elfeed-sync--with-session (callback)
"Run CALLBACK with the active tt-rss session. "Run CALLBACK with the active tt-rss session.
@ -255,28 +277,6 @@ DATA is the output of `elfeed-summary--get-data'."
(elfeed-sync--get-tree-summary) (elfeed-sync--get-tree-summary)
(elfeed-sync--get-tree-plain))) (elfeed-sync--get-tree-plain)))
(defmacro elfeed-sync--handler (&rest body)
"Default response handler for tt-rss.
tt-rss often returns a non-zero status key in the response
object instead of an HTTP code. The handler checks for this.
Also handles the case where the session ID is invalid, and
resets it.
Execute BODY with the data variable scoped."
`(cl-function
(lambda (&key data &allow-other-keys)
(if (= (alist-get 'status data) 0)
(progn
,@body)
(message "Error!: %S" (alist-get 'content data))
(when (string-equal
"NOT_LOGGED_IN"
(alist-get 'error (alist-get 'content data)))
(message "Login error. Try again")
(setq elfeed-sync--tt-rss-sid nil))))))
(defun elfeed-sync-feeds () (defun elfeed-sync-feeds ()
"Sync feeds with tt-rss. "Sync feeds with tt-rss.
@ -412,7 +412,7 @@ this is necessary."
(alist-get :ids-missing-tt-rss (alist-get :ids-missing-tt-rss
elfeed-sync--state))) elfeed-sync--state)))
(time-equal (= (car val) ttrss-time))) (time-equal (= (car val) ttrss-time)))
(cdr var) (cdr val)
(alist-get :last-sync-time elfeed-sync--state)) (alist-get :last-sync-time elfeed-sync--state))
(alist-get :last-sync-time elfeed-sync--state))) (alist-get :last-sync-time elfeed-sync--state)))