third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-16 12:10:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add multidisc labels, even if there are no disc subtitles

Browse Source
This commit is contained in:
Deluan 2020-05-12 13:14:23 -04:00
parent 4355f4fe2d
commit a88270a22b
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ui/src/album/AlbumSongs.js
View File

@ -68,31 +68,6 @@ const trackName = (r) => {
return name
}
const SongDatagridRow = (props) => {
const { record, children } = props
return (
<>
{record.discSubtitle && record.trackNumber === 1 && (
<TableRow>
<TableCell colSpan={children.length + 1}>
<Typography variant="h6">
{record.discSubtitle} (disc {record.discNumber})
</Typography>
</TableCell>
</TableRow>
)}
<DatagridRow {...props} />
</>
)
}
const SongsDatagridBody = (props) => (
<DatagridBody {...props} row={<SongDatagridRow />} />
)
const SongsDatagrid = (props) => (
<Datagrid {...props} body={<SongsDatagridBody />} />
)
const AlbumSongs = (props) => {
const classes = useStyles(props)
const classesToolbar = useStylesListToolbar(props)
@ -101,12 +76,49 @@ const AlbumSongs = (props) => {
const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md'))
const controllerProps = useListController(props)
const { bulkActionButtons, albumId, expand, className } = props
const { data, ids, version } = controllerProps
const { data, ids, version, loaded } = controllerProps
let multiDisc = false
if (loaded) {
const discSet = new Set()
ids.forEach((id) => discSet.add(data[id].discNumber))
multiDisc = discSet.size > 1
console.log(multiDisc, discSet.size)
}
const anySong = data[ids[0]]
const showPlaceholder = !anySong || anySong.albumId !== albumId
const hasBulkActions = props.bulkActionButtons !== false
const SongDatagridRow = (props) => {
const { record, children } = props
return (
<>
{multiDisc && (
<TableRow>
{record.trackNumber === 1 && (
<TableCell colSpan={children.length + 1}>
<Typography variant="h6">
{record.discSubtitle
? `${record.discSubtitle} (disc ${record.discNumber})`
: `Disc ${record.discNumber}`}
</Typography>
</TableCell>
)}
</TableRow>
)}
<DatagridRow {...props} />
</>
)
}
const SongsDatagridBody = (props) => (
<DatagridBody {...props} row={<SongDatagridRow />} />
)
const SongsDatagrid = (props) => (
<Datagrid {...props} body={<SongsDatagridBody />} />
)
return (
<>
<ListToolbar
@ -144,6 +156,7 @@ const AlbumSongs = (props) => {
rowClick={(id) => dispatch(playAlbum(data, ids, id))}
{...controllerProps}
hasBulkActions={hasBulkActions}
multiDisc={multiDisc}
>
{isDesktop && (
<TextField