glenn
/
asteroid
mirror of https://github.com/glenneth1/asteroid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update template paths in calling code.

This commit is contained in:
Brian O'Reilly 2025-11-01 15:19:22 -04:00
parent bc36a00322
commit 0bb93c53a4
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
asteroid.lisp
View File

@ -519,7 +519,7 @@
;; Front page - regular view by default ;; Front page - regular view by default
(define-page front-page #@"/" () (define-page front-page #@"/" ()
"Main front page" "Main front page"
(let ((template-path (merge-pathnames "template/front-page.chtml" (let ((template-path (merge-pathnames "template/front-page.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))
@ -540,7 +540,7 @@
;; Frameset wrapper for persistent player mode ;; Frameset wrapper for persistent player mode
(define-page frameset-wrapper #@"/frameset" () (define-page frameset-wrapper #@"/frameset" ()
"Frameset wrapper with persistent audio player" "Frameset wrapper with persistent audio player"
(let ((template-path (merge-pathnames "template/frameset-wrapper.chtml" (let ((template-path (merge-pathnames "template/frameset-wrapper.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))
@ -549,7 +549,7 @@
;; Content frame - front page content without player ;; Content frame - front page content without player
(define-page front-page-content #@"/content" () (define-page front-page-content #@"/content" ()
"Front page content (displayed in content frame)" "Front page content (displayed in content frame)"
(let ((template-path (merge-pathnames "template/front-page-content.chtml" (let ((template-path (merge-pathnames "template/front-page-content.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))
@ -567,7 +567,7 @@
;; Persistent audio player frame (bottom frame) ;; Persistent audio player frame (bottom frame)
(define-page audio-player-frame #@"/audio-player-frame" () (define-page audio-player-frame #@"/audio-player-frame" ()
"Persistent audio player frame (bottom of page)" "Persistent audio player frame (bottom of page)"
(let ((template-path (merge-pathnames "template/audio-player-frame.chtml" (let ((template-path (merge-pathnames "template/audio-player-frame.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))
@ -606,7 +606,7 @@
(define-page admin #@"/admin" () (define-page admin #@"/admin" ()
"Admin dashboard" "Admin dashboard"
(require-authentication) (require-authentication)
(let ((template-path (merge-pathnames "template/admin.chtml" (let ((template-path (merge-pathnames "template/admin.ctml"
(asdf:system-source-directory :asteroid))) (asdf:system-source-directory :asteroid)))
(track-count (handler-case (track-count (handler-case
(length (db:select "tracks" (db:query :all))) (length (db:select "tracks" (db:query :all)))
@ -629,7 +629,7 @@
(define-page users-management #@"/admin/user" () (define-page users-management #@"/admin/user" ()
"User Management dashboard" "User Management dashboard"
(require-authentication) (require-authentication)
(let ((template-path (merge-pathnames "template/users.chtml" (let ((template-path (merge-pathnames "template/users.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))
@ -639,7 +639,7 @@
(define-page user-profile #@"/profile" () (define-page user-profile #@"/profile" ()
"User profile page" "User profile page"
(require-authentication) (require-authentication)
(let ((template-path (merge-pathnames "template/profile.chtml" (let ((template-path (merge-pathnames "template/profile.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))
@ -710,7 +710,7 @@
(require-authentication) (require-authentication)
(let* ((current-user (auth:current-user)) (let* ((current-user (auth:current-user))
(username (gethash "username" current-user)) (username (gethash "username" current-user))
(template-path (merge-pathnames "template/profile.chtml" (template-path (merge-pathnames "template/profile.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))
@ -862,7 +862,7 @@
:success-message "")))) :success-message ""))))
(define-page player #@"/player" () (define-page player #@"/player" ()
(let ((template-path (merge-pathnames "template/player.chtml" (let ((template-path (merge-pathnames "template/player.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))
@ -878,7 +878,7 @@
;; Player content frame (for frameset mode) ;; Player content frame (for frameset mode)
(define-page player-content #@"/player-content" () (define-page player-content #@"/player-content" ()
"Player page content (displayed in content frame)" "Player page content (displayed in content frame)"
(let ((template-path (merge-pathnames "template/player-content.chtml" (let ((template-path (merge-pathnames "template/player-content.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))
@ -889,7 +889,7 @@
(define-page popout-player #@"/popout-player" () (define-page popout-player #@"/popout-player" ()
"Pop-out player window" "Pop-out player window"
(let ((template-path (merge-pathnames "template/popout-player.chtml" (let ((template-path (merge-pathnames "template/popout-player.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(clip:process-to-string (clip:process-to-string
(plump:parse (alexandria:read-file-into-string template-path)) (plump:parse (alexandria:read-file-into-string template-path))

2
frontend-partials.lisp
View File

@ -33,7 +33,7 @@
"Get Partial HTML with live status from Icecast server" "Get Partial HTML with live status from Icecast server"
(handler-case (handler-case
(let ((now-playing-stats (icecast-now-playing *stream-base-url*)) (let ((now-playing-stats (icecast-now-playing *stream-base-url*))
(template-path (merge-pathnames "template/partial/now-playing.chtml" (template-path (merge-pathnames "template/partial/now-playing.ctml"
(asdf:system-source-directory :asteroid)))) (asdf:system-source-directory :asteroid))))
(if now-playing-stats (if now-playing-stats
(progn (progn

2
template-utils.lisp
View File

@ -11,7 +11,7 @@
"Load and cache a template file" "Load and cache a template file"
(or (gethash template-name *template-cache*) (or (gethash template-name *template-cache*)
(let* ((template-path (merge-pathnames (let* ((template-path (merge-pathnames
(format nil "template/~a.chtml" template-name) (format nil "template/~a.ctml" template-name)
(asdf:system-source-directory :asteroid))) (asdf:system-source-directory :asteroid)))
(parsed (plump:parse (alexandria:read-file-into-string template-path)))) (parsed (plump:parse (alexandria:read-file-into-string template-path))))
(setf (gethash template-name *template-cache*) parsed) (setf (gethash template-name *template-cache*) parsed)