pogmommy/feishin
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add conditional for preload functions

Browse source
This commit is contained in:
jeffvli 2022-12-25 01:25:46 -08:00
parent 4614358163
commit 1fbdfe725c
9 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/features/action-required/components/mpv-required.tsx
View file

@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
import isElectron from 'is-electron'; import isElectron from 'is-electron';
import { FileInput, Text, Button } from '/@/renderer/components'; import { FileInput, Text, Button } from '/@/renderer/components';
const localSettings = window.electron.localSettings; const localSettings = isElectron() ? window.electron.localSettings : null;
export const MpvRequired = () => { export const MpvRequired = () => {
const [mpvPath, setMpvPath] = useState(''); const [mpvPath, setMpvPath] = useState('');

2
src/renderer/features/action-required/routes/action-required-route.tsx
View file

@ -12,7 +12,7 @@ import { AnimatedPage } from '/@/renderer/features/shared';
import { AppRoute } from '/@/renderer/router/routes'; import { AppRoute } from '/@/renderer/router/routes';
import { useCurrentServer } from '/@/renderer/store'; import { useCurrentServer } from '/@/renderer/store';
const localSettings = window.electron.localSettings; const localSettings = isElectron() ? window.electron.localSettings : null;
const ActionRequiredRoute = () => { const ActionRequiredRoute = () => {
const currentServer = useCurrentServer(); const currentServer = useCurrentServer();

3
src/renderer/features/now-playing/components/play-queue-list-controls.tsx
View file

@ -2,6 +2,7 @@ import type { MutableRefObject } from 'react';
import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact'; import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
import { Group } from '@mantine/core'; import { Group } from '@mantine/core';
import { Button, Popover, TableConfigDropdown } from '/@/renderer/components'; import { Button, Popover, TableConfigDropdown } from '/@/renderer/components';
import isElectron from 'is-electron';
import { import {
RiArrowDownLine, RiArrowDownLine,
RiArrowUpLine, RiArrowUpLine,
@ -14,7 +15,7 @@ import { Song } from '/@/renderer/api/types';
import { useQueueControls } from '/@/renderer/store'; import { useQueueControls } from '/@/renderer/store';
import { TableType } from '/@/renderer/types'; import { TableType } from '/@/renderer/types';
const mpvPlayer = window.electron.mpvPlayer; const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
interface PlayQueueListOptionsProps { interface PlayQueueListOptionsProps {
tableRef: MutableRefObject<{ grid: AgGridReactType<Song> } | null>; tableRef: MutableRefObject<{ grid: AgGridReactType<Song> } | null>;

3
src/renderer/features/now-playing/components/play-queue.tsx
View file

@ -27,13 +27,14 @@ import {
useTableSettings, useTableSettings,
} from '/@/renderer/store/settings.store'; } from '/@/renderer/store/settings.store';
import { useMergedRef } from '@mantine/hooks'; import { useMergedRef } from '@mantine/hooks';
import isElectron from 'is-electron';
import { ErrorBoundary } from 'react-error-boundary'; import { ErrorBoundary } from 'react-error-boundary';
import { VirtualTable } from '/@/renderer/components/virtual-table'; import { VirtualTable } from '/@/renderer/components/virtual-table';
import { ErrorFallback } from '/@/renderer/features/action-required'; import { ErrorFallback } from '/@/renderer/features/action-required';
import { TableType } from '/@/renderer/types'; import { TableType } from '/@/renderer/types';
import { QueueSong } from '/@/renderer/api/types'; import { QueueSong } from '/@/renderer/api/types';
const mpvPlayer = window.electron.mpvPlayer; const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
type QueueProps = { type QueueProps = {
type: TableType; type: TableType;

3
src/renderer/features/player/hooks/use-handle-playqueue-add.ts
View file

@ -9,8 +9,9 @@ import { useAuthStore, usePlayerStore } from '/@/renderer/store';
import { useSettingsStore } from '/@/renderer/store/settings.store'; import { useSettingsStore } from '/@/renderer/store/settings.store';
import { PlayQueueAddOptions, LibraryItem, Play, PlaybackType } from '/@/renderer/types'; import { PlayQueueAddOptions, LibraryItem, Play, PlaybackType } from '/@/renderer/types';
import { toast } from '/@/renderer/components/toast'; import { toast } from '/@/renderer/components/toast';
import isElectron from 'is-electron';
const mpvPlayer = window.electron.mpvPlayer; const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
export const useHandlePlayQueueAdd = () => { export const useHandlePlayQueueAdd = () => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();

2
src/renderer/features/player/hooks/use-right-controls.ts
View file

@ -2,7 +2,7 @@ import { useEffect } from 'react';
import isElectron from 'is-electron'; import isElectron from 'is-electron';
import { useMuted, usePlayerControls, useVolume } from '/@/renderer/store'; import { useMuted, usePlayerControls, useVolume } from '/@/renderer/store';
const mpvPlayer = window.electron.mpvPlayer; const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
export const useRightControls = () => { export const useRightControls = () => {
const { setVolume, setMuted } = usePlayerControls(); const { setVolume, setMuted } = usePlayerControls();

4
src/renderer/features/settings/components/playback-tab.tsx
View file

@ -18,8 +18,8 @@ import { useCurrentStatus, usePlayerStore } from '/@/renderer/store';
import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store/settings.store'; import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store/settings.store';
import { PlaybackType, PlayerStatus, PlaybackStyle, CrossfadeStyle, Play } from '/@/renderer/types'; import { PlaybackType, PlayerStatus, PlaybackStyle, CrossfadeStyle, Play } from '/@/renderer/types';
const localSettings = window.electron.localSettings; const localSettings = isElectron() ? window.electron.localSettings : null;
const mpvPlayer = window.electron.mpvPlayer; const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
const getAudioDevice = async () => { const getAudioDevice = async () => {
const devices = await navigator.mediaDevices.enumerateDevices(); const devices = await navigator.mediaDevices.enumerateDevices();

2
src/renderer/features/window-controls/components/window-controls.tsx
View file

@ -3,7 +3,7 @@ import isElectron from 'is-electron';
import { RiCheckboxBlankLine, RiCloseLine, RiSubtractLine } from 'react-icons/ri'; import { RiCheckboxBlankLine, RiCloseLine, RiSubtractLine } from 'react-icons/ri';
import styled from 'styled-components'; import styled from 'styled-components';
const browser = window.electron.browser; const browser = isElectron() ? window.electron.browser : null;
interface WindowControlsProps { interface WindowControlsProps {
style?: 'macos' | 'windows' | 'linux'; style?: 'macos' | 'windows' | 'linux';

2
src/renderer/router/app-outlet.tsx
View file

@ -4,7 +4,7 @@ import { Navigate, Outlet, useLocation } from 'react-router-dom';
import { AppRoute } from '/@/renderer/router/routes'; import { AppRoute } from '/@/renderer/router/routes';
import { useCurrentServer } from '/@/renderer/store'; import { useCurrentServer } from '/@/renderer/store';
const localSettings = window.electron.localSettings; const localSettings = isElectron() ? window.electron.localSettings : null;
export const AppOutlet = () => { export const AppOutlet = () => {
const location = useLocation(); const location = useLocation();