X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-filter.el;h=a07d0c65d4f5a1a17769475cd0bc35ff8277bb0b;hp=fb8894d4a6f37c466daf4fdd1e57831415cb5779;hb=87270cf0f658e74f636b8222c5219e8e100db588;hpb=005a2a7642c9f43d699922799801124a77d56f5d diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el index fb8894d..a07d0c6 100644 --- a/lisp/riece-filter.el +++ b/lisp/riece-filter.el @@ -28,14 +28,11 @@ (require 'riece-misc) (require 'riece-server) ;riece-close-server (require 'riece-identity) -(require 'riece-display) +(require 'riece-debug) (defun riece-handle-numeric-reply (prefix number name string) (let ((base-number (* (/ number 100) 100)) function) - (condition-case nil - (require (intern (format "riece-%03d" base-number))) - (error)) (setq function (intern-soft (format "riece-handle-%03d-message" number))) (unless (and function (symbol-function function)) @@ -44,21 +41,9 @@ (format "riece-handle-default-%03d-message" base-number)))) (if (and function (symbol-function function)) - (condition-case error - (funcall function prefix number name - (riece-decode-coding-string string)) - (error - (if riece-debug - (message "Error occurred in `%S': %S" function error))))))) - -(defun riece-default-handle-numeric-reply - (client-prefix prefix number name string) - (riece-insert - (list riece-dialogue-buffer riece-others-buffer) - (concat client-prefix - (riece-concat-server-name - (mapconcat #'identity (riece-split-parameters string) " ")) - "\n"))) + (riece-funcall-ignore-errors (symbol-name function) + function prefix number name + (riece-decode-coding-string string))))) (defun riece-handle-message (prefix message string) (if (and prefix @@ -71,88 +56,75 @@ (let ((function (intern-soft (concat "riece-handle-" message "-message"))) (hook (intern (concat "riece-" message "-hook"))) (after-hook (intern (concat "riece-after-" message "-hook")))) - (unless (condition-case error - (run-hook-with-args-until-success hook prefix string) - (error - (if riece-debug - (message "Error occurred in `%S': %S" hook error)) - nil)) + (unless (riece-ignore-errors (symbol-name hook) + (run-hook-with-args-until-success hook prefix string)) (if function - (condition-case error - (funcall function prefix string) - (error - (if riece-debug - (message "Error occurred in `%S': %S" function error))))) - (condition-case error - (run-hook-with-args-until-success after-hook prefix string) - (error - (if riece-debug - (message "Error occurred in `%S': %S" after-hook error))))))) + (riece-funcall-ignore-errors (symbol-name function) + function prefix string)) + (riece-ignore-errors (symbol-name after-hook) + (run-hook-with-args-until-success after-hook prefix string))))) + +(defsubst riece-chomp-string (string) + (if (string-match "\r\\'" string) + (substring string 0 (match-beginning 0)) + string)) (defun riece-filter (process input) (save-excursion (set-buffer (process-buffer process)) - (goto-char riece-read-point) - (unless riece-debug - (delete-region (riece-line-beginning-position) (point-min)) - (setq riece-read-point (point))) + (goto-char (point-max)) (insert input) - (goto-char (prog1 riece-read-point - (setq riece-read-point (point)))) + (goto-char riece-read-point) (beginning-of-line) - (catch 'contiguous - (while (not (eobp)) - (save-excursion - (if (looking-at - ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)\r\n") - (riece-handle-numeric-reply - (match-string 1) ;prefix - (string-to-number (match-string 2)) ;number - (match-string 3) ;name - (match-string 4)) ;reply string - (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\r\n") - (riece-handle-message - (match-string 2) ;optional prefix - (match-string 3) ;command - (match-string 4)) ;params & trailing - (if (looking-at ".*\r\n") - (if riece-debug - (message "Weird message from server: %s" - (buffer-substring (point) (progn - (end-of-line) - (point))))) - (throw 'contiguous nil))))) - (forward-line))))) + (while (looking-at ".*\n") ;the input line is finished + (save-excursion + (if (looking-at + ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)") + (riece-handle-numeric-reply + (match-string 1) ;prefix + (string-to-number (match-string 2)) ;number + (match-string 3) ;name + (riece-chomp-string (match-string 4))) ;reply string + (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)") + (riece-handle-message + (match-string 2) ;optional prefix + (match-string 3) ;command + (riece-chomp-string (match-string 4))) ;params & trailing + (if riece-debug + (message "Weird message from server: %s" + (buffer-substring (point) (progn + (end-of-line) + (point)))))))) + (forward-line)) + (unless riece-debug + (delete-region (point-min) (point))) + (setq riece-read-point (point)))) (eval-when-compile (autoload 'riece-exit "riece")) (defun riece-sentinel (process status) (if riece-reconnect-with-password - (unwind-protect - (let ((server-name - (with-current-buffer (process-buffer process) - riece-server-name))) - (riece-close-server-process process) - (riece-open-server - (if (equal server-name "") - riece-server - (riece-server-name-to-server server-name)) - server-name)) - (setq riece-reconnect-with-password nil)) + (let ((server-name + (with-current-buffer (process-buffer process) + riece-server-name))) + (riece-close-server-process process) + (riece-open-server + (if (equal server-name "") + riece-server + (riece-server-name-to-server server-name)) + server-name)) (let ((server-name (with-current-buffer (process-buffer process) riece-server-name))) - (if (and (process-id process) ;not a network connection - (string-match "^exited abnormally with code \\([0-9]+\\)" - status)) + (if riece-debug (if (equal server-name "") - (message "Connection closed: %s" (match-string 1 status)) - (message "Connection to \"%s\" closed: %s" - server-name (match-string 1 status))) + (riece-debug (format "Connection closed: %s" + (substring status 0 (1- (length status))))) + (riece-debug (format "Connection to \"%s\" closed: %s" + server-name + (substring status 0 (1- (length status)))))) (if (equal server-name "") - (message "Connection closed: %s" - (substring status 0 (1- (length status)))) - (message "Connection to \"%s\" closed: %s" - server-name (substring status 0 (1- (length status)))))) + (message "Connection closed") + (message "Connection to \"%s\" closed" server-name))) (let ((channels riece-current-channels)) (while channels (if (and (car channels) @@ -163,7 +135,7 @@ (riece-redisplay-buffers) (riece-close-server-process process) ;; If no server process is available, exit. - (unless riece-process-list + (unless riece-server-process-alist (riece-exit))))) (provide 'riece-filter)