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)
: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 riece-rdcc-enabled nil)
+
+(defconst riece-rdcc-description
+ "DCC file sending extension implemented in Ruby")
+
+(defvar temporary-file-directory)
(defvar jka-compr-compression-info-list)
(defvar jam-zcat-filename-list)
(defun riece-rdcc-substitute-variables (program variable value)
(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-to-string riece-rdcc-block-size))))
(process-send-eof process)
(save-excursion
(set-buffer (process-buffer process))
(accept-process-output process))
(if (eq (process-status process) 'run)
(let ((address (match-string 1))
- (port (match-string 2)))
+ (port (match-string 2))
+ (filename (file-name-nondirectory file)))
+ (while (string-match "[ \t]+" filename)
+ (setq filename (replace-match "_" nil nil filename)))
(erase-buffer)
(make-local-variable 'riece-rdcc-request-size)
(setq riece-rdcc-request-file file
(riece-send-string
(format "PRIVMSG %s :\1DCC SEND %s %s %s %d\1\r\n"
(riece-identity-prefix user)
- (file-name-nondirectory file)
+ filename
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)
+ (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 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)
(error "Invalid number"))
(nth (1- number) riece-rdcc-requests))))
(default-name (expand-file-name
- (nth 1 request) (or riece-rdcc-save-directory
- default-directory))))
+ (convert-standard-filename (nth 1 request))
+ (or riece-rdcc-save-directory
+ default-directory))))
(list request
(expand-file-name
(read-file-name
(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)
(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
- "SEND \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\)"
- message)
- (let ((file (match-string 1 message))
- (address (match-string 2 message))
- (port (string-to-number (match-string 3 message)))
- (size (string-to-number (match-string 4 message)))
+ (when (and riece-rdcc-enabled
+ (string-match
+ "SEND \\(\\([^ ]+\\)\\|\"\\(.+\\)\"\\) \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\)"
+ message))
+ (let ((file (or (match-string 2 message)
+ (match-string 3 message)))
+ (address (match-string 4 message))
+ (port (string-to-number (match-string 5 message)))
+ (size (string-to-number (match-string 6 message)))
(buffer (if (riece-channel-p target)
(riece-channel-buffer (riece-make-identity
target riece-server-name))))
(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)))
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)))
(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)
+ (add-hook 'riece-ctcp-dcc-request-hook 'riece-handle-dcc-request))
+
+(defun riece-rdcc-enable ()
(define-key riece-dialogue-mode-map "\C-ds" 'riece-command-dcc-send)
- (define-key riece-dialogue-mode-map "\C-dr" 'riece-command-dcc-receive))
+ (define-key riece-dialogue-mode-map "\C-dr" 'riece-command-dcc-receive)
+ (setq riece-rdcc-enabled t))
+
+(defun riece-rdcc-disable ()
+ (define-key riece-dialogue-mode-map "\C-ds" nil)
+ (define-key riece-dialogue-mode-map "\C-dr" nil)
+ (setq riece-rdcc-enabled nil))
(provide 'riece-rdcc)
projects / riece / blobdiff