Fixed.

[riece] / lisp / riece-rdcc.el

diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index ae16c9d..e7f7f27 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"
@@ -54,6 +55,7 @@ unless address
 end
 server = TCPServer.new(address, 0)
 puts(\"#{server.addr[3].split(/\\./).collect{|c| c.to_i}.pack('CCCC').unpack('N')[0]} #{server.addr[1]}\")
+$stdout.flush
 session = server.accept
 if session
   total = 0
@@ -79,6 +81,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,19 +121,18 @@ 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
    (let ((completion-ignore-case t))
-     (list (completing-read
+     (list (riece-completing-read-identity
            "User: "
-           (mapcar #'list (riece-get-users-on-server)))
+           (riece-get-users-on-server (riece-current-server-name)))
           (expand-file-name (read-file-name "File: ")))))
-  (let ((process
-        (start-process "DCC" (generate-new-buffer " *DCC*")
-                       "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
@@ -146,7 +152,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)))
@@ -159,7 +165,8 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
            (set-process-sentinel process #'riece-rdcc-server-sentinel)
            (riece-send-string
             (format "PRIVMSG %s :\1DCC SEND %s %s %s %d\1\r\n"
-                    user (file-name-nondirectory file)
+                    (riece-identity-prefix user)
+                    (file-name-nondirectory file)
                     address port
                     riece-rdcc-request-size)))))))
 
@@ -185,8 +192,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
@@ -226,7 +232,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
@@ -256,6 +263,17 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
     (set-process-filter process #'riece-rdcc-filter)
     (set-process-sentinel process #'riece-rdcc-sentinel)))
 
+(defun riece-rdcc-format-size (size)
+  (if (< size 1024)
+      (format "%0.1fB" size)
+    (setq size (/ size 1024.0))
+    (if (< size 1024)
+       (format "%0.1fKB" size)
+      (setq size (/ size 1024.0))
+      (if (< size 1024)
+         (format "%0.1fMB" size)
+       (format "%0.1fGB" (/ size 1024.0))))))
+
 (defun riece-handle-dcc-request (prefix target message)
   (let ((case-fold-search t))
     (when (string-match
@@ -266,14 +284,21 @@ 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 (riece-make-identity
+                                              target riece-server-name))))
            (user (riece-prefix-nickname prefix)))
        (setq riece-rdcc-requests
              (cons (list user file address port size)
                    riece-rdcc-requests))
-       (riece-insert-change buffer (format "DCC SEND from %s\n" user))
+       (message "%s"
+                (with-current-buffer (window-buffer (selected-window))
+                  (substitute-command-keys
+                   (format
+                    "Type \\[riece-command-dcc-receive] to receive"
+                    user))))
+       (riece-insert-change buffer (format "DCC SEND from %s: %s (%s)\n"
+                                           user file
+                                           (riece-rdcc-format-size size)))
        (riece-insert-change
         (if (and riece-channel-buffer-mode
                  (not (eq buffer riece-channel-buffer)))
@@ -281,11 +306,13 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
           riece-dialogue-buffer)
         (concat
          (riece-concat-server-name
-          (format "DCC SEND from %s (%s) to %s"
+          (format "DCC SEND from %s (%s) to %s: %s (%s)"
                   user
                   (riece-strip-user-at-host
                    (riece-prefix-user-at-host prefix))
-                  target))
+                  (riece-decode-coding-string target)
+                  file
+                  (riece-rdcc-format-size size)))
          "\n")))
       t)))
 
@@ -294,6 +321,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))