Merge pull request #2 from emacs-dashboard/imp

Improve load time

Author: jcs090218

dashboard-ls.el

@@ -7,7 +7,7 @@
 ;; Description: Display files/directories in current directory on Dashboard.
 ;; Keyword: directory file show dashboard
 ;; Version: 0.2.2
-;; Package-Requires: ((emacs "24.3") (dashboard "1.2.5") (f "0.20.0") (s "1.12.0"))
+;; Package-Requires: ((emacs "24.3") (dashboard "1.2.5"))
 ;; URL: https://github.com/emacs-dashboard/dashboard-ls
 
 ;; This file is NOT part of GNU Emacs.
@@ -32,13 +32,10 @@
 
 ;;; Code:
 
-(require 'f)
-(require 's)
-
 (require 'dashboard)
 
-(add-to-list 'dashboard-item-generators '(ls-directories . dashboard-ls--insert-dir))
-(add-to-list 'dashboard-item-generators '(ls-files . dashboard-ls--insert-file))
+(push '(ls-directories . dashboard-ls--insert-dir) dashboard-item-generators)
+(push '(ls-files       . dashboard-ls--insert-file) dashboard-item-generators)
 
 (defvar dashboard-ls-path nil
   "Update to date current path.
@@ -52,18 +49,23 @@ Use this variable when you don't have the `default-directory' up to date.")
   (setq dashboard-ls--record-path (or dashboard-ls-path default-directory))
   dashboard-ls--record-path)
 
+(defun dashboard-ls--entries (path)
+  "Return entries from PATH."
+  (when (file-directory-p path)
+    (directory-files path nil "^\\([^.]\\|\\.[^.]\\|\\.\\..\\)")))
+
 (defun dashboard-ls--insert-dir (list-size)
   "Add the list of LIST-SIZE items from current directory."
   (dashboard-insert-section
-   "Current Directories:"
+   "List Directories:"
    (let* ((current-dir (dashboard-ls--current-path))
-          (dir-lst (when (f-dir-p current-dir) (f-directories current-dir)))
-          (opt-dir-lst '()))
-     (dolist (dir dir-lst)
-       (setq dir (s-replace current-dir "./" dir)
-             dir (s-replace "//" "/" dir))
-       (push (concat dir "/") opt-dir-lst))
-     (reverse opt-dir-lst))
+          (entries (dashboard-ls--entries current-dir))
+          result)
+     (dolist (dir entries)
+       (when (file-directory-p (expand-file-name dir current-dir))
+         (setq dir (concat "./" dir))
+         (push (concat dir "/") result)))
+     (reverse result))
    list-size
    (dashboard-get-shortcut 'ls-directories)
    `(lambda (&rest ignore)
@@ -73,15 +75,15 @@ Use this variable when you don't have the `default-directory' up to date.")
 (defun dashboard-ls--insert-file (list-size)
   "Add the list of LIST-SIZE items from current files."
   (dashboard-insert-section
-   "Current Files:"
+   "List Files:"
    (let* ((current-dir (dashboard-ls--current-path))
-          (file-lst (when (f-dir-p current-dir) (f-files current-dir)))
-          (opt-file-lst '()))
-     (dolist (file file-lst)
-       (setq file (s-replace current-dir "./" file)
-             file (s-replace "//" "/" file))
-       (push file opt-file-lst))
-     (reverse opt-file-lst))
+          (entries (dashboard-ls--entries current-dir))
+          result)
+     (dolist (file entries)
+       (unless (file-directory-p (expand-file-name file current-dir))
+         (setq file (concat "./" file))
+         (push file result)))
+     (reverse result))
    list-size
    (dashboard-get-shortcut 'ls-files)
    `(lambda (&rest ignore)