Fixed error message.

[riece] / lisp / riece-addon.el

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index 3cfda07..089cdf1 100644 (file)
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -28,18 +28,19 @@
 (require 'riece-options)
 (require 'riece-compat)
 (require 'riece-misc)
 (require 'riece-options)
 (require 'riece-compat)
 (require 'riece-misc)

+(require 'riece-addon-modules)

 
 (defgroup riece-addon-list nil
 
 (defgroup riece-addon-list nil

-  "Add-on management"
-  :tag "Addon"
-  :prefix "riece-"
+  "Add-on listing."
+  :tag "Addon list"
+  :prefix "riece-addon-list-"

   :group 'riece)
 
 (defgroup riece-addon-list-faces nil
   :group 'riece)
 
 (defgroup riece-addon-list-faces nil

-  "Faces for riece-addon-list-mode"
+  "Faces for riece-addon-list-mode."

   :tag "Faces"
   :tag "Faces"

-  :prefix "riece-addon-list"
-  :group 'riece-addon)
+  :prefix "riece-addon-list-"
+  :group 'riece-addon-list)

 
 (defface riece-addon-list-enabled-face
   '((((class color) (background dark))
 
 (defface riece-addon-list-enabled-face
   '((((class color) (background dark))


@@ -54,7 +55,7 @@
   '((((class color) (background dark))
      (:foreground "PaleTurquoise" :italic t))
     (t
   '((((class color) (background dark))
      (:foreground "PaleTurquoise" :italic t))
     (t

-     (:italic t)))
+     ()))

   "Face used for displaying the disabled addon."
   :group 'riece-addon-list-faces)
 (defvar riece-addon-list-disabled-face 'riece-addon-list-disabled-face)
   "Face used for displaying the disabled addon."
   :group 'riece-addon-list-faces)
 (defvar riece-addon-list-disabled-face 'riece-addon-list-disabled-face)


@@ -68,12 +69,12 @@
   :group 'riece-addon-list-faces)
 (defvar riece-addon-list-unsupported-face 'riece-addon-list-unsupported-face)
 
   :group 'riece-addon-list-faces)
 (defvar riece-addon-list-unsupported-face 'riece-addon-list-unsupported-face)
 

-(defface riece-addon-list-unknown-face
+(defface riece-addon-list-uninstalled-face

   '((t
   '((t

-     (:foreground "red")))
-  "Face used for displaying the unknown addon."
+     (:italic t)))
+  "Face used for displaying the uninstalled addon."

   :group 'riece-addon-list-faces)
   :group 'riece-addon-list-faces)

-(defvar riece-addon-list-unknown-face 'riece-addon-list-unknown-face)
+(defvar riece-addon-list-uninstalled-face 'riece-addon-list-uninstalled-face)

 
 (defface riece-addon-list-description-face
   '((((class color)
 
 (defface riece-addon-list-description-face
   '((((class color)


@@ -92,13 +93,13 @@
   '((?+ . riece-addon-list-enabled-face)
     (?- . riece-addon-list-disabled-face)
     (?! . riece-addon-list-unsupported-face)
   '((?+ . riece-addon-list-enabled-face)
     (?- . riece-addon-list-disabled-face)
     (?! . riece-addon-list-unsupported-face)

-    (?? . riece-addon-list-unknown-face))
+    (?  . riece-addon-list-uninstalled-face))

   "An alist mapping marks on riece-addon-list-buffer to faces."
   :type 'list
   :group 'riece-addon-list)
 
 (defcustom riece-addon-list-font-lock-keywords
   "An alist mapping marks on riece-addon-list-buffer to faces."
   :type 'list
   :group 'riece-addon-list)
 
 (defcustom riece-addon-list-font-lock-keywords

-  '(("^\\([-+!?] [^:]+\\): \\(.*\\)"
+  '(("^\\([-+! ] [^:]+\\): \\(.*\\)"

      (1 (cdr (assq (aref (match-string 1) 0)
                   riece-addon-list-mark-face-alist)))
      (2 riece-addon-list-description-face)))
      (1 (cdr (assq (aref (match-string 1) 0)
                   riece-addon-list-mark-face-alist)))
      (2 riece-addon-list-description-face)))


@@ -110,6 +111,8 @@
   (let ((keymap (make-sparse-keymap)))
     (define-key keymap "+" 'riece-command-enable-addon)
     (define-key keymap "-" 'riece-command-disable-addon)
   (let ((keymap (make-sparse-keymap)))
     (define-key keymap "+" 'riece-command-enable-addon)
     (define-key keymap "-" 'riece-command-disable-addon)

+    (define-key keymap "I" 'riece-command-insinuate-addon)
+    (define-key keymap "D" 'riece-command-uninstall-addon)

     (define-key keymap "n" 'next-line)
     (define-key keymap "p" 'previous-line)
     (define-key keymap " " 'scroll-up)
     (define-key keymap "n" 'next-line)
     (define-key keymap "p" 'previous-line)
     (define-key keymap " " 'scroll-up)


@@ -136,76 +139,119 @@
        ;; Merge pred's succs.
        (while pointer
          (if (setq entry (assq (car pointer) dependencies))
        ;; Merge pred's succs.
        (while pointer
          (if (setq entry (assq (car pointer) dependencies))

-             (setcdr (cdr entry)
-                     (cons (car addons) (nthcdr 2 entry)))
+             (setcdr (cdr entry) (cons (car addons) (nthcdr 2 entry)))

            (setq dependencies (cons (list (car pointer) 0 (car addons))
                                     dependencies)))
          (setq pointer (cdr pointer))))
       (setq addons (cdr addons)))
     dependencies))
 
            (setq dependencies (cons (list (car pointer) 0 (car addons))
                                     dependencies)))
          (setq pointer (cdr pointer))))
       (setq addons (cdr addons)))
     dependencies))
 

-(defun riece-resolve-addon-dependencies (addons)
-  (let ((pointer addons)
-       dependencies queue)
-    ;; Uniquify, first.
-    (while pointer
-      (if (memq (car pointer) (cdr pointer))
-         (setcar pointer nil))
-      (setq pointer (cdr pointer)))
-    (setq dependencies (riece-load-and-build-addon-dependencies
-                       (delq nil addons))
-         pointer dependencies)
-    ;; Sort them.
+(defun riece-sort-addon-dependencies (dependencies)
+  (let ((pointer dependencies)
+       addons queue)

     (while pointer
       (if (zerop (nth 1 (car pointer)))
          (setq dependencies (delq (car pointer) dependencies)
                queue (cons (car pointer) queue)))
       (setq pointer (cdr pointer)))
     (while pointer
       (if (zerop (nth 1 (car pointer)))
          (setq dependencies (delq (car pointer) dependencies)
                queue (cons (car pointer) queue)))
       (setq pointer (cdr pointer)))

-    (setq addons nil)

     (while queue
     (while queue

-      (setq addons (cons (car (car queue)) addons)
+      (setq addons (cons (cons (car (car queue)) (nthcdr 2 (car queue)))
+                        addons)

            pointer (nthcdr 2 (car queue)))
       (while pointer
        (let* ((entry (assq (car pointer) dependencies))
               (count (1- (nth 1 entry))))
          (if (zerop count)
            pointer (nthcdr 2 (car queue)))
       (while pointer
        (let* ((entry (assq (car pointer) dependencies))
               (count (1- (nth 1 entry))))
          (if (zerop count)

-             (progn
-               (setq dependencies (delq entry dependencies)
-                     queue (nconc queue (list entry))))
+             (setq dependencies (delq entry dependencies)
+                   queue (nconc queue (list entry)))

            (setcar (cdr entry) count)))
        (setq pointer (cdr pointer)))
       (setq queue (cdr queue)))
     (if dependencies
            (setcar (cdr entry) count)))
        (setq pointer (cdr pointer)))
       (setq queue (cdr queue)))
     (if dependencies

-       (error "Circular add-on dependency found"))
+       (error "Circular add-on dependency found: %S" dependencies))

     (nreverse addons)))
 
 (defun riece-resolve-addons (addons)
     (nreverse addons)))
 
 (defun riece-resolve-addons (addons)

-  (riece-resolve-addon-dependencies
-   (append addons
-          (mapcar
-           (lambda (name)
-             (intern (file-name-sans-extension name)))
-           (directory-files riece-addon-directory nil "\\`[^.]" t)))))
+  ;; Add files in riece-addon-directory to addons.
+  (if (file-directory-p riece-addon-directory)
+      (setq addons (nconc
+                   addons
+                   (mapcar
+                    (lambda (name)
+                      (unless (file-directory-p
+                               (expand-file-name name riece-addon-directory))
+                        (intern (file-name-sans-extension name))))
+                    (directory-files riece-addon-directory nil "\\`[^.]")))))
+  ;; Sort & uniquify.
+  (setq addons (sort addons (lambda (symbol1 symbol2)
+                             (string-lessp (symbol-name symbol1)
+                                           (symbol-name symbol2)))))
+  (let ((pointer addons))
+    (while pointer
+      (if (memq (car pointer) (cdr pointer))
+         (setcar pointer nil))
+      (setq pointer (cdr pointer)))
+    (delq nil addons))
+  ;; Build & resolve dependencies.
+  (riece-sort-addon-dependencies
+   (riece-load-and-build-addon-dependencies addons)))

 
 (defun riece-insinuate-addon (addon &optional verbose)
 
 (defun riece-insinuate-addon (addon &optional verbose)

-  (require addon)              ;implicit dependency
-  (funcall (intern (concat (symbol-name addon) "-insinuate")))
-  (if verbose
-      (message "Add-on %S is insinuated" addon)))
+  (unless (assq addon riece-addon-dependencies)
+    (setq riece-addons (cons addon riece-addons)
+         riece-addon-dependencies (riece-resolve-addons
+                                   (copy-sequence riece-addons))))
+  (if (get addon 'riece-addon-insinuated)
+      (if verbose
+         (message "Add-on %S is already insinuated" addon))
+    (funcall (intern (concat (symbol-name addon) "-insinuate")))
+    (put addon 'riece-addon-insinuated t)
+    (if verbose
+       (message "Add-on %S is insinuated" addon))
+    (unless (get addon 'riece-addon-default-disabled)
+      (riece-enable-addon addon t))))
+
+(defun riece-uninstall-addon (addon &optional verbose)
+  (if (not (get addon 'riece-addon-insinuated))
+      (if verbose
+         (message "Add-on %S is not insinuated" addon))
+    (let ((entry (assq addon riece-addon-dependencies))
+         (enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
+      (if entry
+         (if (cdr entry)
+             (error "Dependency problem: %S <- %S" addon (cdr entry))
+           (if (and enabled
+                    (symbol-value enabled))
+               (riece-disable-addon addon verbose))
+           (funcall (or (intern-soft (concat (symbol-name addon)
+                                             "-uninstall"))
+                        #'ignore))
+           (setq riece-addon-dependencies
+                 (delq entry riece-addon-dependencies))
+           (remprop addon 'riece-addon-insinuated)
+           (setq riece-addons (delq addon riece-addons)
+                 riece-addon-dependencies (riece-resolve-addons
+                                           (copy-sequence riece-addons)))))
+      (if verbose
+         (message "Add-on %S is uninstalled" addon)))))

 
 (defun riece-enable-addon (addon &optional verbose)
 
 (defun riece-enable-addon (addon &optional verbose)

+  (unless (get addon 'riece-addon-insinuated)
+    (error "Add-on %S is not insinuated" addon))

   (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
     (if (null enabled)
        (if verbose
            (message "Add-on %S doesn't support enable/disable" addon))
       (if (symbol-value enabled)
          (if verbose
   (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
     (if (null enabled)
        (if verbose
            (message "Add-on %S doesn't support enable/disable" addon))
       (if (symbol-value enabled)
          (if verbose

-             (message "Can't enable add-on %S" addon))
+             (message "Add-on %S is already enabled" addon))

        (funcall (intern (concat (symbol-name addon) "-enable")))
        (if verbose
            (message "Add-on %S enabled" addon))))))
 
 (defun riece-disable-addon (addon &optional verbose)
        (funcall (intern (concat (symbol-name addon) "-enable")))
        (if verbose
            (message "Add-on %S enabled" addon))))))
 
 (defun riece-disable-addon (addon &optional verbose)

+  (unless (get addon 'riece-addon-insinuated)
+    (error "Add-on %S is not insinuated" addon))

   (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
     (if (null enabled)
        (if verbose
   (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
     (if (null enabled)
        (if verbose


@@ -216,7 +262,7 @@
            (if verbose
                (message "Add-on %S disabled" addon)))
        (if verbose
            (if verbose
                (message "Add-on %S disabled" addon)))
        (if verbose

-           (message "Can't disable add-on %S" addon))))))
+           (message "Add-on %S is already enabled" addon))))))

 
 (put 'riece-addon-list-mode 'font-lock-defaults
      '(riece-addon-list-font-lock-keywords t))
 
 (put 'riece-addon-list-mode 'font-lock-defaults
      '(riece-addon-list-font-lock-keywords t))


@@ -235,8 +281,8 @@ All normal editing commands are turned off."
   (use-local-map riece-addon-list-mode-map)
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(riece-addon-list-font-lock-keywords t))
   (use-local-map riece-addon-list-mode-map)
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(riece-addon-list-font-lock-keywords t))

-  ;; In XEmacs, auto-initialization of font-lock is not affective
-  ;; when buffer-file-name is not set.
+  ;; In XEmacs, auto-initialization of font-lock is not effective
+  ;; if buffer-file-name is not set.

   (font-lock-set-defaults)
   (run-hooks 'riece-addon-list-mode-hook))
 
   (font-lock-set-defaults)
   (run-hooks 'riece-addon-list-mode-hook))
 


@@ -246,32 +292,49 @@ All normal editing commands are turned off."
   (riece-addon-list-mode)
   (let ((inhibit-read-only t)
        buffer-read-only
   (riece-addon-list-mode)
   (let ((inhibit-read-only t)
        buffer-read-only

-       (pointer (sort (copy-sequence riece-addons)
-                      (lambda (symbol1 symbol2)
-                                 (string-lessp (symbol-name symbol1)
-                                               (symbol-name symbol2)))))
-       enabled description point)
+       (pointer riece-addon-dependencies)
+       module-description-alist
+       description enabled point)
+    (while pointer
+      
+      (setq description (intern-soft (concat (symbol-name (car (car pointer)))
+                                            "-description"))
+           module-description-alist
+           (cons (cons (car (car pointer))
+                       (if description
+                           (symbol-value description)
+                         "(no description)"))
+                 module-description-alist)
+           pointer (cdr pointer)))
+    (setq pointer riece-addon-modules)
+    (while pointer
+      (unless (assq (car (car pointer))
+                   module-description-alist)
+       (setq module-description-alist
+             (cons (car pointer) module-description-alist)))
+      (setq pointer (cdr pointer)))

     (erase-buffer)
     (riece-kill-all-overlays)
     (erase-buffer)
     (riece-kill-all-overlays)

+    (setq pointer (sort module-description-alist
+                       (lambda (entry1 entry2)
+                         (string-lessp (symbol-name (car entry1))
+                                       (symbol-name (car entry2))))))

     (while pointer
     (while pointer

-      (setq enabled (intern-soft (concat (symbol-name (car pointer))
-                                        "-enabled"))
-           description (intern-soft (concat (symbol-name (car pointer))
-                                            "-description")))
+      (setq enabled (intern-soft (concat (symbol-name (car (car pointer)))
+                                        "-enabled")))

       (setq point (point))
       (insert (format "%c %S: %s\n"
       (setq point (point))
       (insert (format "%c %S: %s\n"

-                     (if (not (featurep (car pointer)))
-                         ??
+                     (if (not (get (car (car pointer))
+                                   'riece-addon-insinuated))
+                         ? 

                        (if (null enabled)
                            ?!
                          (if (symbol-value enabled)
                              ?+
                            ?-)))
                        (if (null enabled)
                            ?!
                          (if (symbol-value enabled)
                              ?+
                            ?-)))

-                     (car pointer)
-                     (if description
-                         (symbol-value description)
-                       "(no description)")))
-      (put-text-property point (point) 'riece-addon (car pointer))
+                     (car (car pointer))
+                     (cdr (car pointer))))
+      (put-text-property point (point) 'riece-addon (car (car pointer)))

       (setq pointer (cdr pointer)))
     (insert "
 Symbols in the leftmost column:
       (setq pointer (cdr pointer)))
     (insert "
 Symbols in the leftmost column:


@@ -279,7 +342,7 @@ Symbols in the leftmost column:
   +     The add-on is enabled.
   -     The add-on is disabled.
   !    The add-on doesn't support enable/disable operation.
   +     The add-on is enabled.
   -     The add-on is disabled.
   !    The add-on doesn't support enable/disable operation.

-  ?    The add-on status is unknown.
+       The add-on is not insinuated.

 ")
     (insert (substitute-command-keys "
 Useful keys:
 ")
     (insert (substitute-command-keys "
 Useful keys:


@@ -298,9 +361,9 @@ Useful keys:
            (get-text-property (point) 'riece-addon))
        (intern-soft
         (completing-read "Add-on: "
            (get-text-property (point) 'riece-addon))
        (intern-soft
         (completing-read "Add-on: "

-                         (mapcar (lambda (addon)
-                                   (list (symbol-name addon)))
-                                 riece-addons)
+                         (mapcar (lambda (dependency)
+                                   (list (symbol-name (car dependency))))
+                                 riece-addon-dependencies)

                          (lambda (pointer)
                            (let ((enabled
                                   (intern-soft (concat (car pointer)
                          (lambda (pointer)
                            (let ((enabled
                                   (intern-soft (concat (car pointer)


@@ -309,18 +372,14 @@ Useful keys:
                                   (null (symbol-value enabled)))))
                          t)))))
   (riece-enable-addon addon t)
                                   (null (symbol-value enabled)))))
                          t)))))
   (riece-enable-addon addon t)

-  (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
-    (if (and (eq major-mode 'riece-addon-list-mode)
-            (get-text-property (point) 'riece-addon)
-            enabled (symbol-value enabled))
-       (save-excursion
-         (beginning-of-line)
-         (let ((point (point))
-               (inhibit-read-only t)
-               buffer-read-only)
-           (delete-char 1)
-           (insert "+")
-           (put-text-property point (point) 'riece-addon addon))))))
+  (when (eq major-mode 'riece-addon-list-mode)
+    (riece-command-list-addons)
+    (let ((point (point-min)))
+      (while (and (not (eq (get-text-property point 'riece-addon) addon))
+                 (setq point (next-single-property-change point
+                                                          'riece-addon))))
+      (if point
+         (goto-char point)))))

 
 (defun riece-command-disable-addon (addon)
   (interactive
 
 (defun riece-command-disable-addon (addon)
   (interactive


@@ -329,9 +388,9 @@ Useful keys:
            (get-text-property (point) 'riece-addon))
        (intern-soft
         (completing-read "Add-on: "
            (get-text-property (point) 'riece-addon))
        (intern-soft
         (completing-read "Add-on: "

-                         (mapcar (lambda (addon)
-                                   (list (symbol-name addon)))
-                                 riece-addons)
+                         (mapcar (lambda (dependency)
+                                   (list (symbol-name (car dependency))))
+                                 riece-addon-dependencies)

                          (lambda (pointer)
                            (let ((enabled
                                   (intern-soft (concat (car pointer)
                          (lambda (pointer)
                            (let ((enabled
                                   (intern-soft (concat (car pointer)


@@ -340,18 +399,58 @@ Useful keys:
                                   (symbol-value enabled))))
                          t)))))
   (riece-disable-addon addon t)
                                   (symbol-value enabled))))
                          t)))))
   (riece-disable-addon addon t)

-  (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
-    (if (and (eq major-mode 'riece-addon-list-mode)
-            (get-text-property (point) 'riece-addon)
-            enabled (null (symbol-value enabled)))
-       (save-excursion
-         (beginning-of-line)
-         (let ((point (point))
-               (inhibit-read-only t)
-               buffer-read-only)
-           (delete-char 1)
-           (insert "-")
-           (put-text-property point (point) 'riece-addon addon))))))
+  (when (eq major-mode 'riece-addon-list-mode)
+    (riece-command-list-addons)
+    (let ((point (point-min)))
+      (while (and (not (eq (get-text-property point 'riece-addon) addon))
+                 (setq point (next-single-property-change point
+                                                          'riece-addon))))
+      (if point
+         (goto-char point)))))
+
+(defun riece-command-insinuate-addon (addon)
+  (interactive
+   (list
+    (or (if (eq major-mode 'riece-addon-list-mode)
+           (get-text-property (point) 'riece-addon))
+       (intern-soft
+        (completing-read "Add-on: "
+                         (mapcar (lambda (dependency)
+                                   (list (symbol-name (car dependency))))
+                                 riece-addon-modules)
+                         (lambda (pointer)
+                           (get (car pointer) 'riece-addon-insinuated))
+                         t)))))
+  (riece-insinuate-addon addon t)
+  (when (eq major-mode 'riece-addon-list-mode)
+    (riece-command-list-addons)
+    (let ((point (point-min)))
+      (while (and (not (eq (get-text-property point 'riece-addon) addon))
+                 (setq point (next-single-property-change point
+                                                          'riece-addon))))
+      (if point
+         (goto-char point)))))
+
+(defun riece-command-uninstall-addon (addon)
+  (interactive
+   (list
+    (or (if (eq major-mode 'riece-addon-list-mode)
+           (get-text-property (point) 'riece-addon))
+       (intern-soft
+        (completing-read "Add-on: "
+                         (mapcar (lambda (dependency)
+                                   (list (symbol-name (car dependency))))
+                                 riece-addon-dependencies)
+                         nil t)))))
+  (riece-uninstall-addon addon t)
+  (when (eq major-mode 'riece-addon-list-mode)
+    (riece-command-list-addons)
+    (let ((point (point-min)))
+      (while (and (not (eq (get-text-property point 'riece-addon) addon))
+                 (setq point (next-single-property-change point
+                                                          'riece-addon))))
+      (if point
+         (goto-char point)))))

 
 (provide 'riece-addon)
 
 
 (provide 'riece-addon)