Update credits.

[riece] / lisp / riece-log.el

diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index 738b2a5..ffa20ce 100644 (file)
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -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.
@@ -90,36 +92,20 @@ 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)))
-       (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-get-directory-1 (identity)
   (let ((prefix (riece-identity-canonicalize-prefix
                 (riece-identity-prefix identity)))
        (server (riece-identity-server identity))
@@ -179,7 +165,7 @@ If LINES is t, insert today's logs entirely."
       (while (and (< lines 0) files)
        (if (and (file-exists-p (car files))
                 (string-match (concat "\\([0-9][0-9][0-9][0-9]\\)"
-                                      "\\([0-9][0-9]\\)\\([0-9][0-9]\\).log$")
+                                      "\\([0-9][0-9]\\)\\([0-9][0-9]\\).txt$")
                               (car files)))
            (save-restriction
              (narrow-to-region (point) (point))