X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-rdcc.el;h=e7f7f27c2c5f6a178e0aaca1772c00176bffd2b2;hp=f1a5f9582cd7cb1f2f4194a56e73d70ae8e186dc;hb=0d63af2ef0f5c1869c2ed66edc5b40c12ee0f77b;hpb=242c14af84cfceeac158aa583c882d2f2c1359d5 diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el index f1a5f95..e7f7f27 100644 --- a/lisp/riece-rdcc.el +++ b/lisp/riece-rdcc.el @@ -23,6 +23,12 @@ ;;; 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-" @@ -41,13 +47,15 @@ Only used for sending files." (defcustom riece-rdcc-send-program '("\ -unless " address " +address = " address " +unless address sock = UDPSocket.new sock.connect('164.46.176.4', 7) # www.unixuser.org/echo - address = sock.getsockname[4 .. 8].unpack('CCCC').join('.') + 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 @@ -73,12 +81,19 @@ 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) (defvar riece-rdcc-request-file nil) (defvar riece-rdcc-request-size nil) +(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)) @@ -106,18 +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" " *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 @@ -137,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))) @@ -150,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))))))) @@ -160,7 +176,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{" (goto-char (point-max)) (insert input) (message "Receiving %s from %s...(%d/%d)" - (file-name-nondirectory buffer-file-name) + (file-name-nondirectory riece-rdcc-request-file) riece-rdcc-request-user (1- (point)) riece-rdcc-request-size))) @@ -171,10 +187,12 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{" (unless (= (buffer-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)))) + (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))) (defun riece-rdcc-decode-address (address) (with-temp-buffer @@ -191,48 +209,71 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{" (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* ((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* (selective-display (coding-system-for-read 'binary) (coding-system-for-write 'binary) (process (open-network-stream - "DCC" " *DCC*" + "DCC" (generate-new-buffer " *DCC*") (riece-rdcc-decode-address (nth 2 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))) (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 @@ -243,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))) @@ -258,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))) @@ -271,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))