[slightly less scuffed bugfix]: Update table rating/favorite when updated anywhere …

src/remote/store/index.ts

@@ -175,7 +175,6 @@ export const useRemoteStore = create<SettingsSlice>()(
                                     }
                                     case 'song': {
                                         set((state) => {
-                                            console.log(data);
                                             state.info.song = data;
                                         });
                                         break;

src/renderer/components/virtual-table/index.tsx

@@ -42,6 +42,7 @@ import { NoteCell } from '/@/renderer/components/virtual-table/cells/note-cell';
 import { RowIndexCell } from '/@/renderer/components/virtual-table/cells/row-index-cell';
 import i18n from '/@/i18n/i18n';
 import { formatDateAbsolute, formatDateRelative, formatSizeString } from '/@/renderer/utils/format';
+import { useTableChange } from '/@/renderer/hooks/use-song-change';
 
 export * from './table-config-dropdown';
 export * from './table-pagination';
@@ -475,6 +476,7 @@ export interface VirtualTableProps extends AgGridReactProps {
         pagination: TablePaginationType;
         setPagination: any;
     };
+    shouldUpdateSong?: boolean;
     stickyHeader?: boolean;
     transparentHeader?: boolean;
 }
@@ -492,6 +494,7 @@ export const VirtualTable = forwardRef(
             onGridReady,
             onGridSizeChanged,
             paginationProps,
+            shouldUpdateSong,
             ...rest
         }: VirtualTableProps,
         ref: Ref<AgGridReactType | null>,
@@ -506,6 +509,8 @@ export const VirtualTable = forwardRef(
             }
         });
 
+        useTableChange(tableRef, shouldUpdateSong === true);
+
         const defaultColumnDefs: ColDef = useMemo(() => {
             return {
                 lockPinned: true,

src/renderer/features/albums/components/album-detail-content.tsx

@@ -456,6 +456,7 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                         key={`table-${tableConfig.rowHeight}`}
                         ref={tableRef}
                         autoHeight
+                        shouldUpdateSong
                         stickyHeader
                         suppressCellFocus
                         suppressLoadingOverlay

src/renderer/features/artists/components/album-artist-detail-content.tsx

@@ -560,14 +560,15 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                     autoFitColumns
                                     autoHeight
                                     deselectOnClickOutside
+                                    shouldUpdateSong
                                     stickyHeader
                                     suppressCellFocus
                                     suppressHorizontalScroll
                                     suppressLoadingOverlay
                                     suppressRowDrag
                                     columnDefs={topSongsColumnDefs}
                                     enableCellChangeFlash={false}
-                                    getRowId={(data) => data.data.uniqueId}
+                                    getRowId={(data) => data.data.id}
                                     rowData={topSongs}
                                     rowHeight={60}
                                     rowSelection="multiple"

src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx

@@ -64,8 +64,9 @@ export const AlbumArtistDetailTopSongsListContent = ({
                 <VirtualTable
                     key={`table-${tableProps.rowHeight}-${server?.id}`}
                     ref={tableRef}
+                    shouldUpdateSong
                     {...tableProps}
-                    getRowId={(data) => data.data.uniqueId}
+                    getRowId={(data) => data.data.id}
                     rowClassRules={rowClassRules}
                     rowData={data}
                     rowModelType="clientSide"

src/renderer/features/player/mutations/scrobble-mutation.ts

@@ -4,9 +4,11 @@ import { api } from '/@/renderer/api';
 import { ScrobbleResponse, ScrobbleArgs } from '/@/renderer/api/types';
 import { MutationOptions } from '/@/renderer/lib/react-query';
 import { getServerById, useIncrementQueuePlayCount } from '/@/renderer/store';
+import { usePlayEvent } from '/@/renderer/store/event.store';
 
 export const useSendScrobble = (options?: MutationOptions) => {
     const incrementPlayCount = useIncrementQueuePlayCount();
+    const sendPlayEvent = usePlayEvent();
 
     return useMutation<
         ScrobbleResponse,
@@ -23,6 +25,7 @@ export const useSendScrobble = (options?: MutationOptions) => {
             // Manually increment the play count for the song in the queue if scrobble was submitted
             if (variables.query.submission) {
                 incrementPlayCount([variables.query.id]);
+                sendPlayEvent([variables.query.id]);
             }
         },
         ...options,

src/renderer/features/playlists/components/playlist-detail-content.tsx

@@ -1,5 +1,5 @@
-import { MutableRefObject, useMemo, useRef } from 'react';
-import { ColDef, RowDoubleClickedEvent } from '@ag-grid-community/core';
+import { MutableRefObject, useCallback, useMemo, useRef } from 'react';
+import { ColDef, GetRowIdParams, RowDoubleClickedEvent } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 import { Box, Group } from '@mantine/core';
 import { closeAllModals, openModal } from '@mantine/modals';
@@ -9,7 +9,7 @@ import { generatePath, useNavigate, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { useListStoreByKey } from '../../../store/list.store';
-import { LibraryItem, QueueSong } from '/@/renderer/api/types';
+import { LibraryItem, QueueSong, ServerType } from '/@/renderer/api/types';
 import { Button, ConfirmModal, DropdownMenu, MotionGroup, toast } from '/@/renderer/components';
 import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table';
 import { useCurrentSongRowStyles } from '/@/renderer/components/virtual-table/hooks/use-current-song-row-styles';
@@ -28,6 +28,7 @@ import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer } from '/@/renderer/store';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 import { Play } from '/@/renderer/types';
+import { useScanUpdate } from '/@/renderer/features/playlists/hooks/use-scan-update';
 
 const ContentContainer = styled.div`
     position: relative;
@@ -156,6 +157,18 @@ export const PlaylistDetailContent = ({ tableRef }: PlaylistDetailContentProps)
 
     const loadMoreRef = useRef<HTMLButtonElement | null>(null);
 
+    // Duplicates are only present if on Navidrome
+    const getId = useCallback(
+        (data: GetRowIdParams<any>): string => {
+            return server?.type === ServerType.JELLYFIN
+                ? data.data.id
+                : `${data.data.id}-${data.data.pageIndex}`;
+        },
+        [server?.type],
+    );
+
+    useScanUpdate(server, tableRef);
+
     return (
         <ContentContainer>
             <Group
@@ -221,14 +234,12 @@ export const PlaylistDetailContent = ({ tableRef }: PlaylistDetailContentProps)
                     suppressLoadingOverlay
                     suppressRowDrag
                     columnDefs={columnDefs}
-                    getRowId={(data) => {
-                        // It's possible that there are duplicate song ids in a playlist
-                        return `${data.data.id}-${data.data.pageIndex}`;
-                    }}
+                    getRowId={getId}
                     rowClassRules={rowClassRules}
                     rowData={playlistSongData}
                     rowHeight={60}
                     rowSelection="multiple"
+                    shouldUpdateSong={server?.type === ServerType.JELLYFIN}
                     onCellContextMenu={handleContextMenu}
                     onRowDoubleClicked={handleRowDoubleClick}
                 />

src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx

@@ -1,6 +1,7 @@
 import type {
     BodyScrollEvent,
     ColDef,
+    GetRowIdParams,
     GridReadyEvent,
     IDatasource,
     PaginationChangedEvent,
@@ -19,6 +20,7 @@ import {
     LibraryItem,
     PlaylistSongListQuery,
     QueueSong,
+    ServerType,
     Song,
     SongListSort,
     SortOrder,
@@ -47,6 +49,7 @@ import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 import { ListDisplayType } from '/@/renderer/types';
 import { useAppFocus } from '/@/renderer/hooks';
 import { toast } from '/@/renderer/components';
+import { useScanUpdate } from '/@/renderer/features/playlists/hooks/use-scan-update';
 
 interface PlaylistDetailContentProps {
     tableRef: MutableRefObject<AgGridReactType | null>;
@@ -270,6 +273,16 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten
 
     const { rowClassRules } = useCurrentSongRowStyles({ tableRef });
 
+    // Duplicates are only present if on Navidrome
+    const getId = useCallback(
+        (data: GetRowIdParams<Song>): string => {
+            return server?.type === ServerType.JELLYFIN ? data.data.id : data.data.uniqueId;
+        },
+        [server?.type],
+    );
+
+    useScanUpdate(server, tableRef);
+
     return (
         <>
             <VirtualGridAutoSizerContainer>
@@ -287,7 +300,7 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten
                         onCellContextMenu: handleContextMenu,
                         status,
                     }}
-                    getRowId={(data) => data.data.uniqueId}
+                    getRowId={getId}
                     infiniteInitialRowCount={checkPlaylistList.data?.totalRecordCount || 100}
                     pagination={isPaginationEnabled}
                     paginationAutoPageSize={isPaginationEnabled}
@@ -298,6 +311,7 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten
                     }
                     rowHeight={page.table.rowHeight || 40}
                     rowModelType="infinite"
+                    shouldUpdateSong={server?.type === ServerType.JELLYFIN}
                     onBodyScrollEnd={handleScroll}
                     onCellContextMenu={handleContextMenu}
                     onColumnMoved={handleColumnChange}