X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-rdcc.el;h=188fb76f6a505211aa183172f98e1f58e8888a14;hb=011eac3de2afcb8c465f54dc385ed253aba67f7d;hp=e1ed72cfa84810ec96fe6b57d005d85ec7299721;hpb=d3e5f6ce6488690c232e5d2e8208517b251c6f4b;p=riece

diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index e1ed72c..188fb76 100644
--- a/lisp/riece-rdcc.el
+++ b/lisp/riece-rdcc.el
@@ -23,15 +23,72 @@
 
 ;;; Code:
 
+(require 'riece-globals)
+(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"
   :prefix "riece-"
   :group 'riece)
 
-(defcustom riece-rdcc-server-address "127.0.0.1"
+(defcustom riece-rdcc-server-address nil
   "Local address of the DCC server.
 Only used for sending files."
-  :type 'vector
+  :type 'string
+  :group 'riece-rdcc)
+
+(defcustom riece-rdcc-ruby-command "ruby"
+  "Command name for Ruby interpreter."
+  :type 'string
+  :group 'riece-rdcc)
+
+(defcustom riece-rdcc-send-program
+  '("\
+address = " address "
+unless address
+  sock = UDPSocket.new
+  sock.connect('164.46.176.4', 7)		# www.unixuser.org/echo
+  address = sock.getsockname[4 .. 7].unpack('CCCC').join('.')
+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(" block-size "))
+      total += bytes.length
+      puts(\"#{total}\")
+      session.write(bytes)
+    end
+  }
+  session.close
+end
+")
+  "Ruby program to send file with DCC."
+  :type 'list
+  :group 'riece-rdcc)
+
+(defcustom riece-rdcc-decode-address-program
+  '("\
+puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
+    address " >> 8 & 0xFF}.#{" address " & 0xFF}\")")
+  "Ruby program to numeric IP address."
+  :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)
@@ -40,6 +97,21 @@ Only used for sending files."
 (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)
+  (setq program (copy-sequence program))
+  (let ((pointer program))
+    (while pointer
+      (setq pointer (memq variable program))
+      (if pointer
+	  (setcar pointer value)))
+    program))
+
 (defun riece-rdcc-server-filter (process input)
   (save-excursion
     (set-buffer (process-buffer process))
@@ -56,35 +128,35 @@ Only used for sending files."
       (delete-region (point-min) (point)))))
 
 (defun riece-rdcc-server-sentinel (process status)
-  (kill-buffer (process-buffer process))
-  (delete-process process))
+  (with-current-buffer (process-buffer process)
+    (message "Sending %s...done" riece-rdcc-request-file))
+  (kill-buffer (process-buffer process)))
 
 (defun riece-command-dcc-send (user file)
   (interactive
    (let ((completion-ignore-case t))
-     (unless riece-rdcc-server-address
-       (error "Set riece-rdcc-server-address to your host"))
-     (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" " *DCC*" "ruby" "-rsocket")))
-    (process-send-string process (concat "\
-server = TCPServer.new('" riece-rdcc-server-address "', 0)
-puts(\"#{server.addr[3].split(/\\./).collect{|c| c.to_i}.pack('cccc').unpack('N')[0]} #{server.addr[1]}\")
-session = server.accept
-if session
-  total = 0
-  File.open('" file "') {|file|
-    bytes = file.read(1024)
-    total += bytes.length
-    puts(\"#{total}\")
-    session.write(bytes)
-  }
-  session.close
-end
-"))
+  (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
+				 (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 "'"))
+				 'block-size
+				 (number-to-string riece-rdcc-block-size))))
     (process-send-eof process)
     (save-excursion
       (set-buffer (process-buffer process))
@@ -92,7 +164,7 @@ end
 		  (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)))
@@ -105,36 +177,52 @@ end
 	    (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)"
-	     (file-name-nondirectory buffer-file-name)
+    (let ((coding-system-for-write 'binary)
+	  jka-compr-compression-info-list jam-zcat-filename-list)
+      (write-region (point-min) (point-max) riece-rdcc-temp-file t 0))
+    (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 buffer-file-name)
+	     (file-name-nondirectory riece-rdcc-request-file)
 	     riece-rdcc-request-user)
-    (let ((coding-system-for-write 'binary))
-      (save-buffer))))
+    (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)
   (with-temp-buffer
-    (call-process "ruby" nil t nil "-e" (concat "\
-puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{" address " >> 8 & 0xFF}.#{" address " & 0xFF}\")"))
+    (call-process riece-rdcc-ruby-command nil t nil "-e"
+		  (apply #'concat
+			 (riece-rdcc-substitute-variables
+			  riece-rdcc-decode-address-program
+			  'address
+			  address)))
     (buffer-substring (point-min) (1- (point-max)))))
 
 (defun riece-command-dcc-receive (request file)
@@ -142,48 +230,89 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{" address " >>
    (progn
      (unless riece-rdcc-requests
        (error "No request"))
-     (list
-      (if (= (length riece-rdcc-requests) 1)
-	  (car riece-rdcc-requests)
-	(with-output-to-temp-buffer "*Help*"
-	  (let ((requests riece-rdcc-requests)
-		(index 1))
-	    (while requests
-	      (princ (format "%2d: %s %s (%d bytes)\n"
-			     index
-			     (car (car requests))
-			     (nth 1 (car requests))
-			     (nth 4 (car requests))))
-	      (setq index (1+ index)
-		    requests (cdr requests)))))
-	(let ((number (read-string "Request#: ")))
-	  (unless (string-match "^[0-9]+$" number)
-	    (error "Not a number"))
-	  (if (or (> (setq number (string-to-number number))
-		     (length riece-rdcc-requests))
-		  (< number 1))
-	      (error "Invalid number"))
-	  (nth (1- number) riece-rdcc-requests)))
-      (expand-file-name (read-file-name "Save as: ")))))
-  (let* (selective-display
+     (let* ((request
+	     (if (= (length riece-rdcc-requests) 1)
+		 (car riece-rdcc-requests)
+	       (with-output-to-temp-buffer "*Help*"
+		 (let ((requests riece-rdcc-requests)
+		       (index 1))
+		   (while requests
+		     (princ (format "%2d: %s %s (%d bytes)\n"
+				    index
+				    (car (car requests))
+				    (nth 1 (car requests))
+				    (nth 4 (car requests))))
+		     (setq index (1+ index)
+			   requests (cdr requests)))))
+	       (let ((number (read-string "Request#: ")))
+		 (unless (string-match "^[0-9]+$" number)
+		   (error "Not a number"))
+		 (if (or (> (setq number (string-to-number number))
+			    (length riece-rdcc-requests))
+			 (< number 1))
+		     (error "Invalid number"))
+		 (nth (1- number) riece-rdcc-requests))))
+	    (default-name (expand-file-name
+			   (nth 1 request) (or riece-rdcc-save-directory
+					       default-directory))))
+       (list request
+	     (expand-file-name
+	      (read-file-name
+	       (concat "Save as (default "
+		       (file-name-nondirectory default-name) ") ")
+	       (file-name-directory default-name)
+	       default-name))))))
+  (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
-		   "DCC" " *DCC*"
+	 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)
-      (set-buffer-multibyte nil)
+      (if (fboundp 'set-buffer-multibyte)
+	  (set-buffer-multibyte nil))
       (buffer-disable-undo)
-      (setq buffer-file-name file)
+      (erase-buffer)
       (make-local-variable 'riece-rdcc-request-user)
       (setq riece-rdcc-request-user (car request))
+      (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
@@ -194,14 +323,21 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{" address " >>
 	    (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)))
@@ -209,11 +345,13 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{" address " >>
 	   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)))
 
@@ -222,6 +360,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{" address " >>
 
 (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))