emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#50208: closed ([PATCH] home-services: Add symlink-manager)


From: GNU bug Tracking System
Subject: bug#50208: closed ([PATCH] home-services: Add symlink-manager)
Date: Fri, 27 Aug 2021 19:16:01 +0000

Your message dated Fri, 27 Aug 2021 22:15:18 +0300
with message-id <87v93q3dix.fsf@gmail.com>
and subject line Re: [PATCH 0/5] Add home-environment and related services
has caused the debbugs.gnu.org bug report #50208,
regarding [PATCH] home-services: Add symlink-manager
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
50208: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=50208
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
--- Begin Message --- Subject: [PATCH] home-services: Add symlink-manager Date: Thu, 26 Aug 2021 09:39:38 +0300
---
This patch is targeted against wip-guix-home branch.

It's not a part of any patch series to make sure it will get enough attention,
because it's most unpure part of the Guix Home and operates on user's files.

 gnu/home-services/symlink-manager.scm | 248 ++++++++++++++++++++++++++
 1 file changed, 248 insertions(+)
 create mode 100644 gnu/home-services/symlink-manager.scm

diff --git a/gnu/home-services/symlink-manager.scm 
b/gnu/home-services/symlink-manager.scm
new file mode 100644
index 0000000000..f13c9f4dbe
--- /dev/null
+++ b/gnu/home-services/symlink-manager.scm
@@ -0,0 +1,248 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu home-services symlink-manager)
+  #:use-module (gnu home-services)
+  #:use-module (guix gexp)
+
+  #:export (home-symlink-manager-service-type))
+
+;;; Comment:
+;;;
+;;; symlink-manager cares about configuration files: it backups files
+;;; created by user, removes symlinks and directories created by
+;;; previous generation, and creates new directories and symlinks to
+;;; configs according to content of files/ directory of current home
+;;; environment generation (created by home-files-service).
+;;;
+;;; Code:
+
+(define (update-symlinks-script)
+  (program-file
+   "update-symlinks"
+   #~(begin
+       (use-modules (ice-9 ftw)
+                   (ice-9 curried-definitions)
+                   (ice-9 match)
+                   (srfi srfi-1))
+       (define ((simplify-file-tree parent) file)
+         "Convert the result produced by `file-system-tree' to less
+verbose and more suitable for further processing format.
+
+Extract dir/file info from stat and compose a relative path to the
+root of the file tree.
+
+Sample output:
+
+((dir . \".\")
+ ((dir . \"config\")
+  ((dir . \"config/fontconfig\")
+   (file . \"config/fontconfig/fonts.conf\"))
+  ((dir . \"config/isync\")
+   (file . \"config/isync/mbsyncrc\"))))
+"
+        (match file
+          ((name stat) `(file . ,(string-append parent name)))
+          ((name stat children ...)
+           (cons `(dir . ,(string-append parent name))
+                 (map (simplify-file-tree
+                       (if (equal? name ".")
+                           ""
+                           (string-append parent name "/")))
+                      children)))))
+
+       (define ((file-tree-traverse preordering) node)
+        "Traverses the file tree in different orders, depending on PREORDERING.
+
+if PREORDERING is @code{#t} resulting list will contain folders before
+files located in those folders, otherwise folders will appear only
+after all nested items already listed."
+        (let ((prepend (lambda (a b) (append b a))))
+          (match node
+            (('file . path) (list node))
+            ((('dir . path) . rest)
+             ((if preordering append prepend)
+              (list (cons 'dir path))
+              (append-map (file-tree-traverse preordering) rest))))))
+
+       (use-modules (guix build utils))
+
+       (let* ((he-path (string-append (getenv "HOME") "/.guix-home"))
+              (new-he-tmp-path (string-append he-path ".new"))
+              (new-home (getenv "GUIX_NEW_HOME")))
+         (symlink new-home new-he-tmp-path)
+         (rename-file new-he-tmp-path he-path))
+
+       (let* ((config-home    (or (getenv "XDG_CONFIG_HOME")
+                                 (string-append (getenv "HOME") "/.config")))
+
+             (he-path (string-append (getenv "HOME") "/.guix-home"))
+              (new-he-tmp-path (string-append he-path ".new"))
+
+             (files-path (string-append he-path "/files"))
+             ;; Leading dot is required, because files itself is symlink and
+             ;; to make file-system-tree works it should be a directory.
+             (files-dir-path (string-append files-path "/."))
+             (new-files-path (string-append new-he-tmp-path "/files"))
+             (new-files-dir-path (string-append files-path "/."))
+
+             (home-path (getenv "HOME"))
+             (backup-dir (string-append home-path "/"
+                                        (number->string (current-time))
+                                        "-guix-home-legacy-configs-backup"))
+
+             (old-tree (if (file-exists? files-dir-path)
+                          ((simplify-file-tree "")
+                          (file-system-tree files-dir-path))
+                          #f))
+             (new-tree ((simplify-file-tree "")
+                        (file-system-tree new-files-dir-path)))
+
+             (get-source-path
+              (lambda (path)
+                (readlink (string-append files-path "/" path))))
+
+             (get-target-path
+              (lambda (path)
+                (string-append home-path "/." path)))
+
+             (get-backup-path
+              (lambda (path)
+                (string-append backup-dir "/." path)))
+
+             (directory?
+              (lambda (path)
+                (equal? (stat:type (stat path)) 'directory)))
+
+             (empty-directory?
+              (lambda (dir)
+                (equal? (scandir dir) '("." ".."))))
+
+             (symlink-to-store?
+              (lambda (path)
+                (and
+                 (equal? (stat:type (lstat path)) 'symlink)
+                 (store-file-name? (readlink path)))))
+
+             (backup-file
+              (lambda (path)
+                (mkdir-p backup-dir)
+                (format #t "Backing up ~a..." (get-target-path path))
+                (mkdir-p (dirname (get-backup-path path)))
+                (rename-file (get-target-path path) (get-backup-path path))
+                (display " done\n")))
+
+             (cleanup-symlinks
+              (lambda ()
+                (let ((to-delete ((file-tree-traverse #f) old-tree)))
+                  (display
+                   "Cleaning up symlinks from previous home-environment.\n\n")
+                  (map
+                   (match-lambda
+                     (('dir . ".")
+                      (display "Cleanup finished.\n\n"))
+
+                     (('dir . path)
+                      (if (and
+                           (file-exists? (get-target-path path))
+                           (directory? (get-target-path path))
+                           (empty-directory? (get-target-path path)))
+                          (begin
+                            (format #t "Removing ~a..."
+                                    (get-target-path path))
+                            (rmdir (get-target-path path))
+                            (display " done\n"))
+                          (format
+                           #t "Skipping ~a (not an empty directory)... done\n"
+                           (get-target-path path))))
+
+                     (('file . path)
+                      (when (file-exists? (get-target-path path))
+                        ;; DO NOT remove the file if it was modified
+                        ;; by user (not a symlink to the /gnu/store
+                        ;; anymore) it will be backed up later during
+                        ;; create-symlinks phase.
+                        (if (symlink-to-store? (get-target-path path))
+                            (begin
+                              (format #t "Removing ~a..." (get-target-path 
path))
+                              (delete-file (get-target-path path))
+                              (display " done\n"))
+                            (format
+                             #t
+                             "Skipping ~a (not a symlink to store)... done\n"
+                             (get-target-path path))))))
+                   to-delete))))
+
+             (create-symlinks
+              (lambda ()
+                (let ((to-create ((file-tree-traverse #t) new-tree)))
+                  (map
+                   (match-lambda
+                     (('dir . ".")
+                      (display
+                       "New symlinks to home-environment will be created 
soon.\n")
+                      (format
+                       #t "All conflicting files will go to ~a.\n\n" 
backup-dir))
+
+                     (('dir . path)
+                      (let ((target-path (get-target-path path)))
+                        (when (and (file-exists? target-path)
+                                   (not (directory? target-path)))
+                          (backup-file path))
+
+                        (if (file-exists? target-path)
+                            (format
+                             #t "Skipping   ~a (directory already exists)... 
done\n"
+                             target-path)
+                            (begin
+                              (format #t "Creating   ~a..." target-path)
+                              (mkdir target-path)
+                              (display " done\n")))))
+
+                     (('file . path)
+                      (when (file-exists? (get-target-path path))
+                        (backup-file path))
+                      (format #t "Symlinking ~a -> ~a..."
+                              (get-target-path path) (get-source-path path))
+                      (symlink (get-source-path path) (get-target-path path))
+                      (display " done\n")))
+                   to-create)))))
+
+        (when old-tree
+          (cleanup-symlinks))
+
+        (create-symlinks)
+
+        (display " done\nFinished updating symlinks.\n\n")))))
+
+
+(define (update-symlinks-gexp _)
+  #~(primitive-load #$(update-symlinks-script)))
+
+(define home-symlink-manager-service-type
+  (service-type (name 'home-symlink-manager)
+                (extensions
+                 (list
+                 (service-extension
+                  home-activation-service-type
+                   update-symlinks-gexp)))
+               (default-value #f)
+                (description "Provide an @code{update-symlinks}
+script, which create and remove symlinks on every activation.  If the
+target is occupied by a file created by user, back it up.")))
-- 
2.33.0

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- Subject: Re: [PATCH 0/5] Add home-environment and related services Date: Fri, 27 Aug 2021 22:15:18 +0300 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux)
Andrew Tropin <andrew@trop.in> writes:

[…]

>> On top of the patches above I made a new patch series, which introduces
>> home-environment and a set of default services, which are expected to be
>> present in most Guix Home configurations.

I added a copyright in gnu/home-services/configuration.scm and a
copyright line in gnu/local.mk files.

From gnu/home-services/shells.scm removed 3 comment lines at the bottom,
because I don't see this practice in other Guix documentation generation
functions:
--8<---------------cut here---------------start------------->8---
;; (display (generate-home-shell-profile-documentation))
;; (display (generate-home-bash-documentation))
;; (display (generate-home-zsh-documentation))
--8<---------------cut here---------------end--------------->8---

In gnu/home.scm and gnu/home-services/xdg.scm alligned
define-record-type* with Emacs's ‘M-x aggressive-indent-mode’ and
‘M-x align-regexp’ <SPC ;>.

Unfortunately force push is disallowed, removed origin/wip-guix-home and
pushed again with squashed local.mk and slightly modified commit
messages (missing dots at the commit messages).

[…]

> Is it ok to keep discussion and review of the patch series in this
> thread or better create a new ticket for that?
>
> I posted it here, because it relies on symlink-manager, but not sure if
> it's handy for reviewers.

I think it's OK to keep discussion here, because every patch is a part
of guix-home.  Not a strong opinion on that.

I'll close the issue for now, it should reopen in case you send an email
to 50208@debbugs.gnu.org

Oleg.

Attachment: signature.asc
Description: PGP signature


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]