Update credits.
[riece] / lisp / riece-log.el
index 559efe2..ffa20ce 100644 (file)
@@ -1,7 +1,9 @@
 ;;; riece-log.el --- saving irc logs add-on
 ;; Copyright (C) 2003 OHASHI Akira
+;; Copyright (C) 2004 Daiki Ueno
 
 ;; Author: OHASHI Akira <bg66@koka-in.org>
+;;     Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: IRC, riece
 
 ;; This file is part of Riece.
@@ -61,6 +63,13 @@ If integer, flash back only this line numbers. t means all lines."
   :type 'symbol
   :group 'riece-log)
 
+(defcustom riece-log-file-name-coding-system
+  (if (boundp 'file-name-coding-system)
+      file-name-coding-system)
+  "*Coding system used for filenames of log files."
+  :type 'symbol
+  :group 'riece-log)
+
 (defcustom riece-log-open-directory-function 'find-file
   "*Function for opening a directory."
   :type 'function
@@ -83,77 +92,103 @@ If integer, flash back only this line numbers. t means all lines."
 
 (defun riece-log-get-file (identity)
   (expand-file-name
-   (concat (format-time-string "%Y%m%d") ".log")
+   (concat (format-time-string "%Y%m%d") ".txt")
    (riece-log-get-directory identity)))
 
 (defun riece-log-get-files (identity)
-  (let ((files (directory-files (riece-log-get-directory identity) t
-                               (concat "^"
-                                       (riece-make-interval-regexp "[0-9]" 8)
-                                       "\\.log$")
-                               t)))
-    (nreverse (sort files #'string-lessp))))
+  (let ((directory (riece-log-get-directory identity)))
+    (if (file-directory-p directory)
+       (nreverse (sort (directory-files directory t
+                        (concat "^"
+                                (riece-make-interval-regexp "[0-9]" 8)
+                                "\\.txt$")
+                        t)
+                 #'string-lessp)))))
 
 (defun riece-log-get-directory (identity)
-  (let ((channel (riece-identity-canonicalize-prefix
-                 (riece-identity-prefix identity)))
+  (let ((prefix (riece-identity-canonicalize-prefix
+                (riece-identity-prefix identity)))
        (server (riece-identity-server identity))
        (map (assoc (riece-format-identity identity) riece-log-directory-map))
        name)
-    (cond (map (setq name (cdr map)))
-         ((string-match riece-strict-channel-regexp channel)
-          (let ((suffix (match-string 2 channel)))
-            (setq name (substring channel (match-end 1) (match-beginning 2)))
-            (when (and (stringp suffix)
-                       (string-match "^:\\*\\.\\(.*\\)" suffix))
-              (setq name (concat name "-" (match-string 1 suffix))))))
-         (t (setq name "priv")))
-    (if server
-       (expand-file-name name (expand-file-name server riece-log-directory))
-      (expand-file-name name riece-log-directory))))
-
-(defun riece-log-flashback-1 (identity)
-  (if (eq riece-log-flashback t)
+    (if map
+       (setq name (cdr map))
+      (expand-file-name (riece-log-encode-file-name prefix)
+                       (expand-file-name
+                        (concat "." (riece-log-encode-file-name server))
+                        riece-log-directory)))))
+
+(defun riece-log-encode-file-name (file-name)
+  (if riece-log-file-name-coding-system
+      (setq file-name
+           (encode-coding-string file-name
+                                 riece-log-file-name-coding-system)))
+  (let ((index 0)
+       c)
+    (while (string-match "[^-0-9A-Za-z_\x80-\xFF]" file-name index)
+      (setq c (aref file-name (match-beginning 0)))
+      (if (eq c ?=)
+         (setq file-name (replace-match "==" nil t file-name)
+               index (1+ (match-end 0)))
+       (setq file-name (replace-match (format "=%02X" c) nil t file-name)
+             index (+ 2 (match-end 0)))))
+    file-name))
+
+(defun riece-log-decode-file-name (file-name)
+  (let ((index 0))
+    (while (string-match "==\\|=\\([0-7][0-9A-F]\\)" file-name index)
+      (setq file-name (replace-match
+                      (if (eq (aref file-name (1- (match-end 0))) ?=)
+                          "="
+                        (char-to-string
+                         (car (read-from-string
+                               (concat "?\\x" (match-string 1 file-name))))))
+                      nil t file-name)
+           index (1+ (match-beginning 0))))
+    file-name)
+  (if riece-log-file-name-coding-system
+      (setq file-name
+           (decode-coding-string file-name
+                                 riece-log-file-name-coding-system)))
+  file-name)
+
+(defun riece-log-insert (identity lines)
+  "Insert logs for IDENTITY at most LINES.
+If LINES is t, insert today's logs entirely."
+  (if (eq lines t)
       (let ((file (riece-log-get-file identity)))
        (if (file-exists-p file)
            (insert-file-contents file)))
     (let ((files (riece-log-get-files identity))
-         (lines (- riece-log-flashback))
+         (lines (- lines))
          date point)
       (while (and (< lines 0) files)
        (if (and (file-exists-p (car files))
-                (string-match (concat "\\("
-                                      (riece-make-interval-regexp "[0-9]" 4)
-                                      "\\)\\("
-                                      (riece-make-interval-regexp "[0-9]" 2)
-                                      "\\)\\("
-                                      (riece-make-interval-regexp "[0-9]" 2)
-                                      "\\).log$")
+                (string-match (concat "\\([0-9][0-9][0-9][0-9]\\)"
+                                      "\\([0-9][0-9]\\)\\([0-9][0-9]\\).txt$")
                               (car files)))
            (save-restriction
-             (narrow-to-region (point-min) (point-min))
+             (narrow-to-region (point) (point))
              (setq date (concat " (" (match-string 1 (car files)) "/"
                                 (match-string 2 (car files)) "/"
                                 (match-string 3 (car files)) ")"))
              (insert-file-contents (car files))
              (goto-char (point-max))
-             (setq lines (forward-line lines)
-                   point (point))
+             (setq lines (forward-line lines))
+             (delete-region (point-min) (point))
              (while (not (eobp))
                (end-of-line)
                (insert date)
                (forward-line))
-             (goto-char point)))
-       (setq files (cdr files)))
-      (if (zerop lines)
-         (delete-region (point-min) (point))))))
+             (goto-char (point-min))))
+       (setq files (cdr files))))))
 
 (defun riece-log-flashback (identity)
   (when riece-log-flashback
     (let (buffer-read-only
          (point (goto-char (point-max))))
       (insert (with-temp-buffer
-               (riece-log-flashback-1 identity)
+               (riece-log-insert identity riece-log-flashback)
                (buffer-string)))
       (goto-char point)
       (while (re-search-forward