[bug#78603,v2] services: readymedia: Use relative paths to cache and log directories for home.

Message ID 847e37421c511c1d959d01047401e379d81a3388.1748352495.git.sughosha@disroot.org
State New
Headers
Series [bug#78603,v2] services: readymedia: Use relative paths to cache and log directories for home. |

Commit Message

Sughosha May 27, 2025, 1:28 p.m. UTC
  This fixes readymedia configured by a different user.

* gnu/services/upnp.scm (readymedia-configuration)[cache-directory]: Update
path.
[log-directory]: Ditto.

Change-Id: I629c937973ca46bcd6e60382aa7576b9859515be
---
 gnu/services/upnp.scm | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)


base-commit: c15f786f8936502249b639220997094fdbf7f1e8
  

Comments

Sughosha May 27, 2025, 1:52 p.m. UTC | #1
On Tuesday, May 27, 2025 6:58:15 PM GMT+5:30 Sughosha wrote:
> This fixes readymedia configured by a different user.
> 
> * gnu/services/upnp.scm (readymedia-configuration)[cache-directory]: Update
> path.
> [log-directory]: Ditto.
> 
> Change-Id: I629c937973ca46bcd6e60382aa7576b9859515be
> ---
>  gnu/services/upnp.scm | 15 ++++-----------
>  1 file changed, 4 insertions(+), 11 deletions(-)
> 
> diff --git a/gnu/services/upnp.scm b/gnu/services/upnp.scm
> index 8267b1e53af..a5954c83f40 100644
> --- a/gnu/services/upnp.scm
> +++ b/gnu/services/upnp.scm
> @@ -74,19 +74,12 @@ (define-record-type* <readymedia-configuration>
>          (default #f))
>    (cache-directory readymedia-configuration-cache-directory
>                     (default (if for-home?
> -                                (string-append (or (getenv
> "XDG_CACHE_HOME") -                                                  
> (string-append -                                                    (getenv
> "HOME") "/.cache")) -                                              
> "/readymedia")
> -                              %readymedia-default-cache-directory)))
> +                                ".cache/readymedia"
> +                                %readymedia-default-cache-directory)))
>    (log-directory readymedia-configuration-log-directory
>                   (default (if for-home?
> -                              (string-append (or (getenv "XDG_STATE_HOME")
> -                                                 (string-append
> -                                                  (getenv "HOME")
> -                                                  "/.local/state"))
> -                                             "/readymedia")
> -                            %readymedia-default-log-directory)))
> +                              ".local/state/readymedia"
> +                              %readymedia-default-log-directory)))
>    (friendly-name readymedia-configuration-friendly-name
>                   (default #f))
>    (media-directories readymedia-configuration-media-directories)
> 
> base-commit: c15f786f8936502249b639220997094fdbf7f1e8
Sorry, when I checked the log this is giving the following error:

--8<---------------cut here---------------start------------->8---
2025-05-27 19:04:38 gnu/build/linux-container.scm:476:16: In procedure statfs: 
.cache/readymedia: No such file or directory
2025-05-27 19:04:38 Backtrace:
2025-05-27 19:04:38            3 (primitive-load "/gnu/store/
0b4l0f7yypzqww1h3hchqkqvam9…")
2025-05-27 19:04:38 In ice-9/eval.scm:
2025-05-27 19:04:38    191:35  2 (_ #f)
2025-05-27 19:04:38 In gnu/build/linux-container.scm:
2025-05-27 19:04:38     368:8  1 (call-with-temporary-directory #<procedure 
7f07dc3c82a0…>)
2025-05-27 19:04:38    476:16  0 (_ "/tmp/guix-directory.puYgco")
--8<---------------cut here---------------end--------------->8---
  

Patch

diff --git a/gnu/services/upnp.scm b/gnu/services/upnp.scm
index 8267b1e53af..a5954c83f40 100644
--- a/gnu/services/upnp.scm
+++ b/gnu/services/upnp.scm
@@ -74,19 +74,12 @@  (define-record-type* <readymedia-configuration>
         (default #f))
   (cache-directory readymedia-configuration-cache-directory
                    (default (if for-home?
-                                (string-append (or (getenv "XDG_CACHE_HOME")
-                                                   (string-append
-                                                    (getenv "HOME") "/.cache"))
-                                               "/readymedia")
-                              %readymedia-default-cache-directory)))
+                                ".cache/readymedia"
+                                %readymedia-default-cache-directory)))
   (log-directory readymedia-configuration-log-directory
                  (default (if for-home?
-                              (string-append (or (getenv "XDG_STATE_HOME")
-                                                 (string-append
-                                                  (getenv "HOME")
-                                                  "/.local/state"))
-                                             "/readymedia")
-                            %readymedia-default-log-directory)))
+                              ".local/state/readymedia"
+                              %readymedia-default-log-directory)))
   (friendly-name readymedia-configuration-friendly-name
                  (default #f))
   (media-directories readymedia-configuration-media-directories)