* riece-options.el (riece-addons): Add riece-button.

[riece] / lisp / riece-rdcc.el

diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index 711977a..46429ce 100644 (file)
--- a/lisp/riece-rdcc.el
+++ b/lisp/riece-rdcc.el
@@ -27,6 +27,7 @@
 (require 'riece-misc)
 (require 'riece-channel)
 (require 'riece-identity)
+(require 'riece-ctcp)                  ;for riece-ctcp-additional-clientinfo
 
 (defgroup riece-rdcc nil
   "DCC implementation using ruby"
@@ -79,6 +80,11 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
   :type 'list
   :group 'riece-rdcc)
 
+(defcustom riece-rdcc-save-directory nil
+  "Default directory where received files are saved in."
+  :type 'directory
+  :group 'riece-rdcc)
+
 (defvar riece-rdcc-requests nil)
 
 (defvar riece-rdcc-request-user nil)
@@ -114,8 +120,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
 (defun riece-rdcc-server-sentinel (process status)
   (with-current-buffer (process-buffer process)
     (message "Sending %s...done" riece-rdcc-request-file))
-  (kill-buffer (process-buffer process))
-  (delete-process process))
+  (kill-buffer (process-buffer process)))
 
 (defun riece-command-dcc-send (user file)
   (interactive
@@ -124,8 +129,9 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
            "User: "
            (mapcar #'list (riece-get-users-on-server)))
           (expand-file-name (read-file-name "File: ")))))
-  (let ((process
-        (start-process "DCC send" " *DCC send*" "ruby" "-rsocket")))
+  (let* ((process-connection-type nil)
+        (process (start-process "DCC" (generate-new-buffer " *DCC*")
+                                "ruby" "-rsocket")))
     (process-send-string process
                         (apply #'concat
                                (riece-rdcc-substitute-variables
@@ -145,7 +151,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
                  (progn
                    (goto-char (point-min))
                    (not (looking-at "\\([0-9]+\\) \\([0-9]+\\)"))))
-       (accept-process-output))
+       (accept-process-output process))
       (if (eq (process-status process) 'run)
          (let ((address (match-string 1))
                (port (match-string 2)))
@@ -184,8 +190,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
     (let ((coding-system-for-write 'binary)
          jka-compr-compression-info-list jam-zcat-filename-list)
       (write-region (point-min) (point-max) riece-rdcc-request-file)))
-  (kill-buffer (process-buffer process))
-  (delete-process process))
+  (kill-buffer (process-buffer process)))
 
 (defun riece-rdcc-decode-address (address)
   (with-temp-buffer
@@ -225,7 +230,8 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
                     (error "Invalid number"))
                 (nth (1- number) riece-rdcc-requests))))
            (default-name (expand-file-name
-                          (nth 1 request) default-directory)))
+                          (nth 1 request) (or riece-rdcc-save-directory
+                                              default-directory))))
        (list request
             (expand-file-name
              (read-file-name
@@ -237,7 +243,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
         (coding-system-for-read 'binary)
         (coding-system-for-write 'binary)
         (process (open-network-stream
-                  "DCC receive" " *DCC receive*"
+                  "DCC" (generate-new-buffer " *DCC*")
                   (riece-rdcc-decode-address (nth 2 request))
                   (nth 3 request))))
     (setq riece-rdcc-requests (delq request riece-rdcc-requests))
@@ -265,9 +271,8 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
            (port (string-to-number (match-string 3 message)))
            (size (string-to-number (match-string 4 message)))
            (buffer (if (riece-channel-p target)
-                       (cdr (riece-identity-assoc-no-server
-                             (riece-make-identity target)
-                             riece-channel-buffer-alist))))
+                       (riece-channel-buffer-name
+                        (riece-make-identity target riece-server-name))))
            (user (riece-prefix-nickname prefix)))
        (setq riece-rdcc-requests
              (cons (list user file address port size)
@@ -284,7 +289,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
                   user
                   (riece-strip-user-at-host
                    (riece-prefix-user-at-host prefix))
-                  target))
+                  (riece-decode-coding-string target)))
          "\n")))
       t)))
 
@@ -293,6 +298,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
 
 (defvar riece-dialogue-mode-map)
 (defun riece-rdcc-insinuate ()
+  (add-to-list 'riece-ctcp-additional-clientinfo "DCC")
   (add-hook 'riece-ctcp-dcc-request-hook 'riece-handle-dcc-request)
   (define-key riece-dialogue-mode-map "\C-ds" 'riece-command-dcc-send)
   (define-key riece-dialogue-mode-map "\C-dr" 'riece-command-dcc-receive))