🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
fix(ui): always order album tracks by disc and track number (fixes #3720) (#3975)
Deluan Quintãoed7ee3d9f8d8
diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.goindex ebf07ce17..a86c8f668 100644--- a/persistence/mediafile_repository.go+++ b/persistence/mediafile_repository.go@@ -77,7 +77,7 @@ func NewMediaFileRepository(ctx context.Context, db dbx.Builder) model.MediaFile"title": "order_title","artist": "order_artist_name, order_album_name, release_date, disc_number, track_number","album_artist": "order_album_artist_name, order_album_name, release_date, disc_number, track_number",- "album": "order_album_name, release_date, disc_number, track_number, order_artist_name, title",+ "album": "order_album_name, album_id, disc_number, track_number, order_artist_name, title","random": "random","created_at": "media_file.created_at","starred_at": "starred, starred_at",@@ -242,7 +242,7 @@ func (r *mediaFileRepository) MarkMissingByFolder(missing bool, folderIDs ...str// GetMissingAndMatching returns all mediafiles that are missing and their potential matches (comparing PIDs)// that were added/updated after the last scan started. The result is ordered by PID.-// It does not need to load bookmarks, annotations and participnts, as they are not used by the scanner.+// It does not need to load bookmarks, annotations and participants, as they are not used by the scanner.func (r *mediaFileRepository) GetMissingAndMatching(libId int) (model.MediaFileCursor, error) {subQ := r.newSelect().Columns("pid").Where(And{diff --git a/ui/src/album/AlbumSongs.jsx b/ui/src/album/AlbumSongs.jsxindex bfb1a4d6a..d705617e1 100644--- a/ui/src/album/AlbumSongs.jsx+++ b/ui/src/album/AlbumSongs.jsx@@ -185,7 +185,6 @@ const AlbumSongs = (props) => {{...props}hasBulkActions={true}showDiscSubtitles={true}- showReleaseDivider={true}contextAlwaysVisible={!isDesktop}classes={{ row: classes.row }}>diff --git a/ui/src/common/ContextMenus.jsx b/ui/src/common/ContextMenus.jsxindex 855825496..47c9c6786 100644--- a/ui/src/common/ContextMenus.jsx+++ b/ui/src/common/ContextMenus.jsx@@ -231,7 +231,6 @@ export const AlbumContextMenu = (props) =>sort: { field: 'album', order: 'ASC' },filter: {album_id: props.record.id,- release_date: props.releaseDate,disc_number: props.discNumber,missing: false,},diff --git a/ui/src/common/PlayButton.jsx b/ui/src/common/PlayButton.jsxindex 04b36ef5b..d8717236f 100644--- a/ui/src/common/PlayButton.jsx+++ b/ui/src/common/PlayButton.jsx@@ -24,7 +24,6 @@ export const PlayButton = ({ record, size, className }) => {sort: { field: 'album', order: 'ASC' },filter: {album_id: record.id,- release_date: record.releaseDate,disc_number: record.discNumber,},})diff --git a/ui/src/common/SongDatagrid.jsx b/ui/src/common/SongDatagrid.jsxindex 78f580e67..3586cf225 100644--- a/ui/src/common/SongDatagrid.jsx+++ b/ui/src/common/SongDatagrid.jsx@@ -59,59 +59,12 @@ const useStyles = makeStyles({},})-const ReleaseRow = forwardRef(- ({ record, onClick, colSpan, contextAlwaysVisible }, ref) => {- const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md'))- const classes = useStyles({ isDesktop })- const translate = useTranslate()- const handlePlaySubset = (releaseDate) => () => {- onClick(releaseDate)- }-- let releaseTitle = []- if (record.releaseDate) {- releaseTitle.push(translate('resources.album.fields.released'))- releaseTitle.push(formatFullDate(record.releaseDate))- if (record.catalogNum && isDesktop) {- releaseTitle.push('· Cat #')- releaseTitle.push(record.catalogNum)- }- }-- return (- <TableRow- hover- ref={ref}- onClick={handlePlaySubset(record.releaseDate)}- className={classes.row}- >- <TableCell colSpan={colSpan}>- <Typography variant="h6" className={classes.subtitle}>- {releaseTitle.join(' ')}- </Typography>- </TableCell>- <TableCell>- <AlbumContextMenu- record={{ id: record.albumId }}- releaseDate={record.releaseDate}- showLove={false}- className={classes.contextMenu}- visible={contextAlwaysVisible}- />- </TableCell>- </TableRow>- )- },-)--ReleaseRow.displayName = 'ReleaseRow'-const DiscSubtitleRow = forwardRef(({ record, onClick, colSpan, contextAlwaysVisible }, ref) => {const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('md'))const classes = useStyles({ isDesktop })- const handlePlaySubset = (releaseDate, discNumber) => () => {- onClick(releaseDate, discNumber)+ const handlePlaySubset = (discNumber) => () => {+ onClick(discNumber)}let subtitle = []@@ -126,7 +79,7 @@ const DiscSubtitleRow = forwardRef(<TableRowhoverref={ref}- onClick={handlePlaySubset(record.releaseDate, record.discNumber)}+ onClick={handlePlaySubset(record.discNumber)}className={classes.row}><TableCell colSpan={colSpan}>@@ -139,7 +92,6 @@ const DiscSubtitleRow = forwardRef(<AlbumContextMenurecord={{ id: record.albumId }}discNumber={record.discNumber}- releaseDate={record.releaseDate}showLove={false}className={classes.contextMenu}hideShare={true}@@ -158,7 +110,6 @@ export const SongDatagridRow = ({record,children,firstTracksOfDiscs,- firstTracksOfReleases,contextAlwaysVisible,onClickSubset,className,@@ -176,7 +127,6 @@ export const SongDatagridRow = ({discs: [{albumId: record?.albumId,- releaseDate: record?.releaseDate,discNumber: record?.discNumber,},],@@ -209,15 +159,6 @@ export const SongDatagridRow = ({const childCount = fields.lengthreturn (<>- {firstTracksOfReleases.has(record.id) && (- <ReleaseRow- ref={dragDiscRef}- record={record}- onClick={onClickSubset}- contextAlwaysVisible={contextAlwaysVisible}- colSpan={childCount + (rest.expand ? 1 : 0)}- />- )}{firstTracksOfDiscs.has(record.id) && (<DiscSubtitleRowref={dragDiscRef}@@ -244,7 +185,6 @@ SongDatagridRow.propTypes = {record: PropTypes.object,children: PropTypes.node,firstTracksOfDiscs: PropTypes.instanceOf(Set),- firstTracksOfReleases: PropTypes.instanceOf(Set),contextAlwaysVisible: PropTypes.bool,onClickSubset: PropTypes.func,}@@ -256,23 +196,16 @@ SongDatagridRow.defaultProps = {const SongDatagridBody = ({contextAlwaysVisible,showDiscSubtitles,- showReleaseDivider,...rest}) => {const dispatch = useDispatch()const { ids, data } = restconst playSubset = useCallback(- (releaseDate, discNumber) => {+ (discNumber) => {let idsToPlay = []if (discNumber !== undefined) {- idsToPlay = ids.filter(- (id) =>- data[id].releaseDate === releaseDate &&- data[id].discNumber === discNumber,- )- } else {- idsToPlay = ids.filter((id) => data[id].releaseDate === releaseDate)+ idsToPlay = ids.filter((id) => data[id].discNumber === discNumber)}dispatch(playTracks(@@ -297,8 +230,7 @@ const SongDatagridBody = ({foundSubtitle = foundSubtitle || data[id].discSubtitleif (acc.length === 0 ||- (last && data[id].discNumber !== data[last].discNumber) ||- (last && data[id].releaseDate !== data[last].releaseDate)+ (last && data[id].discNumber !== data[last].discNumber)) {acc.push(id)}@@ -311,37 +243,12 @@ const SongDatagridBody = ({return set}, [ids, data, showDiscSubtitles])- const firstTracksOfReleases = useMemo(() => {- if (!ids) {- return new Set()- }- const set = new Set(- ids- .filter((i) => data[i])- .reduce((acc, id) => {- const last = acc && acc[acc.length - 1]- if (- acc.length === 0 ||- (last && data[id].releaseDate !== data[last].releaseDate)- ) {- acc.push(id)- }- return acc- }, []),- )- if (!showReleaseDivider || set.size < 2) {- set.clear()- }- return set- }, [ids, data, showReleaseDivider])-return (<PureDatagridBody{...rest}row={<SongDatagridRowfirstTracksOfDiscs={firstTracksOfDiscs}- firstTracksOfReleases={firstTracksOfReleases}contextAlwaysVisible={contextAlwaysVisible}onClickSubset={playSubset}/>@@ -353,7 +260,6 @@ const SongDatagridBody = ({export const SongDatagrid = ({contextAlwaysVisible,showDiscSubtitles,- showReleaseDivider,...rest}) => {const classes = useStyles()@@ -366,7 +272,6 @@ export const SongDatagrid = ({<SongDatagridBodycontextAlwaysVisible={contextAlwaysVisible}showDiscSubtitles={showDiscSubtitles}- showReleaseDivider={showReleaseDivider}/>}/>@@ -376,6 +281,5 @@ export const SongDatagrid = ({SongDatagrid.propTypes = {contextAlwaysVisible: PropTypes.bool,showDiscSubtitles: PropTypes.bool,- showReleaseDivider: PropTypes.bool,classes: PropTypes.object,}