Merge remote-tracking branch 'upstream/main'

fix: with-error-handling using inner message
This fix some issues where, on the client, `response.message` was `Ok.` for error responses and real error message needed to be extracted from `response.data.message`, which made a weird API.
2025-11-18 07:15:32 +03:00 · 2025-11-17 18:08:12 -05:00 · 2025-11-17 18:08:12 -05:00 · 2025-11-17 18:06:14 -05:00 · 2025-11-17 18:06:14 -05:00
3 changed files with 15 additions and 4 deletions
--- a/asteroid.lisp
+++ b/asteroid.lisp
@ -16,8 +16,11 @@
 ;; configuration logic. Probably using 'ubiquity
 (defparameter *server-port* 8080)
 (defparameter *music-library-path* 
-  (merge-pathnames "music/library/" 
-                   (asdf:system-source-directory :asteroid)))
+  (or (uiop:getenv "MUSIC_LIBRARY_PATH")
+      ;; Default to /app/music/ for production Docker, but check if music/library/ exists for local dev
+      (if (probe-file (merge-pathnames "music/library/" (asdf:system-source-directory :asteroid)))
+          (merge-pathnames "music/library/" (asdf:system-source-directory :asteroid))
+          "/app/music/")))
 (defparameter *supported-formats* '("mp3" "flac" "ogg" "wav"))
 (defparameter *stream-base-url* "http://localhost:8000")

--- a/auth-routes.lisp
+++ b/auth-routes.lisp
@ -127,7 +127,7 @@
        (error 'authentication-error :message "Not authenticated"))
      
      ;; Verify current password
-      (unless (verify-user-credentials username current-password)
+      (unless (authenticate-user username current-password)
        (error 'authentication-error :message "Current password is incorrect"))
      
      ;; Update password
--- a/conditions.lisp
+++ b/conditions.lisp
@ -109,39 +109,47 @@
     (not-found-error (e)
       (api-output `(("status" . "error")
                     ("message" . ,(error-message e)))
+                   :message (error-message e)
                   :status 404))
     (authentication-error (e)
       (api-output `(("status" . "error")
                     ("message" . ,(error-message e)))
+                   :message (error-message e)
                   :status 401))
     (authorization-error (e)
       (api-output `(("status" . "error")
                     ("message" . ,(error-message e)))
+                   :message (error-message e)
                   :status 403))
     (validation-error (e)
       (api-output `(("status" . "error")
                     ("message" . ,(error-message e)))
+                   :message (error-message e)
                   :status 400))
     (database-error (e)
       (format t "Database error: ~a~%" e)
       (api-output `(("status" . "error")
                     ("message" . "Database operation failed"))
+                   :message  "Database operation failed"
                   :status 500))
     (asteroid-stream-error (e)
       (format t "Stream error: ~a~%" e)
       (api-output `(("status" . "error")
                     ("message" . "Stream operation failed"))
+                   :message "Stream operation failed"
                   :status 500))
     (asteroid-error (e)
       (format t "Asteroid error: ~a~%" e)
       (api-output `(("status" . "error")
                     ("message" . ,(error-message e)))
+                   :message (error-message e)
                   :status 500))
     (error (e)
       (format t "Unexpected error: ~a~%" e)
       (api-output `(("status" . "error")
                     ("message" . "An unexpected error occurred"))
-                   :status 500))))
+                   :status 500
+                   :message "An unexpected error occurred"))))

 (defmacro with-db-error-handling (operation &body body)
  "Wrap database operations with error handling.
Author	SHA1	Message	Date
Glenn Thompson	c198775083	Merge remote-tracking branch 'upstream/main'	2025-11-18 07:15:32 +03:00
Luis Pereira	559187df2e	fix: with-error-handling using inner message This fix some issues where, on the client, `response.message` was `Ok.` for error responses and real error message needed to be extracted from `response.data.message`, which made a weird API.	2025-11-17 18:08:12 -05:00
Luis Pereira	59076e67b8	fix: profile password change using non existing function	2025-11-17 18:08:12 -05:00
Glenn Thompson	2a505e482d	Fix scan-library path to work in both development and production - Auto-detect music library path based on environment - Check for music/library/ directory for local development - Default to /app/music/ for production Docker deployment - Allow MUSIC_LIBRARY_PATH environment variable override - Fixes scan-library function failing on production server	2025-11-17 18:06:14 -05:00
Glenn Thompson	19b9deccf5	fix: Use /app/music/ as default music library path for production - Changed hardcoded music/library/ path to /app/music/ (production path) - Added MUSIC_LIBRARY_PATH environment variable for local dev override - Fixes scan library function on production server - Aligns with path structure used in M3U playlists and liquidsoap config	2025-11-17 18:06:14 -05:00