* riece-message.el (riece-display-message-1): Call

[riece] / lisp / riece-log.el

diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index 66aa3bd..352fa03 100644 (file)
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -30,8 +30,8 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-message)
-                  (require 'riece-button))
+(require 'riece-message)
+(require 'riece-button)
 
 (defgroup riece-log nil
   "Save irc log"
@@ -61,27 +61,25 @@ If integer, flash back only this line numbers. t means all lines."
   :type 'symbol
   :group 'riece-log)
 
-(defcustom riece-log-file-name-coding-system file-name-coding-system
-  "*Coding system used to convert pathnames of log files."
-  :type 'symbol
+(defcustom riece-log-open-directory-function 'find-file
+  "*Function for opening a directory."
+  :type 'function
   :group 'riece-log)
 
+(defvar riece-log-enabled nil)
+
+(defconst riece-log-description
+  "Saving IRC logs")
+
 (defun riece-log-display-message-function (message)
-  (let ((open-bracket
-        (funcall riece-message-make-open-bracket-function message))
-       (close-bracket
-        (funcall riece-message-make-close-bracket-function message))
-       (name
-        (funcall riece-message-make-name-function message))
-       (file (riece-log-get-file (riece-message-target message)))
-       (coding-system-for-write riece-log-coding-system)
-       (file-name-coding-system riece-log-file-name-coding-system))
-    (unless (file-directory-p (file-name-directory file))
-      (make-directory (file-name-directory file) t))
-    (write-region (concat (format-time-string "%H:%M") " "
-                         open-bracket name close-bracket
-                         " " (riece-message-text message) "\n")
-                 nil file t 0)))
+  (if riece-log-enabled
+      (let ((file (riece-log-get-file (riece-message-target message)))
+           (coding-system-for-write riece-log-coding-system))
+       (unless (file-directory-p (file-name-directory file))
+         (make-directory (file-name-directory file) t))
+       (write-region (concat (format-time-string "%H:%M") " "
+                             (riece-format-message message))
+                     nil file t 0))))
 
 (defun riece-log-get-file (identity)
   (expand-file-name
@@ -89,12 +87,13 @@ If integer, flash back only this line numbers. t means all lines."
    (riece-log-get-directory identity)))
 
 (defun riece-log-get-directory (identity)
-  (let ((channel (riece-identity-prefix 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-channel-regexp channel)
+         ((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)
@@ -107,8 +106,7 @@ If integer, flash back only this line numbers. t means all lines."
 
 (defun riece-log-flashback (identity)
   (when riece-log-flashback
-    (let ((file (riece-log-get-file identity))
-         (file-name-coding-system riece-log-file-name-coding-system))
+    (let ((file (riece-log-get-file identity)))
       (when (file-exists-p file)
        (let (string)
          (with-temp-buffer
@@ -129,17 +127,20 @@ If integer, flash back only this line numbers. t means all lines."
                                 (riece-make-identity
                                  (riece-match-string-no-properties 1)
                                  (riece-identity-server identity))))
-           (if (memq 'riece-button riece-addons)
-               (riece-button-update-buffer))
+           (when (and (memq 'riece-button riece-addons)
+                      riece-button-enabled)
+             (riece-button-update-buffer))
            (goto-char (point-max))
            (set-window-point (get-buffer-window (current-buffer))
                              (point))))))))
 
 (defun riece-log-open-directory (&optional channel)
   (interactive)
-  (if channel
-      (find-file (riece-log-get-directory channel))
-    (find-file riece-log-directory)))
+  (let ((directory (riece-log-get-directory
+                   (or channel riece-current-channel))))
+    (if (file-directory-p directory)
+       (funcall riece-log-open-directory-function directory)
+      (error "No log directory"))))
 
 (defun riece-log-requires ()
   (if (memq 'riece-button riece-addons)
@@ -153,6 +154,15 @@ If integer, flash back only this line numbers. t means all lines."
   (add-hook 'riece-channel-buffer-create-functions
            'riece-log-flashback))
 
+(defvar riece-command-mode-map)
+(defun riece-log-enable ()
+  (define-key riece-command-mode-map "\C-cd" 'riece-log-open-directory)
+  (setq riece-log-enabled t))
+
+(defun riece-log-disable ()
+  (define-key riece-command-mode-map "\C-cd" nil)
+  (setq riece-log-enabled nil))
+
 (provide 'riece-log)
 
 ;;; riece-log.el ends here