eric/pmomusic
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Correction de petits bugs d'interface #40

Merged
eric merged 1 commits from push-ynozoummpwzw into main 2026-01-04 20:52:02 +01:00
Conversation 0 Commits 1 Files Changed 18 +4776 -1895
18 changed files with 4776 additions and 1895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2672
pmoapp/webapp/src/components/PlayListManager.vue
View File

File diff suppressed because it is too large Load Diff

311
pmoapp/webapp/src/components/pmocontrol/ContainerItem.vue
View File

@@ -1,173 +1,260 @@
<script setup lang="ts">
import { computed } from 'vue'
import type { ContainerEntry } from '@/services/pmocontrol/types'
import { Folder, Music } from 'lucide-vue-next'
import ActionMenu from './ActionMenu.vue'
import { computed } from "vue";
import type { ContainerEntry } from "@/services/pmocontrol/types";
import { Folder, Music } from "lucide-vue-next";
import ActionMenu from "./ActionMenu.vue";
const props = defineProps<{
entry: ContainerEntry
serverId: string
showActions?: boolean
}>()
entry: ContainerEntry;
serverId: string;
showActions?: boolean;
}>();
const emit = defineEmits<{
browse: [containerId: string]
playNow: [containerId: string, rendererId: string]
addToQueue: [containerId: string, rendererId: string]
}>()
browse: [containerId: string];
playNow: [containerId: string, rendererId: string];
addToQueue: [containerId: string, rendererId: string];
}>();
const iconComponent = computed(() => {
const cls = props.entry.class.toLowerCase()
if (cls.includes('playlist')) return Music
if (cls.includes('album')) return Music
return Folder
})
const cls = props.entry.class.toLowerCase();
if (cls.includes("playlist")) return Music;
if (cls.includes("album")) return Music;
return Folder;
});
const containerType = computed(() => {
const cls = props.entry.class.toLowerCase()
if (cls.includes('playlist')) return 'Playlist'
if (cls.includes('album')) return 'Album'
if (cls.includes('artist')) return 'Artiste'
if (cls.includes('genre')) return 'Genre'
return 'Dossier'
})
const cls = props.entry.class.toLowerCase();
if (cls.includes("playlist")) return "Playlist";
if (cls.includes("album")) return "Album";
if (cls.includes("artist")) return "Artiste";
if (cls.includes("genre")) return "Genre";
return "Dossier";
});
const isPlayable = computed(() => {
const cls = props.entry.class.toLowerCase();
return cls.includes("playlist") || cls.includes("album");
});
function handleBrowse() {
emit('browse', props.entry.id)
emit("browse", props.entry.id);
}
function handlePlayNow(rendererId: string) {
emit('playNow', props.entry.id, rendererId)
emit("playNow", props.entry.id, rendererId);
}
function handleAddToQueue(rendererId: string) {
emit('addToQueue', props.entry.id, rendererId)
emit("addToQueue", props.entry.id, rendererId);
}
function handleImageError(event: Event) {
const img = event.target as HTMLImageElement;
img.style.display = "none";
const placeholder = img.nextElementSibling;
if (placeholder && placeholder instanceof HTMLElement) {
placeholder.style.display = "flex";
}
}
</script>
<template>
<div class="container-item">
<!-- Main content (clickable) -->
<button class="container-content" @click="handleBrowse">
<div class="container-icon">
<component :is="iconComponent" :size="24" />
</div>
<div class="container-metadata">
<div class="container-title">{{ entry.title }}</div>
<div class="container-details">
<span class="container-type">{{ containerType }}</span>
<span v-if="entry.child_count !== null" class="container-count">
{{ entry.child_count }} élément{{ entry.child_count > 1 ? 's' : '' }}
</span>
</div>
</div>
</button>
<div class="container-item">
<!-- Main content (clickable) -->
<button class="container-content" @click="handleBrowse">
<!-- Cover avec icône de type en overlay -->
<div class="container-cover">
<img
v-if="entry.album_art_uri"
:src="entry.album_art_uri"
:alt="entry.title"
class="cover-image"
loading="lazy"
@error="handleImageError"
/>
<div
class="cover-placeholder"
:style="{
display: entry.album_art_uri ? 'none' : 'flex',
}"
>
<component :is="iconComponent" :size="28" />
</div>
<!-- Petite icône de type dans le coin inférieur droit -->
<div v-if="isPlayable" class="type-badge">
<Folder :size="14" />
</div>
</div>
<!-- Actions menu -->
<div class="container-actions">
<ActionMenu
type="container"
:entry-id="entry.id"
:server-id="serverId"
@play-now="handlePlayNow"
@add-to-queue="handleAddToQueue"
/>
<!-- Métadonnées -->
<div class="container-metadata">
<div class="container-title">{{ entry.title }}</div>
<div class="container-details">
<span v-if="entry.artist" class="container-artist">{{
entry.artist
}}</span>
<span class="container-type">{{ containerType }}</span>
<span
v-if="entry.child_count !== null"
class="container-count"
>
{{ entry.child_count }} élément{{
entry.child_count > 1 ? "s" : ""
}}
</span>
</div>
</div>
</button>
<!-- Actions menu -->
<div class="container-actions">
<ActionMenu
type="container"
:entry-id="entry.id"
:server-id="serverId"
@play-now="handlePlayNow"
@add-to-queue="handleAddToQueue"
/>
</div>
</div>
</div>
</template>
<style scoped>
.container-item {
display: flex;
align-items: center;
gap: var(--spacing-sm);
padding: var(--spacing-sm);
border-radius: var(--radius-md);
transition: background-color var(--transition-fast);
border: 1px solid transparent;
display: flex;
align-items: center;
gap: var(--spacing-sm);
padding: var(--spacing-sm);
border-radius: var(--radius-md);
transition: background-color var(--transition-fast);
border: 1px solid transparent;
}
.container-item:hover {
background-color: var(--color-bg-secondary);
border-color: var(--color-border);
background-color: var(--color-bg-secondary);
border-color: var(--color-border);
}
.container-content {
flex: 1;
display: flex;
align-items: center;
gap: var(--spacing-md);
background: none;
border: none;
padding: 0;
cursor: pointer;
text-align: left;
min-width: 0;
flex: 1;
display: flex;
align-items: center;
gap: var(--spacing-md);
background: none;
border: none;
padding: 0;
cursor: pointer;
text-align: left;
min-width: 0;
}
.container-icon {
flex-shrink: 0;
width: 48px;
height: 48px;
display: flex;
align-items: center;
justify-content: center;
background-color: var(--color-bg-tertiary);
border-radius: var(--radius-sm);
color: var(--color-primary);
/* Cover avec image et icône de type */
.container-cover {
position: relative;
flex-shrink: 0;
width: 64px;
height: 64px;
border-radius: var(--radius-md);
overflow: hidden;
background-color: var(--color-bg-tertiary);
}
.cover-image {
width: 100%;
height: 100%;
object-fit: cover;
}
.cover-placeholder {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
color: var(--color-primary);
}
.type-badge {
position: absolute;
bottom: 4px;
right: 4px;
width: 20px;
height: 20px;
background-color: rgba(0, 0, 0, 0.6);
backdrop-filter: blur(4px);
border-radius: var(--radius-sm);
display: flex;
align-items: center;
justify-content: center;
color: white;
}
/* Métadonnées */
.container-metadata {
flex: 1;
min-width: 0;
flex: 1;
min-width: 0;
display: flex;
flex-direction: column;
gap: var(--spacing-xs);
}
.container-title {
font-size: var(--text-base);
font-weight: 600;
color: var(--color-text);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-bottom: var(--spacing-xs);
font-size: var(--text-base);
font-weight: 600;
color: var(--color-text);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
line-height: 1.3;
}
.container-details {
display: flex;
gap: var(--spacing-sm);
font-size: var(--text-sm);
color: var(--color-text-secondary);
display: flex;
flex-wrap: wrap;
gap: var(--spacing-xs) var(--spacing-sm);
font-size: var(--text-sm);
color: var(--color-text-secondary);
line-height: 1.4;
}
.container-artist {
font-weight: 500;
color: var(--color-text);
}
.container-type {
font-weight: 500;
font-weight: 500;
}
.container-count::before {
content: '•';
margin-right: var(--spacing-sm);
content: "•";
margin-right: var(--spacing-sm);
}
.container-actions {
flex-shrink: 0;
flex-shrink: 0;
}
.btn-icon {
display: flex;
align-items: center;
justify-content: center;
width: 36px;
height: 36px;
background: none;
border: none;
border-radius: var(--radius-sm);
color: var(--color-text-secondary);
cursor: pointer;
transition: all var(--transition-fast);
display: flex;
align-items: center;
justify-content: center;
width: 36px;
height: 36px;
background: none;
border: none;
border-radius: var(--radius-sm);
color: var(--color-text-secondary);
cursor: pointer;
transition: all var(--transition-fast);
}
.btn-icon:hover {
background-color: var(--color-bg-tertiary);
color: var(--color-text);
background-color: var(--color-bg-tertiary);
color: var(--color-text);
}
</style>

1368
pmoapp/webapp/src/components/unified/ServerDrawer.vue
View File

File diff suppressed because it is too large Load Diff

41
pmoapp/webapp/src/services/playlists.ts
View File

@@ -5,6 +5,7 @@ export interface PlaylistSummary {
persistent: boolean;
cover_pk?: string | null;
cover_url?: string | null;
artist?: string | null;
track_count: number;
max_size?: number | null;
default_ttl_secs?: number | null;
@@ -49,6 +50,7 @@ export interface UpdatePlaylistPayload {
max_size?: number | null;
default_ttl_secs?: number | null;
cover_pk?: string | null;
artist?: string | null;
}
export interface AddTracksPayload {
@@ -99,7 +101,9 @@ export async function getPlaylistDetail(id: string): Promise<PlaylistDetail> {
return parseJsonOrThrow(response);
}
export async function createPlaylist(body: CreatePlaylistPayload): Promise<PlaylistDetail> {
export async function createPlaylist(
body: CreatePlaylistPayload,
): Promise<PlaylistDetail> {
const response = await fetch("/api/playlists", {
method: "POST",
headers: {
@@ -112,7 +116,7 @@ export async function createPlaylist(body: CreatePlaylistPayload): Promise<Playl
export async function updatePlaylist(
id: string,
body: UpdatePlaylistPayload
body: UpdatePlaylistPayload,
): Promise<PlaylistDetail> {
const response = await fetch(`/api/playlists/${encodeURIComponent(id)}`, {
method: "PATCH",
@@ -133,31 +137,40 @@ export async function deletePlaylist(id: string): Promise<void> {
export async function addTracksToPlaylist(
id: string,
payload: AddTracksPayload
payload: AddTracksPayload,
): Promise<PlaylistDetail> {
const response = await fetch(`/api/playlists/${encodeURIComponent(id)}/tracks`, {
method: "POST",
headers: {
"Content-Type": "application/json",
const response = await fetch(
`/api/playlists/${encodeURIComponent(id)}/tracks`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
},
body: JSON.stringify(payload),
});
);
return parseJsonOrThrow(response);
}
export async function flushPlaylist(id: string): Promise<PlaylistDetail> {
const response = await fetch(`/api/playlists/${encodeURIComponent(id)}/tracks`, {
method: "DELETE",
});
const response = await fetch(
`/api/playlists/${encodeURIComponent(id)}/tracks`,
{
method: "DELETE",
},
);
return parseJsonOrThrow(response);
}
export async function removeTrackFromPlaylist(id: string, cachePk: string): Promise<PlaylistDetail> {
export async function removeTrackFromPlaylist(
id: string,
cachePk: string,
): Promise<PlaylistDetail> {
const response = await fetch(
`/api/playlists/${encodeURIComponent(id)}/tracks/${encodeURIComponent(cachePk)}`,
{
method: "DELETE",
}
},
);
return parseJsonOrThrow(response);
}

14
pmodidl/src/lib.rs
View File

@@ -141,6 +141,20 @@ pub struct Container {
#[serde(rename = "upnp:class", alias = "class", default)]
pub class: String,
#[serde(
rename = "upnp:artist",
alias = "artist",
skip_serializing_if = "Option::is_none"
)]
pub artist: Option<String>,
#[serde(
rename = "upnp:albumArtURI",
alias = "albumArtURI",
skip_serializing_if = "Option::is_none"
)]
pub album_art: Option<String>,
#[serde(rename = "container", default)]
pub containers: Vec<Container>,

2
pmomediaserver/src/content_handler.rs
View File

@@ -474,6 +474,8 @@ impl ContentHandler {
searchable: Some("1".to_string()),
title: "PMOMusic".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}

2
pmomediaserver/src/source_registry.rs
View File

@@ -252,6 +252,8 @@ mod tests {
searchable: Some("1".to_string()),
title: self.name.clone(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
})

8
pmoparadise/src/source.rs
View File

@@ -364,6 +364,8 @@ impl RadioParadiseSource {
searchable: Some("1".to_string()),
title: descriptor.display_name.to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -379,6 +381,8 @@ impl RadioParadiseSource {
searchable: Some("0".to_string()),
title: format!("{} - Live Playlist", descriptor.display_name),
class: "object.container.playlistContainer".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -435,6 +439,8 @@ impl RadioParadiseSource {
title: format!("{} - History", descriptor.display_name),
// Expose l'historique comme une playlist jouable
class: "object.container.playlistContainer".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -650,6 +656,8 @@ impl MusicSource for RadioParadiseSource {
searchable: Some("1".to_string()),
title: "Radio Paradise".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
})

9
pmoplaylist/src/api.rs
View File

@@ -47,6 +47,8 @@ pub struct PlaylistSummaryResponse {
pub cover_pk: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub cover_url: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub artist: Option<String>,
pub track_count: usize,
pub max_size: Option<usize>,
pub default_ttl_secs: Option<u64>,
@@ -103,6 +105,8 @@ pub struct UpdatePlaylistRequest {
pub default_ttl_secs: Option<Option<u64>>,
/// Utiliser `null` explicite pour supprimer la cover, ou omettre pour ne pas modifier.
pub cover_pk: Option<Option<String>>,
/// Utiliser `null` explicite pour supprimer l'artiste, ou omettre pour ne pas modifier.
pub artist: Option<Option<String>>,
}
/// Requête pour ajouter des morceaux dans une playlist.
@@ -262,6 +266,7 @@ pub async fn update_playlist(
max_size,
default_ttl_secs,
cover_pk,
artist,
} = req;
let manager = crate::manager::PlaylistManager();
@@ -289,6 +294,9 @@ pub async fn update_playlist(
};
writer.set_cover_pk(normalized).await?;
}
if let Some(artist) = artist {
writer.set_artist(artist).await?;
}
manager.playlist_snapshot(&playlist_id).await
}
@@ -545,6 +553,7 @@ impl From<PlaylistOverview> for PlaylistSummaryResponse {
persistent: value.persistent,
cover_pk: cover_pk.clone(),
cover_url: cover_pk.as_deref().map(cover_url_from_pk),
artist: value.artist,
track_count: value.track_count,
max_size: value.max_size,
default_ttl_secs: value.default_ttl.map(|ttl| ttl.as_secs()),

9
pmoplaylist/src/handle/read.rs
View File

@@ -69,6 +69,7 @@ impl ReadHandle {
let title = self.playlist.title().await;
let role = self.playlist.role().await;
let cover_pk = self.playlist.cover_pk().await;
let artist = self.playlist.artist().await;
let core = self.playlist.core.read().await;
let _ = persistence
.save_playlist(
@@ -76,6 +77,7 @@ impl ReadHandle {
&title,
&role,
cover_pk.as_deref(),
artist.as_deref(),
&core.config,
&core.tracks,
)
@@ -175,8 +177,13 @@ impl ReadHandle {
}
let title = self.playlist.title().await;
let artist = self.playlist.artist().await;
let cover_pk = self.playlist.cover_pk().await;
let _remaining = self.remaining().await?;
// Convertir cover_pk en URL si présent
let album_art = cover_pk.map(|pk| format!("/cover/{}", pk));
Ok(Container {
id: self.playlist.id.clone(),
parent_id: "0".to_string(),
@@ -185,6 +192,8 @@ impl ReadHandle {
searchable: Some("0".to_string()),
title,
class: "object.container.playlistContainer".to_string(),
artist,
album_art,
containers: vec![],
items: vec![],
})

19
pmoplaylist/src/handle/write.rs
View File

@@ -309,6 +309,23 @@ impl WriteHandle {
Ok(())
}
/// Met à jour l'artiste associé à la playlist.
pub async fn set_artist(&self, artist: Option<String>) -> Result<()> {
if !self.playlist.is_alive() {
return Err(crate::Error::PlaylistDeleted(self.playlist.id.clone()));
}
self.playlist.set_artist(artist).await;
if self.playlist.persistent {
self.save_to_db().await?;
}
crate::manager::PlaylistManager().notify_playlist_changed(&self.playlist.id);
Ok(())
}
/// Vérifie si la playlist contient déjà un pk
pub async fn contains_pk(&self, cache_pk: &str) -> Result<bool> {
if !self.playlist.is_alive() {
@@ -549,6 +566,7 @@ impl WriteHandle {
let tracks = &core.tracks;
let cover_pk = self.playlist.cover_pk().await;
let artist = self.playlist.artist().await;
persistence
.save_playlist(
@@ -556,6 +574,7 @@ impl WriteHandle {
&title,
&role,
cover_pk.as_deref(),
artist.as_deref(),
config,
tracks,
)

22
pmoplaylist/src/manager.rs
View File

@@ -71,6 +71,7 @@ pub struct PlaylistOverview {
pub role: PlaylistRole,
pub persistent: bool,
pub cover_pk: Option<String>,
pub artist: Option<String>,
pub track_count: usize,
pub max_size: Option<usize>,
pub default_ttl: Option<Duration>,
@@ -205,6 +206,7 @@ impl PlaylistManager {
let title = playlist.title().await;
let role = playlist.role().await;
let cover_pk = playlist.cover_pk().await;
let artist = playlist.artist().await;
let core = playlist.core.read().await;
persistence
.save_playlist(
@@ -212,6 +214,7 @@ impl PlaylistManager {
&title,
&role,
cover_pk.as_deref(),
artist.as_deref(),
&core.config,
&core.tracks,
)
@@ -519,7 +522,7 @@ impl PlaylistManager {
// Pas en mémoire, essayer de charger depuis la DB
if let Some(persistence) = &self.inner.persistence {
if let Some((title, role, config, cover_pk, tracks)) =
if let Some((title, role, config, cover_pk, artist, tracks)) =
persistence.load_playlist(&id).await?
{
// Reconstruire la playlist
@@ -534,6 +537,11 @@ impl PlaylistManager {
cover_pk,
));
// Restaurer l'artiste si présent
if let Some(artist_name) = artist {
playlist.set_artist(Some(artist_name)).await;
}
// Restaurer les tracks
{
let mut core = playlist.core.write().await;
@@ -575,7 +583,7 @@ impl PlaylistManager {
// Pas en m<>moire, essayer de ressusciter depuis la DB
if let Some(persistence) = &self.inner.persistence {
if let Some((title, role, config, cover_pk, tracks)) =
if let Some((title, role, config, cover_pk, artist, tracks)) =
persistence.load_playlist(id).await?
{
// Reconstruire la playlist
@@ -590,6 +598,11 @@ impl PlaylistManager {
cover_pk,
));
// Restaurer l'artiste si présent
if let Some(artist_name) = artist {
playlist.set_artist(Some(artist_name)).await;
}
// Restaurer les tracks
{
let mut core = playlist.core.write().await;
@@ -653,12 +666,15 @@ impl PlaylistManager {
let track_count = core.len();
let config = core.config.clone();
let artist = playlist.artist().await;
Ok(PlaylistOverview {
id: playlist.id.clone(),
title,
role,
persistent,
cover_pk,
artist,
track_count,
max_size: config.max_size,
default_ttl: config.default_ttl,
@@ -978,6 +994,7 @@ impl PlaylistManager {
let title = playlist.title().await;
let role = playlist.role().await;
let cover_pk = playlist.cover_pk().await;
let artist = playlist.artist().await;
let core = playlist.core.read().await;
let _ = persistence
.save_playlist(
@@ -985,6 +1002,7 @@ impl PlaylistManager {
&title,
&role,
cover_pk.as_deref(),
artist.as_deref(),
&core.config,
&core.tracks,
)

24
pmoplaylist/src/persistence/mod.rs
View File

@@ -37,6 +37,7 @@ impl PersistenceManager {
title TEXT NOT NULL,
role TEXT NOT NULL,
cover_pk TEXT,
artist TEXT,
max_size INTEGER,
default_ttl_secs INTEGER,
created_at INTEGER NOT NULL,
@@ -86,6 +87,7 @@ impl PersistenceManager {
title: &str,
role: &PlaylistRole,
cover_pk: Option<&str>,
artist: Option<&str>,
config: &PlaylistConfig,
tracks: &VecDeque<Arc<Record>>,
) -> Result<()> {
@@ -98,15 +100,16 @@ impl PersistenceManager {
// Upsert playlist metadata
conn.execute(
"INSERT OR REPLACE INTO playlists (id, title, role, cover_pk, max_size, default_ttl_secs, created_at, last_modified)
VALUES (?1, ?2, ?3, ?4, ?5, ?6,
COALESCE((SELECT created_at FROM playlists WHERE id = ?1), ?7),
?7)",
"INSERT OR REPLACE INTO playlists (id, title, role, cover_pk, artist, max_size, default_ttl_secs, created_at, last_modified)
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7,
COALESCE((SELECT created_at FROM playlists WHERE id = ?1), ?8),
?8)",
params![
id,
title,
role.as_str(),
cover_pk,
artist,
config.max_size.map(|s| s as i64),
config.default_ttl.map(|d| d.as_secs() as i64),
now_nanos,
@@ -150,6 +153,7 @@ impl PersistenceManager {
PlaylistRole,
PlaylistConfig,
Option<String>,
Option<String>,
VecDeque<Arc<Record>>,
)>,
> {
@@ -157,7 +161,7 @@ impl PersistenceManager {
// Charger les métadonnées
let mut stmt = conn.prepare(
"SELECT title, role, cover_pk, max_size, default_ttl_secs FROM playlists WHERE id = ?1",
"SELECT title, role, cover_pk, artist, max_size, default_ttl_secs FROM playlists WHERE id = ?1",
)
.map_err(|e| {
crate::Error::PersistenceError(format!("Failed to prepare statement: {}", e))
@@ -167,8 +171,9 @@ impl PersistenceManager {
let title: String = row.get(0)?;
let role_raw: String = row.get(1)?;
let cover_pk: Option<String> = row.get(2)?;
let max_size: Option<i64> = row.get(3)?;
let default_ttl_secs: Option<i64> = row.get(4)?;
let artist: Option<String> = row.get(3)?;
let max_size: Option<i64> = row.get(4)?;
let default_ttl_secs: Option<i64> = row.get(5)?;
Ok((
title,
@@ -179,10 +184,11 @@ impl PersistenceManager {
default_ttl: default_ttl_secs.map(|s| Duration::from_secs(s as u64)),
},
cover_pk,
artist,
))
});
let (title, role, config, cover_pk) = match result {
let (title, role, config, cover_pk, artist) = match result {
Ok(data) => data,
Err(rusqlite::Error::QueryReturnedNoRows) => return Ok(None),
Err(e) => {
@@ -225,7 +231,7 @@ impl PersistenceManager {
tracks.push_back(Arc::new(record));
}
Ok(Some((title, role, config, cover_pk, tracks)))
Ok(Some((title, role, config, cover_pk, artist, tracks)))
}
/// Supprime une playlist

13
pmoplaylist/src/playlist/mod.rs
View File

@@ -35,6 +35,7 @@ pub struct Playlist {
title: RwLock<String>,
role: RwLock<PlaylistRole>,
cover_pk: RwLock<Option<String>>,
artist: RwLock<Option<String>>,
state: Arc<AtomicU8>,
pub core: Arc<RwLock<PlaylistCore>>,
pub persistent: bool,
@@ -57,6 +58,7 @@ impl Playlist {
title: RwLock::new(title),
role: RwLock::new(role),
cover_pk: RwLock::new(cover_pk),
artist: RwLock::new(None),
state: Arc::new(AtomicU8::new(PlaylistState::Active as u8)),
core: Arc::new(RwLock::new(PlaylistCore::new(config))),
persistent,
@@ -114,6 +116,17 @@ impl Playlist {
self.touch().await;
}
/// Retourne l'artiste associé à la playlist.
pub async fn artist(&self) -> Option<String> {
self.artist.read().await.clone()
}
/// Modifie l'artiste de la playlist.
pub async fn set_artist(&self, value: Option<String>) {
*self.artist.write().await = value;
self.touch().await;
}
/// Timestamp du dernier changement
pub async fn last_change(&self) -> SystemTime {
*self.last_change.read().await

4
pmoqobuz/src/didl.rs
View File

@@ -40,6 +40,8 @@ impl ToDIDL for Album {
searchable: Some("1".to_string()),
title: self.formatted_title(),
class: "object.container.album.musicAlbum".to_string(),
artist: Some(self.artist.name.clone()),
album_art: self.image_cached.clone().or_else(|| self.image.clone()),
containers: Vec::new(),
items: Vec::new(),
})
@@ -138,6 +140,8 @@ impl ToDIDL for Playlist {
searchable: Some("1".to_string()),
title: self.name.clone(),
class: "object.container.playlistContainer".to_string(),
album_art: self.image_cached.clone().or_else(|| self.image.clone()),
artist: self.owner.as_ref().map(|o| o.name.clone()),
containers: Vec::new(),
items: Vec::new(),
})

124
pmoqobuz/src/source.rs
View File

@@ -568,7 +568,8 @@ impl QobuzSource {
for mut item in items {
// Extraire cache_pk depuis l'URL du resource
let cache_pk = if let Some(resource) = item.resources.first() {
resource.url
resource
.url
.strip_prefix("/audio/flac/")
.map(|s| s.to_string())
} else {
@@ -577,7 +578,11 @@ impl QobuzSource {
if let Some(pk) = cache_pk {
// Récupérer track_id depuis metadata
if let Ok(Some(track_id_value)) = self.inner.cache_manager.get_audio_metadata(&pk, "qobuz_track_id") {
if let Ok(Some(track_id_value)) = self
.inner
.cache_manager
.get_audio_metadata(&pk, "qobuz_track_id")
{
if let Some(track_id) = track_id_value.as_str() {
item.id = format!("qobuz:track:{}", track_id);
} else {
@@ -647,11 +652,7 @@ impl QobuzSource {
// 2. Cache cover
let cover_pk = if let Some(ref image_url) = album.image {
self.inner
.cache_manager
.cache_cover(image_url)
.await
.ok()
self.inner.cache_manager.cache_cover(image_url).await.ok()
} else {
None
};
@@ -685,6 +686,11 @@ impl QobuzSource {
.await
.map_err(|e| MusicSourceError::PlaylistError(e.to_string()))?;
writer
.set_artist(Some(album.artist.name.clone()))
.await
.map_err(|e| MusicSourceError::PlaylistError(e.to_string()))?;
if let Some(pk) = cover_pk {
writer
.set_cover_pk(Some(pk))
@@ -731,6 +737,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Discover Catalog".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -746,6 +754,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Discover Genres".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -761,6 +771,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "My Music".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -776,6 +788,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Albums".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -791,6 +805,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Tracks".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -806,6 +822,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Artists".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -821,6 +839,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Playlists".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -892,6 +912,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: artist.name.clone(),
class: "object.container".to_string(),
artist: Some(artist.name.clone()),
album_art: artist.image_cached.clone().or_else(|| artist.image.clone()),
containers: vec![],
items: vec![],
})
@@ -942,6 +964,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: tag.display_name().to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
});
@@ -959,6 +983,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Playlists".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -973,6 +999,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Albums (Ideal Discography)".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -987,6 +1015,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Albums (Qobuzissime)".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -1001,6 +1031,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Albums (New Releases)".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -1015,6 +1047,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Artists".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -1065,7 +1099,11 @@ impl QobuzSource {
let containers: Vec<Container> = albums
.into_iter()
.filter_map(|album| album.to_didl_container("qobuz:discover:albums:qobuzissime").ok())
.filter_map(|album| {
album
.to_didl_container("qobuz:discover:albums:qobuzissime")
.ok()
})
.collect();
Ok(BrowseResult::Containers(containers))
@@ -1107,6 +1145,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: artist.name.clone(),
class: "object.container".to_string(),
artist: Some(artist.name.clone()),
album_art: artist.image_cached.clone().or_else(|| artist.image.clone()),
containers: vec![],
items: vec![],
})
@@ -1156,6 +1196,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: genre.name.clone(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
})
@@ -1188,6 +1230,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "New Releases".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -1202,6 +1246,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Ideal Discography".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -1216,6 +1262,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Qobuzissime".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -1230,6 +1278,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Editor Picks".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -1244,6 +1294,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Press Awards".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -1258,6 +1310,8 @@ impl QobuzSource {
searchable: Some("1".to_string()),
title: "Qobuz Playlists".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
}
@@ -1392,19 +1446,29 @@ impl QobuzSource {
["qobuz", "discover"] => ObjectIdType::DiscoverCatalog,
["qobuz", "discover", "playlists"] => ObjectIdType::DiscoverPlaylists,
["qobuz", "discover", "albums", "ideal"] => ObjectIdType::DiscoverAlbumsIdeal,
["qobuz", "discover", "albums", "qobuzissime"] => ObjectIdType::DiscoverAlbumsQobuzissime,
["qobuz", "discover", "albums", "qobuzissime"] => {
ObjectIdType::DiscoverAlbumsQobuzissime
}
["qobuz", "discover", "albums", "new"] => ObjectIdType::DiscoverAlbumsNew,
["qobuz", "discover", "artists"] => ObjectIdType::DiscoverArtists,
["qobuz", "discover", "playlists", tag] => ObjectIdType::DiscoverPlaylistsByTag(tag.to_string()),
["qobuz", "discover", "playlists", tag] => {
ObjectIdType::DiscoverPlaylistsByTag(tag.to_string())
}
// Discover Genres
["qobuz", "genres"] => ObjectIdType::DiscoverGenres,
["qobuz", "genre", id] => ObjectIdType::GenreRoot(id.to_string()),
["qobuz", "genre", id, "new-releases"] => ObjectIdType::GenreNewReleases(id.to_string()),
["qobuz", "genre", id, "new-releases"] => {
ObjectIdType::GenreNewReleases(id.to_string())
}
["qobuz", "genre", id, "ideal"] => ObjectIdType::GenreIdealDiscography(id.to_string()),
["qobuz", "genre", id, "qobuzissime"] => ObjectIdType::GenreQobuzissime(id.to_string()),
["qobuz", "genre", id, "editor-picks"] => ObjectIdType::GenreEditorPicks(id.to_string()),
["qobuz", "genre", id, "press-awards"] => ObjectIdType::GenrePressAwards(id.to_string()),
["qobuz", "genre", id, "editor-picks"] => {
ObjectIdType::GenreEditorPicks(id.to_string())
}
["qobuz", "genre", id, "press-awards"] => {
ObjectIdType::GenrePressAwards(id.to_string())
}
["qobuz", "genre", id, "playlists"] => ObjectIdType::GenrePlaylists(id.to_string()),
// Favourites
@@ -1440,13 +1504,13 @@ enum ObjectIdType {
// Discover Genres
DiscoverGenres,
GenreRoot(String), // genre_id
GenreNewReleases(String), // genre_id
GenreIdealDiscography(String), // genre_id
GenreQobuzissime(String), // genre_id
GenreEditorPicks(String), // genre_id
GenrePressAwards(String), // genre_id
GenrePlaylists(String), // genre_id
GenreRoot(String), // genre_id
GenreNewReleases(String), // genre_id
GenreIdealDiscography(String), // genre_id
GenreQobuzissime(String), // genre_id
GenreEditorPicks(String), // genre_id
GenrePressAwards(String), // genre_id
GenrePlaylists(String), // genre_id
// Favourites
Favourites,
@@ -1488,6 +1552,8 @@ impl MusicSource for QobuzSource {
searchable: Some("1".to_string()),
title: "Qobuz".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![
self.build_discover_catalog_container(),
self.build_discover_genres_container(),
@@ -1509,16 +1575,22 @@ impl MusicSource for QobuzSource {
ObjectIdType::DiscoverCatalog => self.browse_discover_catalog().await,
ObjectIdType::DiscoverPlaylists => self.browse_discover_playlists().await,
ObjectIdType::DiscoverAlbumsIdeal => self.browse_discover_albums_ideal().await,
ObjectIdType::DiscoverAlbumsQobuzissime => self.browse_discover_albums_qobuzissime().await,
ObjectIdType::DiscoverAlbumsQobuzissime => {
self.browse_discover_albums_qobuzissime().await
}
ObjectIdType::DiscoverAlbumsNew => self.browse_discover_albums_new().await,
ObjectIdType::DiscoverArtists => self.browse_discover_artists().await,
ObjectIdType::DiscoverPlaylistsByTag(tag) => self.browse_discover_playlists_tag(&tag).await,
ObjectIdType::DiscoverPlaylistsByTag(tag) => {
self.browse_discover_playlists_tag(&tag).await
}
// Discover Genres
ObjectIdType::DiscoverGenres => self.browse_discover_genres().await,
ObjectIdType::GenreRoot(id) => self.browse_genre(&id).await,
ObjectIdType::GenreNewReleases(id) => self.browse_genre_new_releases(&id).await,
ObjectIdType::GenreIdealDiscography(id) => self.browse_genre_ideal_discography(&id).await,
ObjectIdType::GenreIdealDiscography(id) => {
self.browse_genre_ideal_discography(&id).await
}
ObjectIdType::GenreQobuzissime(id) => self.browse_genre_qobuzissime(&id).await,
ObjectIdType::GenreEditorPicks(id) => self.browse_genre_editor_picks(&id).await,
ObjectIdType::GenrePressAwards(id) => self.browse_genre_press_awards(&id).await,
@@ -1952,11 +2024,7 @@ impl MusicSource for QobuzSource {
.get_or_create_album_playlist_items(&album_id, usize::MAX)
.await?;
let items: Vec<Item> = all_items
.into_iter()
.skip(offset)
.take(limit)
.collect();
let items: Vec<Item> = all_items.into_iter().skip(offset).take(limit).collect();
Ok(BrowseResult::Items(items))
}

2027
pmoqobuz/src/source.rs.bak Normal file
View File

File diff suppressed because it is too large Load Diff

2
pmosource/src/lib.rs
View File

@@ -997,6 +997,8 @@ mod tests {
searchable: Some("1".to_string()),
title: "Test Source".to_string(),
class: "object.container".to_string(),
artist: None,
album_art: None,
containers: vec![],
items: vec![],
})