X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-rdcc.el;h=8ee61bf5e31a6ad5ddceead2cd6232c16a3b37ef;hb=d1afcdd626fefdf537d742e2598cdcb9ffa039ef;hp=43852ff0906db007c342e50acc7f8fbb1f44141c;hpb=af312f9753f22b192642e755e2ae2522a246492a;p=riece

diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index 43852ff..8ee61bf 100644
--- a/lisp/riece-rdcc.el
+++ b/lisp/riece-rdcc.el
@@ -55,11 +55,12 @@ 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
   File.open(" file ") {|file|
-    while (bytes = file.read(4096))
+    while (bytes = file.read(" block-size "))
       total += bytes.length
       puts(\"#{total}\")
       session.write(bytes)
@@ -80,12 +81,26 @@ 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)
+
+(defcustom riece-rdcc-block-size 4096
+  "Number of bytes sent as a block."
+  :type 'integer
+  :group 'riece-rdcc)
+
 (defvar riece-rdcc-requests nil)
 
 (defvar riece-rdcc-request-user nil)
 (defvar riece-rdcc-request-file nil)
 (defvar riece-rdcc-request-size nil)
 
+(defvar riece-rdcc-temp-file nil)
+(defvar riece-rdcc-received-size nil)
+
+(defvar temporary-file-directory)
 (defvar jka-compr-compression-info-list)
 (defvar jam-zcat-filename-list)
 (defun riece-rdcc-substitute-variables (program variable value)
@@ -120,9 +135,9 @@ 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-connection-type nil)
 	 (process (start-process "DCC" (generate-new-buffer " *DCC*")
@@ -131,14 +146,17 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
 			 (apply #'concat
 				(riece-rdcc-substitute-variables
 				 (riece-rdcc-substitute-variables
-				  riece-rdcc-send-program
-				  'address
-				  (if riece-rdcc-server-address
-				      (concat "'" riece-rdcc-server-address
-					      "'")
-				    "nil"))
-				 'file
-				 (concat "'" file "'"))))
+				  (riece-rdcc-substitute-variables
+				   riece-rdcc-send-program
+				   'address
+				   (if riece-rdcc-server-address
+				       (concat "'" riece-rdcc-server-address
+					       "'")
+				     "nil"))
+				  'file
+				  (concat "'" file "'"))
+				 'block-size
+				 (number-of-string riece-rdcc-block-size))))
     (process-send-eof process)
     (save-excursion
       (set-buffer (process-buffer process))
@@ -159,32 +177,42 @@ 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)))))))
 
 (defun riece-rdcc-filter (process input)
   (save-excursion
     (set-buffer (process-buffer process))
-    (goto-char (point-max))
+    (erase-buffer)
     (insert input)
-    (message "Receiving %s from %s...(%d/%d)"
+    (let ((coding-system-for-write 'binary)
+	  jka-compr-compression-info-list jam-zcat-filename-list)
+      (append-to-file (point-min) (point-max) riece-rdcc-temp-file))
+    (message "Receiving %s from %s...(%s/%s)"
 	     (file-name-nondirectory riece-rdcc-request-file)
 	     riece-rdcc-request-user
-	     (1- (point))
-	     riece-rdcc-request-size)))
+	     (riece-rdcc-format-size
+	      (setq riece-rdcc-received-size (+ (buffer-size)
+						riece-rdcc-received-size)))
+	     (riece-rdcc-format-size riece-rdcc-request-size))))
 
 (defun riece-rdcc-sentinel (process status)
   (save-excursion
     (set-buffer (process-buffer process))
-    (unless (= (buffer-size) riece-rdcc-request-size)
+    (unless (= riece-rdcc-received-size riece-rdcc-request-size)
       (error "Premature end of file"))
     (message "Receiving %s from %s...done"
 	     (file-name-nondirectory riece-rdcc-request-file)
 	     riece-rdcc-request-user)
-    (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)))
+    (condition-case nil
+	(progn
+	  (rename-file riece-rdcc-temp-file riece-rdcc-request-file)
+	  (delete-directory (file-name-directory riece-rdcc-temp-file)))
+      (file-already-exists
+       (error "Can't save %s.  Temporarily saved in %s"
+	      riece-rdcc-request-file riece-rdcc-temp-file))))
   (kill-buffer (process-buffer process)))
 
 (defun riece-rdcc-decode-address (address)
@@ -225,7 +253,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
@@ -233,13 +262,27 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
 		       (file-name-nondirectory default-name) ") ")
 	       (file-name-directory default-name)
 	       default-name))))))
-  (let* (selective-display
+  (let* ((temp-file (expand-file-name
+		     (file-name-nondirectory file)
+		     (expand-file-name (make-temp-name "riece-rdcc")
+				       (if (featurep 'xemacs)
+					   (temp-directory)
+					 temporary-file-directory))))
+	 (orig-mode (default-file-modes))
+	 selective-display
 	 (coding-system-for-read 'binary)
 	 (coding-system-for-write 'binary)
-	 (process (open-network-stream
+	 process)
+    (unwind-protect
+	(progn
+	  (set-default-file-modes 448)
+	  ;; This may throw an error.
+	  (make-directory (file-name-directory temp-file)))
+      (set-default-file-modes orig-mode))
+    (setq process (open-network-stream
 		   "DCC" (generate-new-buffer " *DCC*")
 		   (riece-rdcc-decode-address (nth 2 request))
-		   (nth 3 request))))
+		   (nth 3 request)))
     (setq riece-rdcc-requests (delq request riece-rdcc-requests))
     (with-current-buffer (process-buffer process)
       (if (fboundp 'set-buffer-multibyte)
@@ -251,10 +294,25 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
       (make-local-variable 'riece-rdcc-request-file)
       (setq riece-rdcc-request-file file)
       (make-local-variable 'riece-rdcc-request-size)
-      (setq riece-rdcc-request-size (nth 4 request)))
+      (setq riece-rdcc-request-size (nth 4 request))
+      (make-local-variable 'riece-rdcc-temp-file)
+      (setq riece-rdcc-temp-file temp-file)
+      (make-local-variable 'riece-rdcc-received-size)
+      (setq riece-rdcc-received-size 0))
     (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.1f" 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
@@ -265,13 +323,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)
-			(riece-channel-buffer-name
-			 (riece-make-identity target riece-server-name))))
+			(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)))
@@ -279,11 +345,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))
-		   (riece-decode-coding-string target)))
+		   (riece-decode-coding-string target)
+		   file
+		   (riece-rdcc-format-size size)))
 	  "\n")))
       t)))