* riece-300.el (riece-handle-366-message): Don't use riece-user-regexp.

[riece] / lisp / riece-rdcc.el

diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index 530f40e..4a34937 100644 (file)
--- a/lisp/riece-rdcc.el
+++ b/lisp/riece-rdcc.el
@@ -62,8 +62,11 @@ if session
   File.open(" file ") {|file|
     while (bytes = file.read(" block-size "))
       total += bytes.length
-      puts(\"#{total}\")
+      puts(total)
       session.write(bytes)
+      begin
+        buf = session.read(4)
+      end until buf.unpack('N')[0] == total
     end
   }
   session.close
@@ -86,7 +89,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
   :type 'directory
   :group 'riece-rdcc)
 
-(defcustom riece-rdcc-block-size 4096
+(defcustom riece-rdcc-block-size 1024
   "Number of bytes sent as a block."
   :type 'integer
   :group 'riece-rdcc)
@@ -172,7 +175,10 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
        (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
@@ -183,7 +189,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
            (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)))))))
 
@@ -195,13 +201,21 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
     (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))
+    (setq riece-rdcc-received-size (+ (buffer-size) riece-rdcc-received-size))
+    (process-send-string
+     process
+     (format "%c%c%c%c"
+            (lsh riece-rdcc-received-size -24)
+            (logand (lsh riece-rdcc-received-size -16) 255)
+            (logand (lsh riece-rdcc-received-size -8) 255)
+            (logand riece-rdcc-received-size 255)))
     (message "Receiving %s from %s...(%s/%s)"
             (file-name-nondirectory riece-rdcc-request-file)
             riece-rdcc-request-user
-            (riece-rdcc-format-size
-             (setq riece-rdcc-received-size (+ (buffer-size)
-                                               riece-rdcc-received-size)))
-            (riece-rdcc-format-size riece-rdcc-request-size))))
+            (riece-rdcc-format-size riece-rdcc-received-size)
+            (riece-rdcc-format-size riece-rdcc-request-size))
+    (if (= riece-rdcc-received-size riece-rdcc-request-size)
+       (set-process-filter process nil))))
 
 (defun riece-rdcc-sentinel (process status)
   (save-excursion
@@ -258,8 +272,9 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
                     (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
@@ -322,12 +337,13 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
   (let ((case-fold-search t))
     (when (and riece-rdcc-enabled
               (string-match
-               "SEND \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\)"
+               "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)))
+      (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))))