PLAYER: Added generated playlists feature
Build and Publish / Build and Publish Docker Image (push) Successful in 3m5s

This commit is contained in:
ab
2026-05-29 17:04:30 +03:00
parent 496c501076
commit e1a4b6267f
18 changed files with 2628 additions and 446 deletions
+86 -11
View File
@@ -11,6 +11,13 @@
</svg>
</button>
</div>
<div class="info-actions" x-show="$store.info.modal.actions && $store.info.modal.actions.length">
<template x-for="(action, idx) in $store.info.modal.actions" :key="action.label + '-' + idx">
<button class="info-action-btn" type="button" @click.stop.prevent="$store.info.runAction(idx)" :disabled="action.busy === true">
<span x-text="action.busy ? '{{ t.player_resolving }}' : action.label"></span>
</button>
</template>
</div>
<div class="info-modal-body">
<template x-if="$store.info.modal.rows && $store.info.modal.rows.length">
<table class="info-table">
@@ -606,25 +613,93 @@
<template x-if="$store.history.modal">
<div class="modal-overlay" @click.self="$store.history.close()">
<div class="modal-box history-modal">
<h3>{{ t.player_play_history }}</h3>
<p class="torrent-message" :class="{ error: $store.history.error }"
x-text="$store.history.message"></p>
<div class="history-head">
<div>
<h3>{{ t.player_play_history }}</h3>
<p class="torrent-message" :class="{ error: $store.history.error }"
x-text="$store.history.message"></p>
</div>
<button class="mobile-list-action" @click="$store.history.close()" title="{{ t.player_close }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<line x1="18" y1="6" x2="6" y2="18"/>
<line x1="6" y1="6" x2="18" y2="18"/>
</svg>
</button>
</div>
<div class="history-list">
<template x-if="!$store.history.loading && $store.history.items.length === 0">
<div class="empty-state" style="padding:32px 16px">
<p>{{ t.player_no_plays_yet }}</p>
</div>
</template>
<template x-for="item in $store.history.items" :key="item.id">
<div class="history-row">
<div style="min-width:0">
<div class="history-title" x-text="item.track_title"></div>
<div class="history-release" x-text="item.release_title || '{{ t.player_unknown_release }}'"></div>
<template x-if="$store.history.items.length > 0">
<div class="history-table-head">
<span></span>
<span>{{ t.player_title }}</span>
<span>{{ t.player_played_at }}</span>
<span></span>
<span style="text-align:right">{{ t.player_listened }}</span>
</div>
</template>
<template x-for="(item, idx) in $store.history.items" :key="item.id">
<div class="history-row track-row"
:class="{ playing: $store.player.currentTrack && item.track && $store.player.currentTrack.id === item.track.id }"
@dblclick="$store.history.playFrom(idx)">
<button class="history-cover"
@click.stop="$store.history.playFrom(idx)"
:title="item.track?.title || item.track_title">
<template x-if="item.track && item.track.cover_url">
<img :src="item.track.cover_url" :alt="item.track.title" loading="lazy">
</template>
<template x-if="!item.track || !item.track.cover_url">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><rect x="3" y="3" width="18" height="18" rx="2"/><circle cx="12" cy="12" r="4"/></svg>
</template>
</button>
<div class="track-info">
<div class="track-title" x-text="item.track?.title || item.track_title"></div>
<div class="track-artists-inline">
<template x-for="(artist, artistIdx) in $store.library.trackArtistLinks(item.track)" :key="artist.label + '-' + artist.id + '-' + artistIdx">
<span>
<template x-if="artistIdx > 0"><span>, </span></template>
<a class="artist-link" @click.stop="$store.history.close(); $store.library.openArtist(artist.id)" x-text="artist.label"></a>
</span>
</template>
<template x-if="!item.track || !$store.library.trackArtistLinks(item.track).length">
<span x-text="item.release_title || '{{ t.player_unknown_release }}'"></span>
</template>
</div>
<div class="history-release-line">
<a class="artist-link"
x-show="item.track && item.track.release_id"
@click.stop="$store.history.close(); $store.library.openRelease(item.track.release_id)"
x-text="item.track?.release_title || item.release_title || '{{ t.player_unknown_release }}'"></a>
</div>
</div>
<div>
<div class="history-date" x-text="$store.history.date(item.played_at)"></div>
<div class="history-duration" x-text="$store.history.duration(item.duration_listened)"></div>
<div class="history-date" x-text="$store.history.date(item.played_at)"></div>
<div class="track-actions">
<button class="track-action-btn info-btn popularity-info-btn"
:class="{ 'has-popularity': $store.library.hasPopularity(item.track), 'no-popularity': !$store.library.hasPopularity(item.track) }"
:style="$store.library.popularityStyle(item.track)"
@click.stop="$store.library.openTrackInfo(item.track)"
:title="$store.library.trackInfoTitle(item.track)"
aria-label="{{ t.player_track_info }}">
<span x-show="$store.library.hasPopularity(item.track)" x-text="$store.library.popularityLabel(item.track)"></span>
<span x-show="!$store.library.hasPopularity(item.track)" class="info-letter">i</span>
</button>
<button class="like-btn" :class="{ liked: $store.likes.has(item.track_id) }" @click.stop="$store.likes.toggle(item.track_id)" title="{{ t.player_like }}">
<svg viewBox="0 0 24 24" :fill="$store.likes.has(item.track_id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
</button>
<button class="track-action-btn queue-insert-btn queue-next-btn" @click.stop="$store.queue.addNextInQueue([item.track])" title="{{ t.player_play_next }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h10M5 12h7M5 18h10"/><path d="M17 9l4 3-4 3" fill="currentColor" stroke="none"/></svg>
</button>
<button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([item.track])" title="{{ t.player_add_to_queue }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
</button>
<button class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([item.track_id])" title="{{ t.player_add_to_playlist }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
</button>
</div>
<span class="history-duration" x-text="$store.history.duration(item.duration_listened)"></span>
</div>
</template>
</div>
+61 -5
View File
@@ -42,6 +42,8 @@ const T = {
lastfmDisconnectConfirm: "{{ t.player_lastfm_disconnect_confirm }}",
lastfmConnectFailed: "{{ t.player_lastfm_connect_failed }}",
lastfmDisconnectFailed: "{{ t.player_lastfm_disconnect_failed }}",
startRadio: "{{ t.player_start_radio }}",
radioFailed: "{{ t.player_radio_failed }}",
connectionLost: "{{ t.player_connection_lost }}",
connectionLostDetail: "{{ t.player_connection_lost_detail }}",
trackWord: "{{ t.player_tracks_count }}",
@@ -304,27 +306,46 @@ document.addEventListener('alpine:init', () => {
Alpine.store('info', {
modal: null,
open(title, body) {
open(title, body, actions = []) {
if (Array.isArray(body)) {
this.openRows(title, body);
this.openRows(title, body, actions);
return;
}
this.modal = {
title: title || T.info,
body: body || T.noDetails,
rows: null,
actions: actions || [],
};
},
openRows(title, rows) {
openRows(title, rows, actions = []) {
this.modal = {
title: title || T.info,
body: '',
rows: (rows || []).filter(row => row && ((row.value !== undefined && row.value !== null && row.value !== '') || (row.links && row.links.length))),
actions: actions || [],
};
},
close() {
this.modal = null;
},
async runAction(actionOrIndex) {
const index = Number.isInteger(actionOrIndex) ? actionOrIndex : this.modal?.actions?.indexOf(actionOrIndex);
const action = index >= 0 ? this.modal?.actions?.[index] : actionOrIndex;
if (!action || action.busy === true || typeof action.run !== 'function') return;
if (index >= 0 && this.modal?.actions) {
this.modal.actions[index] = { ...action, busy: true };
this.modal.actions = [...this.modal.actions];
}
try {
await action.run();
} finally {
if (index >= 0 && this.modal?.actions?.[index]) {
this.modal.actions[index] = { ...this.modal.actions[index], busy: false };
this.modal.actions = [...this.modal.actions];
}
}
},
navigate(link) {
if (!link || !link.id) return;
this.close();
@@ -488,6 +509,16 @@ document.addEventListener('alpine:init', () => {
return Math.max(1, Math.ceil(this.total / this.perPage));
},
tracks() {
return (this.items || []).map(item => item.track).filter(Boolean);
},
playFrom(index) {
const tracks = this.tracks();
if (!tracks.length || index < 0 || index >= tracks.length) return;
Alpine.store('queue').playRelease(tracks, index);
},
async load(page) {
page = Math.max(1, page || 1);
this.loading = true;
@@ -2117,8 +2148,25 @@ document.addEventListener('alpine:init', () => {
return `${T.lastfmRating}: ${Math.round(value)}\n${this.trackInfo(track)}`;
},
async startRadio(kind, id) {
if (!kind || !id) return;
try {
const res = await fetch(`/api/player/radio/${encodeURIComponent(kind)}/${encodeURIComponent(id)}`);
if (!res.ok) throw new Error('radio failed');
const tracks = await res.json();
if (!Array.isArray(tracks) || tracks.length === 0) throw new Error('radio empty');
Alpine.store('queue').playRelease(tracks, 0);
Alpine.store('info').close();
} catch (err) {
console.warn(err);
window.alert(T.radioFailed);
}
},
openTrackInfo(track) {
Alpine.store('info').openRows(T.trackInfoTitle, this.trackInfoRows(track));
Alpine.store('info').openRows(T.trackInfoTitle, this.trackInfoRows(track), [
{ label: T.startRadio, run: () => this.startRadio('track', track?.id) },
]);
},
uploadersInfo(uploaders) {
@@ -2142,7 +2190,9 @@ document.addEventListener('alpine:init', () => {
},
openReleaseInfo(release) {
Alpine.store('info').openRows(T.releaseInfoTitle, this.releaseInfoRows(release));
Alpine.store('info').openRows(T.releaseInfoTitle, this.releaseInfoRows(release), [
{ label: T.startRadio, run: () => this.startRadio('release', release?.id) },
]);
},
infoLinks(items, type) {
@@ -2230,6 +2280,12 @@ document.addEventListener('alpine:init', () => {
return rows;
},
playArtistTopTracks() {
const tracks = this.currentArtist?.top_tracks || [];
if (!tracks.length) return;
Alpine.store('queue').playRelease(tracks, 0);
},
async openRelease(id, options = {}) {
this._beginNavigation('#release/' + id, options);
this.searchQuery = '';
+11 -2
View File
@@ -570,8 +570,17 @@
<span></span>
<span x-text="$store.library.currentArtist.total_play_count + ' {{ t.player_plays_count }}'"></span>
</div>
<div class="release-actions">
<button class="release-action-btn secondary"
<div class="release-actions artist-actions">
<button class="release-action-btn primary artist-listen-action"
:disabled="!($store.library.currentArtist.top_tracks && $store.library.currentArtist.top_tracks.length)"
@click="$store.library.playArtistTopTracks()"
title="{{ t.player_listen_artist }}">
<svg viewBox="0 0 24 24" fill="currentColor" stroke="none">
<path d="M8 5v14l11-7z"/>
</svg>
<span>{{ t.player_listen }}</span>
</button>
<button class="release-action-btn secondary artist-follow-action"
:class="{ followed: $store.follows.has($store.library.currentArtist.id) }"
@click="$store.follows.toggle($store.library.currentArtist.id)"
:title="$store.follows.has($store.library.currentArtist.id) ? '{{ t.player_unfollow_artist }}' : '{{ t.player_follow_artist }}'">
+211 -15
View File
@@ -911,6 +911,12 @@ button.user-stat:hover {
color: #000;
}
.release-action-btn:disabled {
opacity: 0.45;
cursor: default;
filter: grayscale(0.4);
}
.release-action-btn.secondary {
background: var(--bg-active);
color: var(--text-primary);
@@ -921,6 +927,29 @@ button.user-stat:hover {
color: #000;
}
.artist-actions {
align-items: center;
flex-wrap: wrap;
}
.artist-listen-action {
min-width: 112px;
justify-content: center;
}
.artist-follow-action,
.artist-follow-action.followed {
background: var(--bg-active);
color: var(--text-secondary);
border: 1px solid var(--border-color);
}
.artist-follow-action:hover,
.artist-follow-action.followed:hover {
color: var(--text-primary);
border-color: var(--text-subdued);
}
.artist-follow-card-btn {
position: absolute;
bottom: 8px;
@@ -2212,6 +2241,46 @@ button.user-stat:hover {
margin: 0;
}
.info-actions {
display: flex;
align-items: center;
gap: 8px;
margin: -4px 0 12px;
flex-wrap: wrap;
position: relative;
z-index: 1;
}
.info-action-btn {
display: inline-flex;
align-items: center;
justify-content: center;
min-height: 38px;
padding: 9px 15px;
border: 0;
border-radius: 8px;
background: var(--accent);
color: #061307;
font-size: 13px;
font-weight: 800;
cursor: pointer;
box-shadow: 0 8px 22px rgba(29, 185, 84, 0.2);
transition: background 0.15s, transform 0.15s, box-shadow 0.15s;
}
.info-action-btn:hover {
background: var(--accent-hover);
transform: translateY(-1px);
box-shadow: 0 10px 26px rgba(29, 185, 84, 0.28);
}
.info-action-btn:disabled {
opacity: 0.7;
cursor: default;
transform: none;
box-shadow: none;
}
.info-modal-body {
margin: 0;
padding: 14px;
@@ -2714,36 +2783,87 @@ button.user-stat:hover {
}
.history-modal {
width: min(620px, calc(100vw - 32px));
max-width: 620px;
width: min(980px, calc(100vw - 32px));
max-width: 980px;
}
.history-head {
display: flex;
align-items: flex-start;
justify-content: space-between;
gap: 14px;
}
.history-list {
margin-top: 12px;
overflow-y: auto;
max-height: min(54vh, 460px);
border: 1px solid var(--border-color);
border-radius: 8px;
border-top: 1px solid var(--border-color);
border-bottom: 1px solid var(--border-color);
}
.history-row {
.history-table-head,
.history-row.track-row {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: 8px 12px;
padding: 10px 12px;
grid-template-columns: 48px minmax(0, 1fr) 144px 154px 72px;
align-items: center;
gap: 10px;
}
.history-table-head {
position: sticky;
top: 0;
z-index: 3;
padding: 8px 12px;
background: var(--bg-elevated);
color: var(--text-subdued);
font-size: 11px;
font-weight: 800;
text-transform: uppercase;
}
.history-row.track-row {
padding: 8px 12px;
border-radius: 0;
border-bottom: 1px solid var(--border-color);
}
.history-row:last-child { border-bottom: 0; }
.history-title {
min-width: 0;
color: var(--text-primary);
font-size: 13px;
font-weight: 700;
.history-cover {
width: 40px;
height: 40px;
padding: 0;
border: 0;
border-radius: 5px;
background: var(--bg-active);
color: var(--text-subdued);
overflow: hidden;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
}
.history-cover img {
width: 100%;
height: 100%;
object-fit: cover;
display: block;
}
.history-cover svg {
width: 21px;
height: 21px;
}
.history-release-line {
margin-top: 2px;
color: var(--text-subdued);
font-size: 12px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.history-release,
@@ -2751,14 +2871,16 @@ button.user-stat:hover {
.history-duration {
color: var(--text-subdued);
font-size: 12px;
line-height: 1.35;
}
.history-date,
.history-duration {
text-align: right;
white-space: nowrap;
}
.history-duration { text-align: right; }
.history-pager {
display: flex;
align-items: center;
@@ -3678,6 +3800,44 @@ button.user-stat:hover {
justify-content: flex-end;
}
.history-table-head,
.history-row.track-row {
grid-template-columns: 44px minmax(0, 1fr) auto;
gap: 8px;
}
.history-table-head {
display: none;
}
.history-row.track-row {
padding: 9px 10px;
}
.history-row .history-cover {
grid-row: 1 / span 2;
}
.history-row .track-info {
grid-column: 2;
grid-row: 1;
}
.history-row .history-date {
grid-column: 2;
grid-row: 2;
font-size: 11px;
}
.history-row .track-actions {
grid-column: 3;
grid-row: 1 / span 2;
}
.history-duration {
display: none;
}
.queue-panel {
position: fixed;
left: 12px;
@@ -4478,6 +4638,42 @@ button.user-stat:hover {
max-width: 400px;
}
.history-list {
max-height: min(60dvh, 520px);
}
.history-row.track-row {
grid-template-columns: 42px minmax(0, 1fr) auto;
gap: 8px;
padding: 9px 8px;
}
.history-cover {
width: 38px;
height: 38px;
}
.history-row .track-actions {
gap: 0;
}
.history-row .track-actions .track-action-btn,
.history-row .track-actions .like-btn {
width: 26px;
height: 26px;
flex-basis: 26px;
padding: 5px;
}
.history-row .track-actions .popularity-info-btn {
min-width: 24px;
padding: 0 2px;
}
.history-release-line {
display: none;
}
.info-table th,
.info-table td {
display: block;