Skip to content

fix elfeed-curl--queue-consolidate to maintain the same shape spec #524

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

Open
SohumB wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix elfeed-curl--queue-consolidate to maintain the same shape spec #524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions elfeed-curl.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,11 +458,21 @@ results will not."
method
data))))

(defun elfeed-curl--queue-right-shape (queue condition)
(dolist (item queue)
(unless (and (listp item)
(or (stringp (car item))
(and (listp (car item))
(cl-every #'stringp (car item)))))
(signal 'wrong-type-argument (list condition item))))
)

(defun elfeed-curl--queue-consolidate (queue-in)
"Group compatible requests together and return a new queue.
Compatible means the requests have the same protocol, domain,
port, headers, method, and body, allowing them to be used safely
in the same curl invocation."
(elfeed-curl--queue-right-shape queue-in 'consolidate-input-queue-wrong-shape)
(let ((table (make-hash-table :test 'equal))
(keys ())
(queue-out ()))
Expand All @@ -474,13 +484,14 @@ in the same curl invocation."
(dolist (key (nreverse keys))
(let ((entry (gethash key table)))
(when entry
(let ((rotated (list (nreverse (cl-mapcar #'car entry))
(nreverse (cl-mapcar #'cadr entry))
(let ((rotated (list (nreverse (flatten-tree (cl-mapcar #'car entry)))
(nreverse (flatten-tree (cl-mapcar #'cadr entry)))
(cl-caddar entry)
(elt (car entry) 3)
(elt (car entry) 4))))
(push rotated queue-out)
(setf (gethash key table) nil)))))
(elfeed-curl--queue-right-shape queue-out 'consolidate-output-queue-wrong-shape)
(nreverse queue-out)))

(defun elfeed-curl--queue-wrap (cb)
Expand Down