refactor: extract unique naming utilities to an external package

Author: abougouffa

core/me-lib.el

@@ -1177,81 +1177,6 @@ scaling factor for the font in Emacs' `face-font-rescale-alist'. See the
 
 
 
-;;; Unique name from directory
-
-(defvar +unique-name-map-default (make-hash-table :test 'equal))
-(defvar +unique-name-format "%s[%s]")
-
-(defun +unique-name--get-dir-elements (dir)
-  (butlast (reverse (file-name-split (directory-file-name (expand-file-name dir))))))
-
-(defun +unique-name--unique-dir-elements (dir1 dir2)
-  "Return unique elements of DIR1 and DIR2."
-  (let* ((els1 (+unique-name--get-dir-elements dir1))
-         (els2 (+unique-name--get-dir-elements dir2)))
-    (while-let ((el1 (car els1))
-                (el2 (car els2))
-                (_ (string= el1 el2)))
-      (pop els1) (pop els2))
-    (cons els1 els2)))
-
-(cl-defun +unique-name-create-or-update (dir &key ((:map map-sym) '+unique-name-map-default) ((:rename-fn rename-func) nil))
-  "See `+unique-name-register'."
-  (let* ((dir (expand-file-name dir))
-         (name (file-name-nondirectory (directory-file-name (expand-file-name dir))))
-         (unique-map (eval map-sym))
-         (unique-name
-          (cl-loop for other-path in (hash-table-keys unique-map)
-                   with len-min = most-positive-fixnum
-                   with len-max = most-negative-fixnum
-                   with max-path = nil
-                   collect
-                   (let ((curr-element (gethash other-path unique-map)))
-                     (when (and (not (string= dir other-path)) ; not the same dir
-                                (string= name (alist-get 'dir-name curr-element))) ; have the same name
-                       (cl-destructuring-bind (els1 . els2) (+unique-name--unique-dir-elements dir other-path)
-                         (let ((len (length els1)))
-                           (setq len-min (min len-min len))
-                           (when (> len len-max)
-                             (setq len-max len
-                                   max-path els1))))))
-                   finally return
-                   (let ((s (string-join
-                             (reverse (butlast max-path
-                                               (- (length max-path)
-                                                  (1+ (- len-max len-min)))))
-                             "/")))
-                     (if (string-empty-p s)
-                         name
-                       (format +unique-name-format name s))))))
-    (let* ((old (gethash dir unique-map))
-           (old-name (assoc 'unique-name old)))
-      (when (and (functionp rename-func) (not (equal (cdr old-name) unique-name)))
-        (ignore-errors (funcall rename-func (cdr old-name) unique-name)))
-      (if old
-          (setcdr old-name unique-name)
-        (puthash dir `((dir-name . ,name) (unique-name . ,unique-name)) unique-map)))))
-
-(cl-defun +unique-name-register (dir &key ((:map map-sym) '+unique-name-map-default) ((:rename-fn rename-func) nil))
-  "Make a unique name derived from DIR.
-The :MAP is a symbol for the hash-table used to register the names, all
-names will be renamed accordingly when needed.
-The :RENAME-FN is a function of signature (OLD NEW), called before renaming
-the hash-table elements."
-  (append
-   `((path . ,dir))
-   (if-let* ((dir (expand-file-name dir))
-             (name (file-name-nondirectory (directory-file-name (expand-file-name dir))))
-             (unique-map (eval map-sym))
-             (element (gethash dir unique-map)))
-       element
-     (puthash dir `((dir-name . ,name) (unique-name . ,name)) unique-map)
-     (dolist (path (hash-table-keys unique-map)) ; Update all the names
-       (+unique-name-create-or-update path :map map-sym :rename-fn rename-func))
-     (gethash dir unique-map))))
-
-
-
 (provide 'me-lib)
 
 ;;; me-lib.el ends here

modules/me-workspaces.el

@@ -13,6 +13,9 @@
 
 ;;; Code:
 
+(use-package unique-dir-name
+  :straight (:host github :repo "abougouffa/unique-dir-name"))
+
 (use-package project-tab-groups
   :straight t
   :after project
@@ -35,7 +38,7 @@
    #'project-tab-groups--select-or-create-tab-group :after-while
    (satch-defun +project-tab-groups--name-tab-by-group:after-while-a (&rest _)
      (when-let ((group-path (alist-get 'group (tab-bar--current-tab))))
-       (+unique-name-register group-path :map '+project-tab-groups-unique-map)
+       (unique-dir-name-register group-path :map '+project-tab-groups-unique-map)
        ;; Rename all tabs accordingly
        (dolist (frame (frame-list))
          (dolist (tab (frame-parameter frame 'tabs))