feat: Improve clean commands (#101)

Author: jcs090218

lisp/clean/all.el

@@ -22,26 +22,21 @@
   (declare (indent 1))
   `(let (eask-no-cleaning-operation-p)
      (eask-with-progress
-       (format "%s... \n" ,title)
-       (progn ,@body)
+       (format "%s... " ,title)
+       (eask-with-verbosity 'debug ,@body)
        (if eask-no-cleaning-operation-p "skipped ✗" "done ✓"))))
 
 (eask-start
   (eask--clean-section "Cleaning workspace"
     (eask-call "clean/workspace"))
-  (eask-msg "")
   (eask--clean-section "Cleaning byte-compile files"
     (eask-call "clean/elc"))
-  (eask-msg "")
   (eask--clean-section "Cleaning dist"
     (eask-call "clean/dist"))
-  (eask-msg "")
   (eask--clean-section "Cleaning autoloads file"
     (eask-call "clean/autoloads"))
-  (eask-msg "")
   (eask--clean-section "Cleaning pkg-file"
     (eask-call "clean/pkg-file"))
-  (eask-msg "")
   (eask--clean-section "Cleaning log files"
     (eask-call "clean/log-file")))
 

lisp/clean/dist.el

@@ -28,20 +28,20 @@
          (readme (expand-file-name (format "%s-readme.txt" name) path))
          (entry (expand-file-name (format "%s-%s.entry" name version) path))
          (packaged (eask-packaged-file))
-         (deleted-count 0)
+         (deleted 0)
          (delete-dir))
-    (when (eask-delete-file readme)   (cl-incf deleted-count))
-    (when (eask-delete-file entry)    (cl-incf deleted-count))
-    (when (eask-delete-file packaged) (cl-incf deleted-count))
-    (when (and (not (zerop deleted-count)) (directory-empty-p path))
+    (when (eask-delete-file readme)   (cl-incf deleted))
+    (when (eask-delete-file entry)    (cl-incf deleted))
+    (when (eask-delete-file packaged) (cl-incf deleted))
+    (when (and (not (zerop deleted)) (directory-empty-p path))
       (eask-with-progress
         (format "The dist folder %s seems to be empty, delete it as well... " path)
         (ignore-errors (delete-directory path))
         "done ✓")
       (setq delete-dir t))
     (eask-msg "")
-    (eask-info "(Total of %s file%s, and %s directory deleted)" deleted-count
-               (eask--sinr deleted-count "" "s")
+    (eask-info "(Total of %s file%s, and %s directory deleted)" deleted
+               (eask--sinr deleted "" "s")
                (if delete-dir "1" "0"))))
 
 (eask-start

lisp/clean/log-file.el

@@ -14,30 +14,32 @@
        (file-name-directory (nth 1 (member "-scriptload" command-line-args))))
       nil t)
 
-(defmacro eask--log-remove (file)
-  "Remove log FILE."
-  `(ignore-errors (delete-file (expand-file-name ,file log-dir))))
-
-(defun eask--delete-log-file (file log-dir count)
-  "Delete a log FILE."
-  (when (eask-delete-file (expand-file-name file log-dir))
-    (cl-incf count))
-  count)
-
-(eask-start
-  (let ((log-dir (expand-file-name eask-log-path eask-file-root))
-        (deleted 0)
-        (log-files '("messages.log"
+(defun eask--clean-log (path)
+  "Clean up .log PATH."
+  (let ((log-files '("messages.log"
                      "warnings.log"
                      "backtrace.log"
-                     "compile-log.log")))
+                     "compile-log.log"))
+        (deleted 0)
+        (delete-dir))
     (dolist (log-file log-files)
-      (setq deleted (eask--delete-log-file log-file log-dir deleted)))
+      (when (eask-delete-file (expand-file-name log-file path))
+        (cl-incf deleted)))
+    (when (and (not (zerop deleted)) (directory-empty-p path))
+      (eask-with-progress
+        (format "The dist folder %s seems to be empty, delete it as well... " path)
+        (ignore-errors (delete-directory path))
+        "done ✓")
+      (setq delete-dir t))
     (eask-msg "")
-    (if (not (zerop deleted))
-        (eask-info "(Total of %s log file%s deleted, %s skipped)" deleted
-                   (eask--sinr deleted "" "s")
-                   (- (length log-files) deleted))
+    (eask-info "(Total of %s log file%s deleted, %s skipped)" deleted
+               (eask--sinr deleted "" "s")
+               (- (length log-files) deleted))))
+
+(eask-start
+  (let ((log-dir (expand-file-name eask-log-path eask-file-root)))
+    (if (file-directory-p log-dir)
+        (eask--clean-log log-dir)
       (eask-info "(No log file found in workspace)")
       (setq eask-no-cleaning-operation-p t))))
 

lisp/core/compile.el

@@ -33,7 +33,7 @@
   (when (get-buffer eask-compile-log-buffer-name)
     (with-current-buffer eask-compile-log-buffer-name
       (eask-print-log-buffer)
-      (message ""))))
+      (eask-msg ""))))
 
 (defun eask--byte-compile-file (filename)
   "Byte compile FILENAME."
@@ -56,7 +56,9 @@
   (let* ((compiled (cl-remove-if-not #'eask--byte-compile-file files))
          (compiled (length compiled))
          (skipped (- (length files) compiled)))
-    (eask-msg "")
+    ;; XXX: Avoid last newline from the log buffer!
+    (unless (get-buffer eask-compile-log-buffer-name)
+      (eask-msg ""))
     (eask-info "(Total of %s file%s compiled, %s skipped)" compiled
                (eask--sinr compiled "" "s")
                skipped)))