X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-rdcc.el;h=ee971973a1b9a1f8a143c54e748501b057b62f52;hp=5b4e891e522079b00eac99140b28db1f6509d97d;hb=7575020242faeadf40b21a0a9c7a3b7f7652fe63;hpb=a0a7f54b2c805f1c2cf3063e4bcd26be621d0439

diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index 5b4e891..ee97197 100644
--- a/lisp/riece-rdcc.el
+++ b/lisp/riece-rdcc.el
@@ -55,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
@@ -80,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)
@@ -120,13 +126,13 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
 (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)))))))
 
@@ -225,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
@@ -265,9 +273,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
-			      (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)
@@ -284,7 +291,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)))