hiro/emacs-ipython-notebook
1
0
Fork 0
mirror of https://github.com/vale981/emacs-ipython-notebook synced 2025-03-06 01:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use ein-query-ajax in ein:notebook-save-notebook

Browse source 
This change adds timeout to notebook-save-notebook.  This is useful
since sometimes Emacs does not start transaction and have opened
process hanging around.

This change also fixes a bug which might be occurred in the previous
version: ein:notebook-discard-output-p is called from
ein:notebook-save-notebook via ein:notebook-to-json but not on the
notebook buffer.  This function access to the buffer, but not treated
properly.  This change fixes this problem.
This commit is contained in:
Takafumi Arakaki 2012-05-25 22:12:34 +02:00
parent 82d5cffeca
commit 81334a86e8
1 changed files with 38 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
ein-notebook.el
View file

@ -39,6 +39,7 @@
(require 'ein-events)
(require 'ein-notification)
(require 'ein-kill-ring)
(require 'ein-query)
;;; Configuration
@ -62,12 +63,13 @@ yet. So be careful when using EIN functions. They may change."
)
:group 'ein)
(defun ein:notebook-discard-output-p ()
(defun ein:notebook-discard-output-p (notebook)
"Return non-`nil' if the output must be discarded, otherwise save."
(case ein:notebook-discard-output-on-save
(no nil)
(yes t)
(t (funcall ein:notebook-discard-output-on-save))))
(t (with-current-buffer (ein:notebook-buffer notebook)
(funcall ein:notebook-discard-output-on-save)))))
;;; Class and variable
@ -738,7 +740,7 @@ Do not clear input prompts when the prefix argument is given."
(defun ein:notebook-to-json (notebook)
"Return json-ready alist."
(let* ((discard (ein:notebook-discard-output-p))
(let* ((discard (ein:notebook-discard-output-p notebook))
(cells (mapcar (lambda (c) (ein:cell-to-json c discard))
(ein:notebook-get-cells notebook))))
`((worksheets . [((cells . ,(apply #'vector cells)))])
@ -751,63 +753,52 @@ Do not clear input prompts when the prefix argument is given."
(push `(nbformat . ,(ein:$notebook-nbformat notebook)) data)
(ein:events-trigger (ein:$notebook-events notebook)
'(notebook_saving . Notebook))
(let ((url (ein:url-no-cache (ein:notebook-url notebook)))
(url-request-method "PUT")
(url-request-extra-headers '(("Content-Type" . "application/json")))
(url-request-data (json-encode data)))
(ein:log 'debug "URL-RETRIEVE url = %s" url)
(ein:log 'debug "URL-REQUEST-DATA = %s" url-request-data)
(url-retrieve
url
#'ein:notebook-save-notebook-callback
(list notebook retry)))))
(ein:query-ajax
(ein:notebook-url notebook)
:type "PUT"
:headers '(("Content-Type" . "application/json"))
:cache nil
:data (json-encode data)
:error (cons #'ein:notebook-save-notebook-error notebook)
:success (cons #'ein:notebook-save-notebook-workaround
(cons notebook retry))
:status-code
`((204 . ,(cons #'ein:notebook-save-notebook-success notebook)))
:timeout 5000)))
(defun ein:notebook-save-notebook-command ()
(interactive)
(ein:notebook-save-notebook ein:notebook 0))
(defun ein:notebook-save-notebook-callback (status notebook retry)
(declare (special url-http-response-status
url-http-method))
(ein:log 'debug "SAVE-NOTEBOOK-CALLBACK nodtebook-id = %S, status = %S"
(ein:$notebook-notebook-id notebook)
status)
(ein:log 'debug "url-http-response-status = %s" url-http-response-status)
(ein:log 'debug "url-request-method = %s" url-request-method)
(ein:log 'debug "url-http-method = %s" (when (boundp 'url-http-method)
url-http-method))
(ein:log 'debug "(buffer-string) = \n%s" (buffer-string))
(let ((response url-http-response-status))
;; ^-- "save" local variable before killing buffer.
(kill-buffer (current-buffer))
(with-current-buffer (ewoc-buffer (ein:$notebook-ewoc notebook))
(ein:aif (plist-get status :error)
(defun* ein:notebook-save-notebook-workaround (nb-retry &rest args
&key
status
&allow-other-keys)
(declare (special url-http-response-status))
;; IPython server returns 204 only when the notebook URL is
;; accessed via PUT or DELETE. As it seems Emacs failed to
;; choose PUT method every two times, let's check the response
;; here and fail when 204 is not returned.
(unless (eq url-http-response-status 204)
(let ((notebook (car nb-retry))
(retry (cdr nb-retry)))
(if (< retry ein:notebook-save-retry-max)
(progn
(ein:log 'debug "ERROR CODE = %S" it)
(ein:notebook-save-notebook-error notebook status))
;; IPython server returns 204 only when the notebook URL is
;; accessed via PUT or DELETE. As it seems Emacs failed to
;; choose PUT method every two times, let's check the response
;; here and fail when 204 is not returned.
(if (eq response 204)
(ein:notebook-save-notebook-success notebook status)
(if (< retry ein:notebook-save-retry-max)
(progn
(ein:log 'info "Retry saving... Next count: %s" (1+ retry))
(ein:notebook-save-notebook notebook (1+ retry)))
(ein:notebook-save-notebook-error notebook status)
(ein:log 'info
"Status code (=%s) is not 204 and retry exceeds limit (=%s)."
response ein:notebook-save-retry-max)))))))
(ein:log 'info "Retry saving... Next count: %s" (1+ retry))
(ein:notebook-save-notebook notebook (1+ retry)))
(ein:notebook-save-notebook-error notebook :status status)
(ein:log 'info
"Status code (=%s) is not 204 and retry exceeds limit (=%s)."
url-http-response-status ein:notebook-save-retry-max)))))
(defun ein:notebook-save-notebook-success (notebook status)
(defun ein:notebook-save-notebook-success (notebook &rest ignore)
(ein:log 'info "Notebook is saved.")
(setf (ein:$notebook-dirty notebook) nil)
(set-buffer-modified-p nil)
(ein:events-trigger (ein:$notebook-events notebook)
'(notebook_saved . Notebook)))
(defun ein:notebook-save-notebook-error (notebook status)
(defun ein:notebook-save-notebook-error (notebook &rest ignore)
(ein:log 'info "Failed to save notebook!")
(ein:events-trigger (ein:$notebook-events notebook)
'(notebook_save_failed . Notebook)))