From 15633d07f0c7765c44f53a093c7ddf04a71d19f9 Mon Sep 17 00:00:00 2001 From: jeffvli Date: Sun, 18 Jan 2026 18:32:35 -0800 Subject: [PATCH] remove the Priority queue type --- src/i18n/locales/en.json | 3 - .../analytics/hooks/use-app-tracker.ts | 11 +- .../now-playing/components/play-queue.tsx | 40 +- .../player/components/player-config.tsx | 42 +- src/renderer/store/player.store.ts | 1351 ++++------------- src/shared/types/domain-types.ts | 1 - 6 files changed, 303 insertions(+), 1145 deletions(-) diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json index 6c9ebb9f2..ab9fd13de 100644 --- a/src/i18n/locales/en.json +++ b/src/i18n/locales/en.json @@ -631,9 +631,6 @@ "queue_moveToBottom": "move selected to top", "queue_moveToTop": "move selected to bottom", "queue_remove": "remove selected", - "queueType": "queue type", - "queueType_default": "default", - "queueType_priority": "priority", "repeat": "repeat", "repeat_all": "repeat all", "repeat_off": "repeat disabled", diff --git a/src/renderer/features/analytics/hooks/use-app-tracker.ts b/src/renderer/features/analytics/hooks/use-app-tracker.ts index 07de7d154..fe445c20d 100644 --- a/src/renderer/features/analytics/hooks/use-app-tracker.ts +++ b/src/renderer/features/analytics/hooks/use-app-tracker.ts @@ -19,13 +19,7 @@ import { import { LogCategory, logFn } from '/@/renderer/utils/logger'; import { logMsg } from '/@/renderer/utils/logger-message'; import { LyricSource, ServerType } from '/@/shared/types/domain-types'; -import { - FontType, - Platform, - PlayerQueueType, - PlayerStyle, - PlayerType, -} from '/@/shared/types/types'; +import { FontType, Platform, PlayerStyle, PlayerType } from '/@/shared/types/types'; const utils = isElectron() ? window.api.utils : null; let appTrackerInFlight = false; @@ -64,7 +58,6 @@ type AppTrackerProperties = PlayerProperties & type PlayerProperties = { 'player.mediaSession': boolean; - 'player.queueType': PlayerQueueType; 'player.style': PlayerStyle; 'player.transcoding': boolean; 'player.type': PlayerType; @@ -117,7 +110,6 @@ type SettingsProperties = { const getPlayerProperties = (): Pick< AppTrackerProperties, | 'player.mediaSession' - | 'player.queueType' | 'player.style' | 'player.transcoding' | 'player.type' @@ -128,7 +120,6 @@ const getPlayerProperties = (): Pick< return { 'player.mediaSession': ignoreWeb(playbackSettings.mediaSession), - 'player.queueType': player.player.queueType, 'player.style': player.player.transitionType, 'player.transcoding': playbackSettings.transcode.enabled, 'player.type': ignoreWeb(playbackSettings.type), diff --git a/src/renderer/features/now-playing/components/play-queue.tsx b/src/renderer/features/now-playing/components/play-queue.tsx index 9ce784f7c..f3dbab140 100644 --- a/src/renderer/features/now-playing/components/play-queue.tsx +++ b/src/renderer/features/now-playing/components/play-queue.tsx @@ -1,5 +1,5 @@ import clsx from 'clsx'; -import { forwardRef, ReactElement, useEffect, useMemo, useRef, useState } from 'react'; +import { forwardRef, useEffect, useMemo, useRef, useState } from 'react'; import styles from './play-queue.module.css'; @@ -23,20 +23,18 @@ import { useFollowCurrentSong, useListSettings, usePlayerActions, - usePlayerQueueType, usePlayerSong, usePlayerStore, } from '/@/renderer/store'; import { Flex } from '/@/shared/components/flex/flex'; import { LoadingOverlay } from '/@/shared/components/loading-overlay/loading-overlay'; -import { Text } from '/@/shared/components/text/text'; import { useDebouncedValue } from '/@/shared/hooks/use-debounced-value'; import { useFocusWithin } from '/@/shared/hooks/use-focus-within'; import { useHotkeys } from '/@/shared/hooks/use-hotkeys'; import { useMergedRef } from '/@/shared/hooks/use-merged-ref'; import { Folder, LibraryItem, QueueSong, Song } from '/@/shared/types/domain-types'; import { DragTarget } from '/@/shared/types/drag-and-drop'; -import { ItemListKey, Play, PlayerQueueType } from '/@/shared/types/types'; +import { ItemListKey, Play } from '/@/shared/types/types'; type QueueProps = { enableScrollShadow?: boolean; @@ -52,7 +50,6 @@ export const PlayQueue = forwardRef( const tableRef = useRef(null); const mergedRef = useMergedRef(ref, tableRef); const { getQueue } = usePlayerActions(); - const queueType = usePlayerQueueType(); const followCurrentSong = useFollowCurrentSong(); const [debouncedSearchTerm] = useDebouncedValue(searchTerm, 200); @@ -66,36 +63,7 @@ export const PlayQueue = forwardRef( setData(queue.items); - if ( - queueType === PlayerQueueType.PRIORITY && - queue.groups && - queue.groups.length > 0 - ) { - const transformedGroups: TableGroupHeader[] = queue.groups.map((group) => ({ - itemCount: group.count, - render: (): ReactElement => { - return ( -
- - {group.name} - -
- ); - }, - rowHeight: 40, - })); - setGroups(transformedGroups); - } else { - setGroups([]); - } + setGroups([]); }; const unsub = subscribePlayerQueue(() => { @@ -159,7 +127,7 @@ export const PlayQueue = forwardRef( unsubCurrentTrack(); eventEmitter.off('AUTODJ_QUEUE_ADDED', handleAutoDJQueueAdded); }; - }, [getQueue, queueType, tableRef, followCurrentSong]); + }, [getQueue, tableRef, followCurrentSong]); const filteredData: QueueSong[] = useMemo(() => { if (debouncedSearchTerm) { diff --git a/src/renderer/features/player/components/player-config.tsx b/src/renderer/features/player/components/player-config.tsx index 0983e0ddb..14246d877 100644 --- a/src/renderer/features/player/components/player-config.tsx +++ b/src/renderer/features/player/components/player-config.tsx @@ -8,7 +8,6 @@ import { usePlayerActions, usePlayerData, usePlayerProperties, - usePlayerQueueType, usePlayerSpeed, usePlayerStatus, } from '/@/renderer/store'; @@ -27,13 +26,7 @@ import { Select } from '/@/shared/components/select/select'; import { Slider } from '/@/shared/components/slider/slider'; import { Switch } from '/@/shared/components/switch/switch'; import { toast } from '/@/shared/components/toast/toast'; -import { - CrossfadeStyle, - PlayerQueueType, - PlayerStatus, - PlayerStyle, - PlayerType, -} from '/@/shared/types/types'; +import { CrossfadeStyle, PlayerStatus, PlayerStyle, PlayerType } from '/@/shared/types/types'; const ipc = isElectron() ? window.api.ipc : null; const mpvPlayer = isElectron() ? window.api.mpvPlayer : null; @@ -60,11 +53,10 @@ export const PlayerConfig = () => { const { t } = useTranslation(); const { currentSong } = usePlayerData(); const speed = usePlayerSpeed(); - const queueType = usePlayerQueueType(); const status = usePlayerStatus(); const playbackType = usePlaybackType(); const { crossfadeDuration, crossfadeStyle, transitionType } = usePlayerProperties(); - const { setCrossfadeDuration, setCrossfadeStyle, setQueueType, setSpeed, setTransitionType } = + const { setCrossfadeDuration, setCrossfadeStyle, setSpeed, setTransitionType } = usePlayerActions(); const preservePitch = useSettingsStore((state) => state.playback.preservePitch); const showLyricsInSidebar = useShowLyricsInSidebar(); @@ -130,34 +122,6 @@ export const PlayerConfig = () => { }; const allOptions = [ - { - component: ( - setQueueType(value as PlayerQueueType)} - size="sm" - value={queueType} - w="100%" - /> - ), - id: 'queueType', - label: t('player.queueType', { postProcess: 'titleCase' }), - }, - { - component: null, - id: 'divider-0', - isDivider: true, - label: '', - }, { component: (