-
${track.title[0] || 'Unknown Title'}
-
${track.artist[0] || 'Unknown Artist'} • ${track.album[0] || 'Unknown Album'}
+
${track.title || 'Unknown Title'}
+
${track.artist || 'Unknown Artist'} • ${track.album || 'Unknown Album'}
@@ -186,9 +186,9 @@ function changeLibraryTracksPerPage() {
function filterTracks() {
const query = document.getElementById('search-tracks').value.toLowerCase();
const filtered = tracks.filter(track =>
- (track.title[0] || '').toLowerCase().includes(query) ||
- (track.artist[0] || '').toLowerCase().includes(query) ||
- (track.album[0] || '').toLowerCase().includes(query)
+ (track.title || '').toLowerCase().includes(query) ||
+ (track.artist || '').toLowerCase().includes(query) ||
+ (track.album || '').toLowerCase().includes(query)
);
displayTracks(filtered);
}
@@ -304,9 +304,9 @@ function updatePlayButton(text) {
function updatePlayerDisplay() {
if (currentTrack) {
- document.getElementById('current-title').textContent = currentTrack.title[0] || 'Unknown Title';
- document.getElementById('current-artist').textContent = currentTrack.artist[0] || 'Unknown Artist';
- document.getElementById('current-album').textContent = currentTrack.album[0] || 'Unknown Album';
+ document.getElementById('current-title').textContent = currentTrack.title || 'Unknown Title';
+ document.getElementById('current-artist').textContent = currentTrack.artist || 'Unknown Artist';
+ document.getElementById('current-album').textContent = currentTrack.album || 'Unknown Album';
}
}
@@ -328,8 +328,8 @@ function updateQueueDisplay() {
const queueHtml = playQueue.map((track, index) => `
-
${track.title[0] || 'Unknown Title'}
-
${track.artist[0] || 'Unknown Artist'}
+
${track.title || 'Unknown Title'}
+
${track.artist || 'Unknown Artist'}
@@ -366,8 +366,10 @@ async function createPlaylist() {
});
const result = await response.json();
+ // Handle RADIANCE API wrapper format
+ const data = result.data || result;
- if (result.status === 'success') {
+ if (data.status === 'success') {
alert(`Playlist "${name}" created successfully!`);
document.getElementById('new-playlist-name').value = '';
@@ -375,7 +377,7 @@ async function createPlaylist() {
await new Promise(resolve => setTimeout(resolve, 500));
loadPlaylists();
} else {
- alert('Error creating playlist: ' + result.message);
+ alert('Error creating playlist: ' + data.message);
}
} catch (error) {
console.error('Error creating playlist:', error);
@@ -404,24 +406,28 @@ async function saveQueueAsPlaylist() {
});
const createResult = await createResponse.json();
+ // Handle RADIANCE API wrapper format
+ const createData = createResult.data || createResult;
- if (createResult.status === 'success') {
+ if (createData.status === 'success') {
// Wait a moment for database to update
await new Promise(resolve => setTimeout(resolve, 500));
// Get the new playlist ID by fetching playlists
const playlistsResponse = await fetch('/api/asteroid/playlists');
const playlistsResult = await playlistsResponse.json();
+ // Handle RADIANCE API wrapper format
+ const playlistResultData = playlistsResult.data || playlistsResult;
- if (playlistsResult.status === 'success' && playlistsResult.playlists.length > 0) {
+ if (playlistResultData.status === 'success' && playlistResultData.playlists.length > 0) {
// Find the playlist with matching name (most recent)
- const newPlaylist = playlistsResult.playlists.find(p => p.name === name) ||
- playlistsResult.playlists[playlistsResult.playlists.length - 1];
+ const newPlaylist = playlistResultData.playlists.find(p => p.name === name) ||
+ playlistResultData.playlists[playlistResultData.playlists.length - 1];
// Add all tracks from queue to playlist
let addedCount = 0;
for (const track of playQueue) {
- const trackId = track.id || (Array.isArray(track.id) ? track.id[0] : null);
+ const trackId = track.id;
if (trackId) {
const addFormData = new FormData();
@@ -435,7 +441,7 @@ async function saveQueueAsPlaylist() {
const addResult = await addResponse.json();
- if (addResult.status === 'success') {
+ if (addResult.data?.status === 'success') {
addedCount++;
}
} else {
@@ -446,10 +452,11 @@ async function saveQueueAsPlaylist() {
alert(`Playlist "${name}" created with ${addedCount} tracks!`);
loadPlaylists();
} else {
- alert('Playlist created but could not add tracks. Error: ' + (playlistsResult.message || 'Unknown'));
+ alert('Playlist created but could not add tracks. Error: ' + (playlistResultData.message || 'Unknown'));
+ loadPlaylists();
}
} else {
- alert('Error creating playlist: ' + createResult.message);
+ alert('Error creating playlist: ' + createData.message);
}
} catch (error) {
console.error('Error saving queue as playlist:', error);
@@ -461,11 +468,11 @@ async function loadPlaylists() {
try {
const response = await fetch('/api/asteroid/playlists');
const result = await response.json();
+ // Handle RADIANCE API wrapper format
+ const data = result.data || result;
- if (result.data && result.data.status === 'success') {
- displayPlaylists(result.data.playlists || []);
- } else if (result.status === 'success') {
- displayPlaylists(result.playlists || []);
+ if (data && data.status === 'success') {
+ displayPlaylists(data.playlists || []);
} else {
displayPlaylists([]);
}
@@ -502,9 +509,11 @@ async function loadPlaylist(playlistId) {
try {
const response = await fetch(`/api/asteroid/playlists/get?playlist-id=${playlistId}`);
const result = await response.json();
+ // Handle RADIANCE API wrapper format
+ const data = result.data || result;
- if (result.status === 'success' && result.playlist) {
- const playlist = result.playlist;
+ if (data.status === 'success' && data.playlist) {
+ const playlist = data.playlist;
// Clear current queue
playQueue = [];
@@ -534,7 +543,7 @@ async function loadPlaylist(playlistId) {
alert(`Playlist "${playlist.name}" is empty`);
}
} else {
- alert('Error loading playlist: ' + (result.message || 'Unknown error'));
+ alert('Error loading playlist: ' + (data.message || 'Unknown error'));
}
} catch (error) {
console.error('Error loading playlist:', error);
diff --git a/stream-control.lisp b/stream-control.lisp
index bca504f..8cbfd42 100644
--- a/stream-control.lisp
+++ b/stream-control.lisp
@@ -45,11 +45,8 @@
"Add all tracks from a playlist to the stream queue"
(let ((playlist (get-playlist-by-id playlist-id)))
(when playlist
- (let* ((track-ids-raw (gethash "track-ids" playlist))
- (track-ids-str (if (listp track-ids-raw)
- (first track-ids-raw)
- track-ids-raw))
- (track-ids (if (and track-ids-str
+ (let* ((track-ids-str (dm:field playlist "track-ids"))
+ (track-ids (if (and track-ids-str
(stringp track-ids-str)
(not (string= track-ids-str "")))
(mapcar #'parse-integer
@@ -65,10 +62,7 @@
"Get the file path for a track by ID"
(let ((track (get-track-by-id track-id)))
(when track
- (let ((file-path (gethash "file-path" track)))
- (if (listp file-path)
- (first file-path)
- file-path)))))
+ (dm:field track "file-path"))))
(defun convert-to-docker-path (host-path)
"Convert host file path to Docker container path"
@@ -101,11 +95,10 @@
(asdf:system-source-directory :asteroid))))
(if (null *stream-queue*)
;; If queue is empty, generate from all tracks (fallback)
- (let ((all-tracks (db:select "tracks" (db:query :all))))
+ (let ((all-tracks (dm:get "tracks" (db:query :all))))
(generate-m3u-playlist
- (mapcar (lambda (track)
- (let ((id (gethash "_id" track)))
- (if (listp id) (first id) id)))
+ (mapcar (lambda (track)
+ (dm:id track))
all-tracks)
playlist-path))
;; Generate from queue
@@ -115,11 +108,8 @@
"Export a user playlist to an M3U file"
(let ((playlist (get-playlist-by-id playlist-id)))
(when playlist
- (let* ((track-ids-raw (gethash "track-ids" playlist))
- (track-ids-str (if (listp track-ids-raw)
- (first track-ids-raw)
- track-ids-raw))
- (track-ids (if (and track-ids-str
+ (let* ((track-ids-str (dm:field playlist "track-ids"))
+ (track-ids (if (and track-ids-str
(stringp track-ids-str)
(not (string= track-ids-str "")))
(mapcar #'parse-integer
@@ -128,7 +118,6 @@
(generate-m3u-playlist track-ids output-path)))))
;;; Stream History Management
-
(defun add-to-stream-history (track-id)
"Add a track to the stream history"
(push track-id *stream-history*)
@@ -145,12 +134,11 @@
(defun build-smart-queue (genre &optional (count 20))
"Build a smart queue based on genre"
- (let ((tracks (db:select "tracks" (db:query :all))))
+ (let ((tracks (dm:get "tracks" (db:query :all))))
;; For now, just add random tracks
;; TODO: Implement genre filtering when we have genre metadata
(let ((track-ids (mapcar (lambda (track)
- (let ((id (gethash "_id" track)))
- (if (listp id) (first id) id)))
+ (dm:id track))
tracks)))
(setf *stream-queue* (subseq (alexandria:shuffle track-ids)
0
@@ -160,18 +148,16 @@
(defun build-queue-from-artist (artist-name &optional (count 20))
"Build a queue from tracks by a specific artist"
- (let ((tracks (db:select "tracks" (db:query :all))))
+ (let ((tracks (dm:get "tracks" (db:query :all))))
(let ((matching-tracks
(remove-if-not
(lambda (track)
- (let ((artist (gethash "artist" track)))
+ (let ((artist (dm:field track "artist")))
(when artist
- (let ((artist-str (if (listp artist) (first artist) artist)))
- (search artist-name artist-str :test #'char-equal)))))
+ (search artist-name artist :test #'char-equal))))
tracks)))
(let ((track-ids (mapcar (lambda (track)
- (let ((id (gethash "_id" track)))
- (if (listp id) (first id) id)))
+ (dm:id track))
matching-tracks)))
(setf *stream-queue* (subseq track-ids 0 (min count (length track-ids))))
(regenerate-stream-playlist)
@@ -192,7 +178,7 @@
(let* ((m3u-path (merge-pathnames "stream-queue.m3u"
(asdf:system-source-directory :asteroid)))
(track-ids '())
- (all-tracks (db:select "tracks" (db:query :all))))
+ (all-tracks (dm:get "tracks" (db:query :all))))
(when (probe-file m3u-path)
(with-open-file (stream m3u-path :direction :input)
@@ -206,14 +192,12 @@
;; Find track by file path
(let ((track (find-if
(lambda (trk)
- (let ((fp (gethash "file-path" trk)))
- (let ((file-path (if (listp fp) (first fp) fp)))
- (string= file-path host-path))))
+ (let ((file-path (dm:field trk "file-path")))
+ (string= file-path host-path)))
all-tracks)))
(when track
- (let ((id (gethash "_id" track)))
- (push (if (listp id) (first id) id) track-ids)))))))))
-
+ (push (dm:id track) track-ids))))))))
+
;; Reverse to maintain order from file
(setf track-ids (nreverse track-ids))
(setf *stream-queue* track-ids)
diff --git a/stream-media.lisp b/stream-media.lisp
index e076822..3b8b787 100644
--- a/stream-media.lisp
+++ b/stream-media.lisp
@@ -62,16 +62,17 @@
(defun track-exists-p (file-path)
"Check if a track with the given file path already exists in the database"
;; Try direct query first
- (let ((existing (db:select "tracks" (db:query (:= "file-path" file-path)))))
+ (let ((existing (dm:get "tracks" (db:query (:= "file-path" file-path)))))
(if (> (length existing) 0)
t
;; If not found, search manually (file-path might be stored as list)
- (let ((all-tracks (db:select "tracks" (db:query :all))))
+ (let ((all-tracks (dm:get "tracks" (db:query :all))))
(some (lambda (track)
- (let ((stored-path (gethash "file-path" track)))
+ (let ((stored-path (dm:field track "file-path")))
(or (equal stored-path file-path)
(and (listp stored-path) (equal (first stored-path) file-path)))))
- all-tracks)))))
+ all-tracks)
+ ))))
(defun insert-track-to-database (metadata)
"Insert track metadata into database if it doesn't already exist"
@@ -83,17 +84,17 @@
(let ((file-path (getf metadata :file-path)))
(if (track-exists-p file-path)
nil
- (progn
- (db:insert "tracks"
- (list (list "title" (getf metadata :title))
- (list "artist" (getf metadata :artist))
- (list "album" (getf metadata :album))
- (list "duration" (getf metadata :duration))
- (list "file-path" file-path)
- (list "format" (getf metadata :format))
- (list "bitrate" (getf metadata :bitrate))
- (list "added-date" (local-time:timestamp-to-unix (local-time:now)))
- (list "play-count" 0)))
+ (let ((track (dm:hull "tracks")))
+ (setf (dm:field track "title") (getf metadata :title))
+ (setf (dm:field track "artist") (getf metadata :artist))
+ (setf (dm:field track "album") (getf metadata :album))
+ (setf (dm:field track "duration") (getf metadata :duration))
+ (setf (dm:field track "file-path") file-path)
+ (setf (dm:field track "format") (getf metadata :format))
+ (setf (dm:field track "bitrate") (getf metadata :bitrate))
+ (setf (dm:field track "added-date") (local-time:timestamp-to-unix (local-time:now)))
+ (setf (dm:field track "play-count") 0)
+ (dm:insert track)
t))))
(defun scan-music-library (&optional (directory *music-library-path*))
diff --git a/template/player.ctml b/template/player.ctml
index 22c611e..e305ed5 100644
--- a/template/player.ctml
+++ b/template/player.ctml
@@ -82,7 +82,7 @@