hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-04 15:41:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor encoding/decoding of message-part lists for readability

Browse source
This commit is contained in:
Nathaniel Nicandro 2018-08-28 15:46:36 -05:00
parent 2b8be0c2cf
commit 0bf30538e6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
jupyter-messages.el
View file

@ -117,9 +117,9 @@ is non-nil. If it is nil, then set the list's second element to
the result of calling `jupyter--encode' on the third element and
return the result."
;; TODO: Handle date fields, they get turned into list
(if (and (listp part) (eq (car part) 'message-part))
(or (nth 1 part)
(setf (nth 1 part) (jupyter--decode (nth 2 part))))
(if (eq (car-safe part) 'message-part)
(cl-destructuring-bind (_ encoded-rep decoded-rep) part
(or encoded-rep (setf (nth 1 part) (jupyter--encode decoded-rep))))
(cl-letf (((symbol-function 'json-encode)
(lambda (object)
(cond ((memq object (list t json-null json-false))
@ -162,9 +162,9 @@ return the result.
Otherwise, if PART is a string decode it using UTF-8 encoding and
read it as a JSON string. If it is not valid JSON, return the
decoded string."
(if (and (listp part) (eq (car part) 'message-part))
(or (nth 2 part)
(setf (nth 2 part) (jupyter--decode (nth 1 part))))
(if (eq (car-safe part) 'message-part)
(cl-destructuring-bind (_ encoded-rep decoded-rep) part
(or decoded-rep (setf (nth 2 part) (jupyter--decode encoded-rep))))
(let* ((json-object-type 'plist)
(str (decode-coding-string part 'utf-8))
(val (condition-case nil