From 953073cd28b4cccc128672f514e15cb3bd58f616 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Tue, 22 Apr 2025 08:48:34 -0400 Subject: [PATCH] Use index file for apiclient lib imports --- src/apiclient.d.ts | 2 +- src/apps/dashboard/controllers/dashboard.js | 2 +- src/apps/dashboard/routes/branding/index.tsx | 2 +- src/apps/dashboard/routes/libraries/display.tsx | 2 +- src/apps/dashboard/routes/libraries/metadata.tsx | 2 +- src/apps/dashboard/routes/libraries/nfo.tsx | 2 +- src/apps/dashboard/routes/logs/index.tsx | 2 +- src/apps/dashboard/routes/playback/resume.tsx | 2 +- src/apps/dashboard/routes/playback/streaming.tsx | 2 +- src/apps/dashboard/routes/playback/trickplay.tsx | 2 +- src/apps/dashboard/routes/settings/index.tsx | 2 +- src/apps/dashboard/routes/users/parentalcontrol.tsx | 2 +- src/apps/stable/features/playback/utils/image.ts | 2 +- src/apps/stable/features/playback/utils/mediaSegmentManager.ts | 2 +- src/apps/wizard/controllers/finish/index.js | 2 +- src/apps/wizard/controllers/library.js | 2 +- src/apps/wizard/controllers/remote/index.js | 2 +- src/apps/wizard/controllers/settings/index.js | 2 +- src/apps/wizard/controllers/start/index.js | 2 +- src/apps/wizard/controllers/user/index.js | 2 +- src/components/ConnectionRequired.tsx | 3 +-- src/components/ServerContentPage.tsx | 2 +- src/components/activitylog.js | 2 +- src/components/backdrop/backdrop.js | 2 +- src/components/cardbuilder/cardBuilder.js | 2 +- src/components/cardbuilder/chaptercardbuilder.js | 2 +- src/components/channelMapper/channelMapper.js | 2 +- src/components/collectionEditor/collectionEditor.js | 2 +- src/components/displaySettings/displaySettings.js | 2 +- src/components/filterdialog/filterdialog.js | 2 +- src/components/filtermenu/filtermenu.js | 2 +- src/components/groupedcards.js | 2 +- src/components/guide/guide.js | 2 +- src/components/homeScreenSettings/homeScreenSettings.js | 2 +- src/components/homesections/sections/activeRecordings.ts | 2 +- src/components/homesections/sections/liveTv.ts | 2 +- src/components/homesections/sections/nextUp.ts | 2 +- src/components/homesections/sections/recentlyAdded.ts | 2 +- src/components/homesections/sections/resume.ts | 2 +- src/components/imageDownloader/imageDownloader.js | 2 +- src/components/imageUploader/imageUploader.js | 2 +- src/components/imageeditor/imageeditor.js | 2 +- src/components/itemContextMenu.js | 2 +- src/components/itemHelper.js | 2 +- src/components/itemMediaInfo/itemMediaInfo.js | 2 +- src/components/itemidentifier/itemidentifier.js | 2 +- src/components/listview/listview.js | 2 +- src/components/lyricseditor/lyricseditor.js | 2 +- src/components/lyricsuploader/lyricsuploader.js | 2 +- src/components/metadataEditor/metadataEditor.js | 2 +- src/components/multiSelect/multiSelect.js | 2 +- src/components/notifications/notifications.js | 2 +- src/components/nowPlayingBar/nowPlayingBar.js | 2 +- src/components/playback/displayMirrorManager.ts | 2 +- src/components/playback/playbackmanager.js | 2 +- src/components/playback/playersettingsmenu.js | 2 +- src/components/playbackSettings/playbackSettings.js | 2 +- src/components/playerstats/playerstats.js | 2 +- src/components/playlisteditor/playlisteditor.ts | 2 +- src/components/pluginManager.js | 2 +- src/components/recordingcreator/recordingbutton.js | 2 +- src/components/recordingcreator/recordingcreator.js | 2 +- src/components/recordingcreator/recordingeditor.js | 2 +- src/components/recordingcreator/recordingfields.js | 2 +- src/components/recordingcreator/recordinghelper.js | 2 +- src/components/recordingcreator/seriesrecordingeditor.js | 2 +- src/components/refreshdialog/refreshdialog.js | 2 +- src/components/remotecontrol/remotecontrol.js | 2 +- src/components/router/appRouter.js | 2 +- src/components/shortcuts.js | 2 +- src/components/slideshow/slideshow.js | 2 +- src/components/subtitleeditor/subtitleeditor.js | 2 +- src/components/subtitlesettings/subtitlesettings.js | 2 +- src/components/subtitleuploader/subtitleuploader.js | 2 +- src/components/themeMediaPlayer.js | 2 +- src/components/upnextdialog/upnextdialog.js | 2 +- src/components/userdatabuttons/userdatabuttons.js | 2 +- src/controllers/favorites.js | 2 +- src/controllers/hometab.js | 2 +- src/controllers/itemDetails/index.js | 2 +- src/controllers/list.js | 2 +- src/controllers/lyrics.js | 2 +- src/controllers/playback/video/index.js | 2 +- src/controllers/session/addServer/index.js | 3 +-- src/controllers/session/login/index.js | 2 +- src/controllers/session/selectServer/index.js | 3 +-- src/elements/emby-itemscontainer/emby-itemscontainer.js | 2 +- src/elements/emby-playstatebutton/emby-playstatebutton.js | 2 +- src/elements/emby-ratingbutton/emby-ratingbutton.js | 2 +- src/hooks/useApi.tsx | 2 +- src/index.jsx | 2 +- src/lib/jellyfin-apiclient/ServerConnections.js | 3 ++- src/lib/jellyfin-apiclient/index.ts | 3 +++ src/plugins/backdropScreensaver/plugin.js | 2 +- src/plugins/bookPlayer/plugin.js | 2 +- src/plugins/chromecastPlayer/plugin.js | 2 +- src/plugins/comicsPlayer/plugin.js | 2 +- src/plugins/htmlVideoPlayer/plugin.js | 2 +- src/plugins/pdfPlayer/plugin.js | 2 +- src/plugins/photoPlayer/plugin.js | 2 +- src/plugins/playAccessValidation/plugin.js | 2 +- src/plugins/sessionPlayer/plugin.js | 2 +- src/plugins/syncPlay/plugin.ts | 2 +- src/plugins/syncPlay/ui/groupSelectionMenu.js | 2 +- src/scripts/autoBackdrops.js | 2 +- src/scripts/autoThemes.js | 2 +- src/scripts/autocast.js | 2 +- src/scripts/deleteHelper.js | 2 +- src/scripts/itemsByName.js | 2 +- src/scripts/libraryMenu.js | 2 +- src/scripts/playlistViewer.js | 2 +- src/scripts/screensavermanager.js | 2 +- src/scripts/serverNotifications.js | 2 +- src/scripts/taskbutton.js | 2 +- src/utils/dashboard.js | 2 +- 115 files changed, 118 insertions(+), 117 deletions(-) create mode 100644 src/lib/jellyfin-apiclient/index.ts diff --git a/src/apiclient.d.ts b/src/apiclient.d.ts index f250ccfce3..0d8729e7dd 100644 --- a/src/apiclient.d.ts +++ b/src/apiclient.d.ts @@ -67,7 +67,7 @@ declare module 'jellyfin-apiclient' { UtcTimeResponse, VirtualFolderInfo } from '@jellyfin/sdk/lib/generated-client'; - import type { ConnectionState } from 'lib/jellyfin-apiclient/connectionState'; + import type { ConnectionState } from 'lib/jellyfin-apiclient'; class ApiClient { constructor(serverAddress: string, appName: string, appVersion: string, deviceName: string, deviceId: string); diff --git a/src/apps/dashboard/controllers/dashboard.js b/src/apps/dashboard/controllers/dashboard.js index 8b6167182c..2388ac717d 100644 --- a/src/apps/dashboard/controllers/dashboard.js +++ b/src/apps/dashboard/controllers/dashboard.js @@ -22,7 +22,7 @@ import confirm from 'components/confirm/confirm'; import { getDefaultBackgroundClass } from 'components/cardbuilder/cardBuilderUtils'; import { getSystemInfoQuery } from 'hooks/useSystemInfo'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { toApi } from 'utils/jellyfin-apiclient/compat'; import { queryClient } from 'utils/query/queryClient'; diff --git a/src/apps/dashboard/routes/branding/index.tsx b/src/apps/dashboard/routes/branding/index.tsx index e124aba010..26595a50d7 100644 --- a/src/apps/dashboard/routes/branding/index.tsx +++ b/src/apps/dashboard/routes/branding/index.tsx @@ -21,7 +21,7 @@ import Page from 'components/Page'; import { SPLASHSCREEN_URL } from 'constants/branding'; import { useApi } from 'hooks/useApi'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { queryClient } from 'utils/query/queryClient'; import { ActionData } from 'types/actionData'; diff --git a/src/apps/dashboard/routes/libraries/display.tsx b/src/apps/dashboard/routes/libraries/display.tsx index 8dd377e940..9cd0852c9b 100644 --- a/src/apps/dashboard/routes/libraries/display.tsx +++ b/src/apps/dashboard/routes/libraries/display.tsx @@ -16,7 +16,7 @@ import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-a import { QUERY_KEY as CONFIG_QUERY_KEY, useConfiguration } from 'hooks/useConfiguration'; import { QUERY_KEY as NAMED_CONFIG_QUERY_KEY, NamedConfiguration, useNamedConfiguration } from 'hooks/useNamedConfiguration'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom'; import { ActionData } from 'types/actionData'; import { queryClient } from 'utils/query/queryClient'; diff --git a/src/apps/dashboard/routes/libraries/metadata.tsx b/src/apps/dashboard/routes/libraries/metadata.tsx index ae611329b5..122072d4e8 100644 --- a/src/apps/dashboard/routes/libraries/metadata.tsx +++ b/src/apps/dashboard/routes/libraries/metadata.tsx @@ -14,7 +14,7 @@ import Loading from 'components/loading/LoadingComponent'; import Page from 'components/Page'; import { QUERY_KEY, useConfiguration } from 'hooks/useConfiguration'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import React from 'react'; import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom'; import { ActionData } from 'types/actionData'; diff --git a/src/apps/dashboard/routes/libraries/nfo.tsx b/src/apps/dashboard/routes/libraries/nfo.tsx index 65d3bbe109..326834a831 100644 --- a/src/apps/dashboard/routes/libraries/nfo.tsx +++ b/src/apps/dashboard/routes/libraries/nfo.tsx @@ -16,7 +16,7 @@ import SimpleAlert from 'components/SimpleAlert'; import { QUERY_KEY, useNamedConfiguration } from 'hooks/useNamedConfiguration'; import { useUsers } from 'hooks/useUsers'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import React, { useCallback, useState } from 'react'; import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom'; import { ActionData } from 'types/actionData'; diff --git a/src/apps/dashboard/routes/logs/index.tsx b/src/apps/dashboard/routes/logs/index.tsx index 68027807f7..b5d8b0967c 100644 --- a/src/apps/dashboard/routes/logs/index.tsx +++ b/src/apps/dashboard/routes/logs/index.tsx @@ -3,7 +3,7 @@ import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-a import Loading from 'components/loading/LoadingComponent'; import Page from 'components/Page'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Alert from '@mui/material/Alert'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; diff --git a/src/apps/dashboard/routes/playback/resume.tsx b/src/apps/dashboard/routes/playback/resume.tsx index 520c15eaf3..6bd23a8ce7 100644 --- a/src/apps/dashboard/routes/playback/resume.tsx +++ b/src/apps/dashboard/routes/playback/resume.tsx @@ -1,7 +1,7 @@ import React from 'react'; import Page from 'components/Page'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Alert from '@mui/material/Alert'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; diff --git a/src/apps/dashboard/routes/playback/streaming.tsx b/src/apps/dashboard/routes/playback/streaming.tsx index d3d5a3f56c..b3be899d65 100644 --- a/src/apps/dashboard/routes/playback/streaming.tsx +++ b/src/apps/dashboard/routes/playback/streaming.tsx @@ -1,7 +1,7 @@ import React from 'react'; import Page from 'components/Page'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Alert from '@mui/material/Alert'; import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; diff --git a/src/apps/dashboard/routes/playback/trickplay.tsx b/src/apps/dashboard/routes/playback/trickplay.tsx index 05984a0d72..d44814771a 100644 --- a/src/apps/dashboard/routes/playback/trickplay.tsx +++ b/src/apps/dashboard/routes/playback/trickplay.tsx @@ -1,7 +1,7 @@ import React from 'react'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom'; import { QUERY_KEY, useConfiguration } from 'hooks/useConfiguration'; import Page from 'components/Page'; diff --git a/src/apps/dashboard/routes/settings/index.tsx b/src/apps/dashboard/routes/settings/index.tsx index 9ad2486a01..f866146003 100644 --- a/src/apps/dashboard/routes/settings/index.tsx +++ b/src/apps/dashboard/routes/settings/index.tsx @@ -11,7 +11,7 @@ import Page from 'components/Page'; import { QUERY_KEY, useConfiguration } from 'hooks/useConfiguration'; import { useSystemInfo } from 'hooks/useSystemInfo'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import React, { useCallback, useEffect, useState } from 'react'; import { type ActionFunctionArgs, Form, useActionData, useNavigation } from 'react-router-dom'; import SearchIcon from '@mui/icons-material/Search'; diff --git a/src/apps/dashboard/routes/users/parentalcontrol.tsx b/src/apps/dashboard/routes/users/parentalcontrol.tsx index 9129421fbf..c171719b0e 100644 --- a/src/apps/dashboard/routes/users/parentalcontrol.tsx +++ b/src/apps/dashboard/routes/users/parentalcontrol.tsx @@ -17,7 +17,7 @@ import CheckBoxElement from '../../../../elements/CheckBoxElement'; import SelectElement from '../../../../elements/SelectElement'; import Page from '../../../../components/Page'; import prompt from '../../../../components/prompt/prompt'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; type NamedItem = { name: string; diff --git a/src/apps/stable/features/playback/utils/image.ts b/src/apps/stable/features/playback/utils/image.ts index d35f678eee..4497846d9c 100644 --- a/src/apps/stable/features/playback/utils/image.ts +++ b/src/apps/stable/features/playback/utils/image.ts @@ -1,7 +1,7 @@ import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind'; import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import type { ItemDto } from 'types/base/models/item-dto'; interface ImageOptions { diff --git a/src/apps/stable/features/playback/utils/mediaSegmentManager.ts b/src/apps/stable/features/playback/utils/mediaSegmentManager.ts index 85b5b83091..a3bf7e939c 100644 --- a/src/apps/stable/features/playback/utils/mediaSegmentManager.ts +++ b/src/apps/stable/features/playback/utils/mediaSegmentManager.ts @@ -5,7 +5,7 @@ import { getMediaSegmentsApi } from '@jellyfin/sdk/lib/utils/api/media-segments- import type { PlaybackManager } from 'components/playback/playbackmanager'; import { TICKS_PER_MILLISECOND, TICKS_PER_SECOND } from 'constants/time'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { currentSettings as userSettings } from 'scripts/settings/userSettings'; import type { PlayerState } from 'types/playbackStopInfo'; import type { Event } from 'utils/events'; diff --git a/src/apps/wizard/controllers/finish/index.js b/src/apps/wizard/controllers/finish/index.js index 05770cc155..bea7e28e76 100644 --- a/src/apps/wizard/controllers/finish/index.js +++ b/src/apps/wizard/controllers/finish/index.js @@ -1,5 +1,5 @@ import loading from 'components/loading/loading'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; function onFinish() { loading.show(); diff --git a/src/apps/wizard/controllers/library.js b/src/apps/wizard/controllers/library.js index 598fb29a5b..dfa0f17e46 100644 --- a/src/apps/wizard/controllers/library.js +++ b/src/apps/wizard/controllers/library.js @@ -4,7 +4,7 @@ import { getDefaultBackgroundClass } from 'components/cardbuilder/cardBuilderUti import confirm from 'components/confirm/confirm'; import loading from 'components/loading/loading'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import dom from 'scripts/dom'; import taskButton from 'scripts/taskbutton'; import Dashboard, { pageClassOn, pageIdOn } from 'utils/dashboard'; diff --git a/src/apps/wizard/controllers/remote/index.js b/src/apps/wizard/controllers/remote/index.js index 441d67ea11..7b35e2cb66 100644 --- a/src/apps/wizard/controllers/remote/index.js +++ b/src/apps/wizard/controllers/remote/index.js @@ -1,5 +1,5 @@ import loading from 'components/loading/loading'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Dashboard from 'utils/dashboard'; import 'elements/emby-checkbox/emby-checkbox'; diff --git a/src/apps/wizard/controllers/settings/index.js b/src/apps/wizard/controllers/settings/index.js index 6059102358..765530a2bc 100644 --- a/src/apps/wizard/controllers/settings/index.js +++ b/src/apps/wizard/controllers/settings/index.js @@ -1,5 +1,5 @@ import loading from 'components/loading/loading'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Dashboard from 'utils/dashboard'; import 'elements/emby-button/emby-button'; diff --git a/src/apps/wizard/controllers/start/index.js b/src/apps/wizard/controllers/start/index.js index 0311f5da6a..9081a6c527 100644 --- a/src/apps/wizard/controllers/start/index.js +++ b/src/apps/wizard/controllers/start/index.js @@ -1,5 +1,5 @@ import loading from 'components/loading/loading'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Dashboard from 'utils/dashboard'; import dom from 'scripts/dom'; diff --git a/src/apps/wizard/controllers/user/index.js b/src/apps/wizard/controllers/user/index.js index 034f5e27ee..a9255754fc 100644 --- a/src/apps/wizard/controllers/user/index.js +++ b/src/apps/wizard/controllers/user/index.js @@ -1,7 +1,7 @@ import loading from 'components/loading/loading'; import toast from 'components/toast/toast'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Dashboard from 'utils/dashboard'; import 'styles/dashboard.scss'; diff --git a/src/components/ConnectionRequired.tsx b/src/components/ConnectionRequired.tsx index ec4e83907a..e84e86de4a 100644 --- a/src/components/ConnectionRequired.tsx +++ b/src/components/ConnectionRequired.tsx @@ -3,8 +3,7 @@ import { Outlet, useLocation, useNavigate } from 'react-router-dom'; import type { ApiClient, ConnectResponse } from 'jellyfin-apiclient'; import globalize from 'lib/globalize'; -import { ConnectionState } from 'lib/jellyfin-apiclient/connectionState'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ConnectionState, ServerConnections } from 'lib/jellyfin-apiclient'; import alert from './alert'; import Loading from './loading/LoadingComponent'; diff --git a/src/components/ServerContentPage.tsx b/src/components/ServerContentPage.tsx index 152d23cb8f..2400e4fd14 100644 --- a/src/components/ServerContentPage.tsx +++ b/src/components/ServerContentPage.tsx @@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom'; import viewManager from './viewManager/viewManager'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import type { RestoreViewFailResponse } from 'types/viewManager'; interface ServerContentPageProps { diff --git a/src/components/activitylog.js b/src/components/activitylog.js index 4afc28fdb9..cde6c81da8 100644 --- a/src/components/activitylog.js +++ b/src/components/activitylog.js @@ -1,7 +1,7 @@ import escapeHtml from 'escape-html'; import Events from '../utils/events.ts'; import globalize from '../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import dom from '../scripts/dom'; import { formatRelative } from 'date-fns'; import serverNotifications from '../scripts/serverNotifications'; diff --git a/src/components/backdrop/backdrop.js b/src/components/backdrop/backdrop.js index 14d71298e5..cc7346d5fe 100644 --- a/src/components/backdrop/backdrop.js +++ b/src/components/backdrop/backdrop.js @@ -1,5 +1,5 @@ import isEqual from 'lodash-es/isEqual'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import browser from '../../scripts/browser'; import { playbackManager } from '../playback/playbackmanager'; import dom from '../../scripts/dom'; diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 6882a84099..b44b6e104c 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -12,7 +12,7 @@ import browser from 'scripts/browser'; import datetime from 'scripts/datetime'; import dom from 'scripts/dom'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card'; import { getItemTypeIcon, getLibraryIcon } from 'utils/image'; diff --git a/src/components/cardbuilder/chaptercardbuilder.js b/src/components/cardbuilder/chaptercardbuilder.js index 5249e00a4d..f8fa94e6ae 100644 --- a/src/components/cardbuilder/chaptercardbuilder.js +++ b/src/components/cardbuilder/chaptercardbuilder.js @@ -6,7 +6,7 @@ import escapeHtml from 'escape-html'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import datetime from '../../scripts/datetime'; import imageLoader from '../images/imageLoader'; import layoutManager from '../layoutManager'; diff --git a/src/components/channelMapper/channelMapper.js b/src/components/channelMapper/channelMapper.js index 0195aa47ce..91caf81c97 100644 --- a/src/components/channelMapper/channelMapper.js +++ b/src/components/channelMapper/channelMapper.js @@ -3,7 +3,7 @@ import dom from '../../scripts/dom'; import dialogHelper from '../dialogHelper/dialogHelper'; import loading from '../loading/loading'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import actionsheet from '../actionSheet/actionSheet'; import '../../elements/emby-input/emby-input'; import '../../elements/emby-button/paper-icon-button-light'; diff --git a/src/components/collectionEditor/collectionEditor.js b/src/components/collectionEditor/collectionEditor.js index ff4a69abdb..a8981f2b30 100644 --- a/src/components/collectionEditor/collectionEditor.js +++ b/src/components/collectionEditor/collectionEditor.js @@ -5,7 +5,7 @@ import loading from '../loading/loading'; import layoutManager from '../layoutManager'; import { appRouter } from '../router/appRouter'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import '../../elements/emby-button/emby-button'; import '../../elements/emby-button/paper-icon-button-light'; import '../../elements/emby-checkbox/emby-checkbox'; diff --git a/src/components/displaySettings/displaySettings.js b/src/components/displaySettings/displaySettings.js index aea0137b44..21eef9f286 100644 --- a/src/components/displaySettings/displaySettings.js +++ b/src/components/displaySettings/displaySettings.js @@ -6,7 +6,7 @@ import { appHost } from '../apphost'; import focusManager from '../focusManager'; import datetime from '../../scripts/datetime'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import loading from '../loading/loading'; import skinManager from '../../scripts/themeManager'; import { PluginType } from '../../types/plugin.ts'; diff --git a/src/components/filterdialog/filterdialog.js b/src/components/filterdialog/filterdialog.js index 02a0828da1..1e192372f7 100644 --- a/src/components/filterdialog/filterdialog.js +++ b/src/components/filterdialog/filterdialog.js @@ -1,7 +1,7 @@ import dom from '../../scripts/dom'; import dialogHelper from '../dialogHelper/dialogHelper'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import union from 'lodash-es/union'; import Events from '../../utils/events.ts'; import '../../elements/emby-checkbox/emby-checkbox'; diff --git a/src/components/filtermenu/filtermenu.js b/src/components/filtermenu/filtermenu.js index e1891caeb5..a77e7d110e 100644 --- a/src/components/filtermenu/filtermenu.js +++ b/src/components/filtermenu/filtermenu.js @@ -5,7 +5,7 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import inputManager from '../../scripts/inputManager'; import layoutManager from '../layoutManager'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import * as userSettings from '../../scripts/settings/userSettings'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-input/emby-input'; diff --git a/src/components/groupedcards.js b/src/components/groupedcards.js index 1594353baf..1756280ede 100644 --- a/src/components/groupedcards.js +++ b/src/components/groupedcards.js @@ -1,4 +1,4 @@ -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import dom from '../scripts/dom'; import { appRouter } from './router/appRouter'; import Dashboard from '../utils/dashboard'; diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js index ccb1ba06c4..20795ea2df 100644 --- a/src/components/guide/guide.js +++ b/src/components/guide/guide.js @@ -2,7 +2,7 @@ import escapeHtml from 'escape-html'; import inputManager from '../../scripts/inputManager'; import browser from '../../scripts/browser'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Events from '../../utils/events.ts'; import scrollHelper from '../../scripts/scrollHelper'; import serverNotifications from '../../scripts/serverNotifications'; diff --git a/src/components/homeScreenSettings/homeScreenSettings.js b/src/components/homeScreenSettings/homeScreenSettings.js index ea4aefe082..d330c8f223 100644 --- a/src/components/homeScreenSettings/homeScreenSettings.js +++ b/src/components/homeScreenSettings/homeScreenSettings.js @@ -2,7 +2,7 @@ import escapeHtml from 'escape-html'; import { getUserViewsQuery } from 'hooks/useUserViews'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { toApi } from 'utils/jellyfin-apiclient/compat'; import { queryClient } from 'utils/query/queryClient'; diff --git a/src/components/homesections/sections/activeRecordings.ts b/src/components/homesections/sections/activeRecordings.ts index c4bf5f9b1d..72ab3dfe68 100644 --- a/src/components/homesections/sections/activeRecordings.ts +++ b/src/components/homesections/sections/activeRecordings.ts @@ -3,7 +3,7 @@ import type { ApiClient } from 'jellyfin-apiclient'; import cardBuilder from 'components/cardbuilder/cardBuilder'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import type { SectionContainerElement, SectionOptions } from './section'; diff --git a/src/components/homesections/sections/liveTv.ts b/src/components/homesections/sections/liveTv.ts index 140723e7fe..4b8b17cbdb 100644 --- a/src/components/homesections/sections/liveTv.ts +++ b/src/components/homesections/sections/liveTv.ts @@ -6,7 +6,7 @@ import { appRouter } from 'components/router/appRouter'; import cardBuilder from 'components/cardbuilder/cardBuilder'; import layoutManager from 'components/layoutManager'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { getBackdropShape } from 'utils/card'; import type { SectionContainerElement, SectionOptions } from './section'; diff --git a/src/components/homesections/sections/nextUp.ts b/src/components/homesections/sections/nextUp.ts index 0ab23c4bb2..539472bbf0 100644 --- a/src/components/homesections/sections/nextUp.ts +++ b/src/components/homesections/sections/nextUp.ts @@ -5,7 +5,7 @@ import cardBuilder from 'components/cardbuilder/cardBuilder'; import layoutManager from 'components/layoutManager'; import { appRouter } from 'components/router/appRouter'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import type { UserSettings } from 'scripts/settings/userSettings'; import { getBackdropShape } from 'utils/card'; diff --git a/src/components/homesections/sections/recentlyAdded.ts b/src/components/homesections/sections/recentlyAdded.ts index f0b71b9432..5f35ba303e 100644 --- a/src/components/homesections/sections/recentlyAdded.ts +++ b/src/components/homesections/sections/recentlyAdded.ts @@ -9,7 +9,7 @@ import cardBuilder from 'components/cardbuilder/cardBuilder'; import layoutManager from 'components/layoutManager'; import { appRouter } from 'components/router/appRouter'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card'; import type { SectionContainerElement, SectionOptions } from './section'; diff --git a/src/components/homesections/sections/resume.ts b/src/components/homesections/sections/resume.ts index c58ee4a710..bb9215b2bf 100644 --- a/src/components/homesections/sections/resume.ts +++ b/src/components/homesections/sections/resume.ts @@ -4,7 +4,7 @@ import type { ApiClient } from 'jellyfin-apiclient'; import cardBuilder from 'components/cardbuilder/cardBuilder'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import type { UserSettings } from 'scripts/settings/userSettings'; import { getBackdropShape, getPortraitShape } from 'utils/card'; diff --git a/src/components/imageDownloader/imageDownloader.js b/src/components/imageDownloader/imageDownloader.js index 5c82419f8b..b4ddaf85da 100644 --- a/src/components/imageDownloader/imageDownloader.js +++ b/src/components/imageDownloader/imageDownloader.js @@ -7,7 +7,7 @@ import browser from '../../scripts/browser'; import layoutManager from '../layoutManager'; import scrollHelper from '../../scripts/scrollHelper'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-button/paper-icon-button-light'; import '../../elements/emby-button/emby-button'; diff --git a/src/components/imageUploader/imageUploader.js b/src/components/imageUploader/imageUploader.js index b4e84c00ef..1f26dbff31 100644 --- a/src/components/imageUploader/imageUploader.js +++ b/src/components/imageUploader/imageUploader.js @@ -10,7 +10,7 @@ import loading from '../loading/loading'; import scrollHelper from '../../scripts/scrollHelper'; import layoutManager from '../layoutManager'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import '../../elements/emby-button/emby-button'; import '../../elements/emby-select/emby-select'; diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index ab9f1ae933..ab5f7832d4 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -4,7 +4,7 @@ import dom from '../../scripts/dom'; import layoutManager from '../layoutManager'; import focusManager from '../focusManager'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import scrollHelper from '../../scripts/scrollHelper'; import imageLoader from '../images/imageLoader'; import browser from '../../scripts/browser'; diff --git a/src/components/itemContextMenu.js b/src/components/itemContextMenu.js index 9b1368ceb7..959b391d88 100644 --- a/src/components/itemContextMenu.js +++ b/src/components/itemContextMenu.js @@ -2,7 +2,7 @@ import browser from '../scripts/browser'; import { copy } from '../scripts/clipboard'; import dom from '../scripts/dom'; import globalize from '../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import actionsheet from './actionSheet/actionSheet'; import { appHost } from './apphost'; import { appRouter } from './router/appRouter'; diff --git a/src/components/itemHelper.js b/src/components/itemHelper.js index c1e87dea1a..fa8aadbdd5 100644 --- a/src/components/itemHelper.js +++ b/src/components/itemHelper.js @@ -7,7 +7,7 @@ import { getPlaylistsApi } from '@jellyfin/sdk/lib/utils/api/playlists-api'; import { appHost } from './apphost'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { toApi } from 'utils/jellyfin-apiclient/compat'; export function getDisplayName(item, options = {}) { diff --git a/src/components/itemMediaInfo/itemMediaInfo.js b/src/components/itemMediaInfo/itemMediaInfo.js index 95e2af29f8..70c35e8486 100644 --- a/src/components/itemMediaInfo/itemMediaInfo.js +++ b/src/components/itemMediaInfo/itemMediaInfo.js @@ -11,7 +11,7 @@ import toast from '../toast/toast'; import { copy } from '../../scripts/clipboard'; import dom from '../../scripts/dom'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import itemHelper from '../../components/itemHelper'; import loading from '../loading/loading'; import '../../elements/emby-select/emby-select'; diff --git a/src/components/itemidentifier/itemidentifier.js b/src/components/itemidentifier/itemidentifier.js index 2cfebb1f82..b374e47daf 100644 --- a/src/components/itemidentifier/itemidentifier.js +++ b/src/components/itemidentifier/itemidentifier.js @@ -8,7 +8,7 @@ import escapeHtml from 'escape-html'; import dialogHelper from '../dialogHelper/dialogHelper'; import loading from '../loading/loading'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import scrollHelper from '../../scripts/scrollHelper'; import layoutManager from '../layoutManager'; import focusManager from '../focusManager'; diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index d501c31801..5b6c54c2bf 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -10,7 +10,7 @@ import mediaInfo from '../mediainfo/mediainfo'; import indicators from '../indicators/indicators'; import layoutManager from '../layoutManager'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import datetime from '../../scripts/datetime'; import cardBuilder from '../cardbuilder/cardBuilder'; import './listview.scss'; diff --git a/src/components/lyricseditor/lyricseditor.js b/src/components/lyricseditor/lyricseditor.js index 9fcbde190f..bb393ea487 100644 --- a/src/components/lyricseditor/lyricseditor.js +++ b/src/components/lyricseditor/lyricseditor.js @@ -5,7 +5,7 @@ import { toApi } from 'utils/jellyfin-apiclient/compat'; import dialogHelper from '../dialogHelper/dialogHelper'; import layoutManager from '../layoutManager'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import loading from '../loading/loading'; import focusManager from '../focusManager'; import dom from '../../scripts/dom'; diff --git a/src/components/lyricsuploader/lyricsuploader.js b/src/components/lyricsuploader/lyricsuploader.js index 85b5fc692c..6755e4fc01 100644 --- a/src/components/lyricsuploader/lyricsuploader.js +++ b/src/components/lyricsuploader/lyricsuploader.js @@ -8,7 +8,7 @@ import loading from '../../components/loading/loading'; import scrollHelper from '../../scripts/scrollHelper'; import layoutManager from '../layoutManager'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import template from './lyricsuploader.template.html'; import toast from '../toast/toast'; import '../../elements/emby-button/emby-button'; diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js index 912ffef1d6..6dc155a849 100644 --- a/src/components/metadataEditor/metadataEditor.js +++ b/src/components/metadataEditor/metadataEditor.js @@ -6,7 +6,7 @@ import datetime from '../../scripts/datetime'; import loading from '../loading/loading'; import focusManager from '../focusManager'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-input/emby-input'; diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js index 1a0800ae19..95e59d9ca8 100644 --- a/src/components/multiSelect/multiSelect.js +++ b/src/components/multiSelect/multiSelect.js @@ -2,7 +2,7 @@ import browser from '../../scripts/browser'; import { appHost } from '../apphost'; import loading from '../loading/loading'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import dom from '../../scripts/dom'; import './multiSelect.scss'; import alert from '../alert'; diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index 609f96ace8..9edd0ec184 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -2,7 +2,7 @@ import serverNotifications from '../../scripts/serverNotifications'; import { playbackManager } from '../playback/playbackmanager'; import Events from '../../utils/events.ts'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { getItems } from '../../utils/jellyfin-apiclient/getItems.ts'; import NotificationIcon from './notificationicon.png'; diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js index 72f6375d4f..0184cec0b2 100644 --- a/src/components/nowPlayingBar/nowPlayingBar.js +++ b/src/components/nowPlayingBar/nowPlayingBar.js @@ -1,7 +1,7 @@ import { getImageUrl } from 'apps/stable/features/playback/utils/image'; import { getItemTextLines } from 'apps/stable/features/playback/utils/itemText'; import { appRouter, isLyricsPage } from 'components/router/appRouter'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import datetime from '../../scripts/datetime'; import Events from '../../utils/events.ts'; diff --git a/src/components/playback/displayMirrorManager.ts b/src/components/playback/displayMirrorManager.ts index cda68897ae..63d7059f86 100644 --- a/src/components/playback/displayMirrorManager.ts +++ b/src/components/playback/displayMirrorManager.ts @@ -1,5 +1,5 @@ import { getItemQuery } from 'hooks/useItem'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { toApi } from 'utils/jellyfin-apiclient/compat'; import { queryClient } from 'utils/query/queryClient'; diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js index d181e26196..b3c519111e 100644 --- a/src/components/playback/playbackmanager.js +++ b/src/components/playback/playbackmanager.js @@ -24,7 +24,7 @@ import { getItemBackdropImageUrl } from '../../utils/jellyfin-apiclient/backdrop import { PlayerEvent } from 'apps/stable/features/playback/constants/playerEvent'; import { bindMediaSegmentManager } from 'apps/stable/features/playback/utils/mediaSegmentManager'; import { bindMediaSessionSubscriber } from 'apps/stable/features/playback/utils/mediaSessionSubscriber'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { MediaError } from 'types/mediaError'; import { getMediaError } from 'utils/mediaError'; import { toApi } from 'utils/jellyfin-apiclient/compat'; diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js index 8c61349692..5b0aca301f 100644 --- a/src/components/playback/playersettingsmenu.js +++ b/src/components/playback/playersettingsmenu.js @@ -1,7 +1,7 @@ import actionsheet from '../actionSheet/actionSheet'; import { playbackManager } from '../playback/playbackmanager'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import qualityoptions from '../qualityOptions'; function showQualityMenu(player, btn) { diff --git a/src/components/playbackSettings/playbackSettings.js b/src/components/playbackSettings/playbackSettings.js index e67647fcd9..0050e0c666 100644 --- a/src/components/playbackSettings/playbackSettings.js +++ b/src/components/playbackSettings/playbackSettings.js @@ -3,7 +3,7 @@ import escapeHTML from 'escape-html'; import { MediaSegmentAction } from 'apps/stable/features/playback/constants/mediaSegmentAction'; import { getId, getMediaSegmentAction } from 'apps/stable/features/playback/utils/mediaSegmentSettings'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import appSettings from '../../scripts/settings/appSettings'; import { appHost } from '../apphost'; diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js index b67a7c8637..97d4a7afd1 100644 --- a/src/components/playerstats/playerstats.js +++ b/src/components/playerstats/playerstats.js @@ -1,6 +1,6 @@ import '../../elements/emby-button/paper-icon-button-light'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Events from '../../utils/events.ts'; import layoutManager from '../layoutManager'; import { playbackManager } from '../playback/playbackmanager'; diff --git a/src/components/playlisteditor/playlisteditor.ts b/src/components/playlisteditor/playlisteditor.ts index 99836cf9c4..c9d9ac5af1 100644 --- a/src/components/playlisteditor/playlisteditor.ts +++ b/src/components/playlisteditor/playlisteditor.ts @@ -8,7 +8,7 @@ import escapeHtml from 'escape-html'; import toast from 'components/toast/toast'; import dom from 'scripts/dom'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { currentSettings as userSettings } from 'scripts/settings/userSettings'; import { PluginType } from 'types/plugin'; import { toApi } from 'utils/jellyfin-apiclient/compat'; diff --git a/src/components/pluginManager.js b/src/components/pluginManager.js index 811e82a74f..7f9d57dd1b 100644 --- a/src/components/pluginManager.js +++ b/src/components/pluginManager.js @@ -8,7 +8,7 @@ import { appRouter } from './router/appRouter'; import * as inputManager from '../scripts/inputManager'; import toast from '../components/toast/toast'; import confirm from '../components/confirm/confirm'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import * as dashboard from '../utils/dashboard'; // TODO: replace with each plugin version diff --git a/src/components/recordingcreator/recordingbutton.js b/src/components/recordingcreator/recordingbutton.js index b78e3b9f9f..90e266f7e5 100644 --- a/src/components/recordingcreator/recordingbutton.js +++ b/src/components/recordingcreator/recordingbutton.js @@ -1,4 +1,4 @@ -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import dom from '../../scripts/dom'; import recordingHelper from './recordinghelper'; diff --git a/src/components/recordingcreator/recordingcreator.js b/src/components/recordingcreator/recordingcreator.js index cc040aa641..14a4c6d0d5 100644 --- a/src/components/recordingcreator/recordingcreator.js +++ b/src/components/recordingcreator/recordingcreator.js @@ -1,6 +1,6 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import layoutManager from '../layoutManager'; import mediaInfo from '../mediainfo/mediainfo'; import loading from '../loading/loading'; diff --git a/src/components/recordingcreator/recordingeditor.js b/src/components/recordingcreator/recordingeditor.js index af71d102d8..e35d98024c 100644 --- a/src/components/recordingcreator/recordingeditor.js +++ b/src/components/recordingcreator/recordingeditor.js @@ -1,7 +1,7 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import layoutManager from '../layoutManager'; import loading from '../loading/loading'; import scrollHelper from '../../scripts/scrollHelper'; diff --git a/src/components/recordingcreator/recordingfields.js b/src/components/recordingcreator/recordingfields.js index b443698d18..a1d3103c8d 100644 --- a/src/components/recordingcreator/recordingfields.js +++ b/src/components/recordingcreator/recordingfields.js @@ -1,5 +1,5 @@ import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Events from '../../utils/events.ts'; import serverNotifications from '../../scripts/serverNotifications'; import loading from '../loading/loading'; diff --git a/src/components/recordingcreator/recordinghelper.js b/src/components/recordingcreator/recordinghelper.js index 55aa52c0cf..a251590a30 100644 --- a/src/components/recordingcreator/recordinghelper.js +++ b/src/components/recordingcreator/recordinghelper.js @@ -1,5 +1,5 @@ import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import loading from '../loading/loading'; import toast from '../toast/toast'; import confirm from '../confirm/confirm'; diff --git a/src/components/recordingcreator/seriesrecordingeditor.js b/src/components/recordingcreator/seriesrecordingeditor.js index ccc2d69403..6580b03aff 100644 --- a/src/components/recordingcreator/seriesrecordingeditor.js +++ b/src/components/recordingcreator/seriesrecordingeditor.js @@ -1,6 +1,6 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import layoutManager from '../layoutManager'; import loading from '../loading/loading'; import scrollHelper from '../../scripts/scrollHelper'; diff --git a/src/components/refreshdialog/refreshdialog.js b/src/components/refreshdialog/refreshdialog.js index 67f4bd4a49..721ba36e6f 100644 --- a/src/components/refreshdialog/refreshdialog.js +++ b/src/components/refreshdialog/refreshdialog.js @@ -3,7 +3,7 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import loading from '../loading/loading'; import layoutManager from '../layoutManager'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import '../../elements/emby-input/emby-input'; import '../../elements/emby-button/emby-button'; diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 76beb45ab8..a2d32ed24d 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -11,7 +11,7 @@ import { playbackManager } from '../playback/playbackmanager'; import Events from '../../utils/events.ts'; import { appHost } from '../apphost'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import layoutManager from '../layoutManager'; import * as userSettings from '../../scripts/settings/userSettings'; import itemContextMenu from '../itemContextMenu'; diff --git a/src/components/router/appRouter.js b/src/components/router/appRouter.js index 23013117be..032ddfaf1e 100644 --- a/src/components/router/appRouter.js +++ b/src/components/router/appRouter.js @@ -7,7 +7,7 @@ import loading from '../loading/loading'; import alert from '../alert'; import { getItemQuery } from 'hooks/useItem'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { toApi } from 'utils/jellyfin-apiclient/compat'; import { queryClient } from 'utils/query/queryClient'; import { history } from 'RootAppRouter'; diff --git a/src/components/shortcuts.js b/src/components/shortcuts.js index 82386c503f..1ff18ef231 100644 --- a/src/components/shortcuts.js +++ b/src/components/shortcuts.js @@ -8,7 +8,7 @@ import { playbackManager } from './playback/playbackmanager'; import inputManager from '../scripts/inputManager'; import { appRouter } from './router/appRouter'; import globalize from '../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import dom from '../scripts/dom'; import recordingHelper from './recordingcreator/recordinghelper'; import toast from './toast/toast'; diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js index 6b223c1405..49bf8dc1e2 100644 --- a/src/components/slideshow/slideshow.js +++ b/src/components/slideshow/slideshow.js @@ -3,7 +3,7 @@ * @module components/slideshow/slideshow */ import dialogHelper from '../dialogHelper/dialogHelper'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import inputManager from '../../scripts/inputManager'; import layoutManager from '../layoutManager'; import focusManager from '../focusManager'; diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js index 2941f0078e..fa4d71e846 100644 --- a/src/components/subtitleeditor/subtitleeditor.js +++ b/src/components/subtitleeditor/subtitleeditor.js @@ -3,7 +3,7 @@ import { appHost } from '../apphost'; import dialogHelper from '../dialogHelper/dialogHelper'; import layoutManager from '../layoutManager'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import * as userSettings from '../../scripts/settings/userSettings'; import loading from '../loading/loading'; import focusManager from '../focusManager'; diff --git a/src/components/subtitlesettings/subtitlesettings.js b/src/components/subtitlesettings/subtitlesettings.js index b335b877e9..ee8b2c3ed1 100644 --- a/src/components/subtitlesettings/subtitlesettings.js +++ b/src/components/subtitlesettings/subtitlesettings.js @@ -1,5 +1,5 @@ import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { appHost } from '../apphost'; import appSettings from '../../scripts/settings/appSettings'; import focusManager from '../focusManager'; diff --git a/src/components/subtitleuploader/subtitleuploader.js b/src/components/subtitleuploader/subtitleuploader.js index 9b363576f6..f707265777 100644 --- a/src/components/subtitleuploader/subtitleuploader.js +++ b/src/components/subtitleuploader/subtitleuploader.js @@ -8,7 +8,7 @@ import loading from '../../components/loading/loading'; import scrollHelper from '../../scripts/scrollHelper'; import layoutManager from '../layoutManager'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import template from './subtitleuploader.template.html'; import toast from '../toast/toast'; diff --git a/src/components/themeMediaPlayer.js b/src/components/themeMediaPlayer.js index 33a50dc705..c8c267532b 100644 --- a/src/components/themeMediaPlayer.js +++ b/src/components/themeMediaPlayer.js @@ -3,7 +3,7 @@ import { MediaType } from '@jellyfin/sdk/lib/generated-client/models/media-type' import { getLibraryApi } from '@jellyfin/sdk/lib/utils/api/library-api'; import { getItemQuery } from 'hooks/useItem'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { currentSettings as userSettings } from 'scripts/settings/userSettings'; import { ItemKind } from 'types/base/models/item-kind'; import Events from 'utils/events.ts'; diff --git a/src/components/upnextdialog/upnextdialog.js b/src/components/upnextdialog/upnextdialog.js index 061fac20be..7bb40943d4 100644 --- a/src/components/upnextdialog/upnextdialog.js +++ b/src/components/upnextdialog/upnextdialog.js @@ -5,7 +5,7 @@ import mediaInfo from '../mediainfo/mediainfo'; import layoutManager from '../layoutManager'; import focusManager from '../focusManager'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import itemHelper from '../itemHelper'; import './upnextdialog.scss'; diff --git a/src/components/userdatabuttons/userdatabuttons.js b/src/components/userdatabuttons/userdatabuttons.js index 16ab8b755f..453664e398 100644 --- a/src/components/userdatabuttons/userdatabuttons.js +++ b/src/components/userdatabuttons/userdatabuttons.js @@ -1,5 +1,5 @@ import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import dom from '../../scripts/dom'; import itemHelper from '../itemHelper'; diff --git a/src/controllers/favorites.js b/src/controllers/favorites.js index 84d79ea382..b926859f0a 100644 --- a/src/controllers/favorites.js +++ b/src/controllers/favorites.js @@ -4,7 +4,7 @@ import layoutManager from 'components/layoutManager'; import { appRouter } from 'components/router/appRouter'; import dom from 'scripts/dom'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card'; import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by'; diff --git a/src/controllers/hometab.js b/src/controllers/hometab.js index aeabb131f9..15aefabb81 100644 --- a/src/controllers/hometab.js +++ b/src/controllers/hometab.js @@ -2,7 +2,7 @@ import * as userSettings from '../scripts/settings/userSettings'; import loading from '../components/loading/loading'; import focusManager from '../components/focusManager'; import homeSections from '../components/homesections/homesections'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import '../elements/emby-itemscontainer/emby-itemscontainer'; diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js index 1c4088d316..122b6a7c33 100644 --- a/src/controllers/itemDetails/index.js +++ b/src/controllers/itemDetails/index.js @@ -22,7 +22,7 @@ import { playbackManager } from 'components/playback/playbackmanager'; import { appRouter } from 'components/router/appRouter'; import itemShortcuts from 'components/shortcuts'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import browser from 'scripts/browser'; import datetime from 'scripts/datetime'; import dom from 'scripts/dom'; diff --git a/src/controllers/list.js b/src/controllers/list.js index b1a772cb6f..2c3d09019e 100644 --- a/src/controllers/list.js +++ b/src/controllers/list.js @@ -8,7 +8,7 @@ import AlphaNumericShortcuts from '../scripts/alphanumericshortcuts'; import libraryBrowser from '../scripts/libraryBrowser'; import { playbackManager } from '../components/playback/playbackmanager'; import AlphaPicker from '../components/alphaPicker/alphaPicker'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import '../elements/emby-itemscontainer/emby-itemscontainer'; import '../elements/emby-scroller/emby-scroller'; import LibraryMenu from '../scripts/libraryMenu'; diff --git a/src/controllers/lyrics.js b/src/controllers/lyrics.js index 98aa74e8a8..36ae408bcd 100644 --- a/src/controllers/lyrics.js +++ b/src/controllers/lyrics.js @@ -9,7 +9,7 @@ import focusManager from 'components/focusManager'; import keyboardNavigation from 'scripts/keyboardNavigation'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import LibraryMenu from 'scripts/libraryMenu'; import Events from 'utils/events'; diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index 192c1b9f1c..e0d51005f4 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -22,7 +22,7 @@ import '../../../styles/videoosd.scss'; import shell from '../../../scripts/shell'; import SubtitleSync from '../../../components/subtitlesync/subtitlesync'; import { appRouter } from '../../../components/router/appRouter'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import LibraryMenu from '../../../scripts/libraryMenu'; import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components/backdrop/backdrop'; import { pluginManager } from '../../../components/pluginManager'; diff --git a/src/controllers/session/addServer/index.js b/src/controllers/session/addServer/index.js index bf76d5099b..68b14e8909 100644 --- a/src/controllers/session/addServer/index.js +++ b/src/controllers/session/addServer/index.js @@ -1,7 +1,6 @@ import loading from 'components/loading/loading'; import globalize from 'lib/globalize'; -import { ConnectionState } from 'lib/jellyfin-apiclient/connectionState'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ConnectionState, ServerConnections } from 'lib/jellyfin-apiclient'; import appSettings from 'scripts/settings/appSettings'; import Dashboard from 'utils/dashboard'; diff --git a/src/controllers/session/login/index.js b/src/controllers/session/login/index.js index dca4480187..e99d14da41 100644 --- a/src/controllers/session/login/index.js +++ b/src/controllers/session/login/index.js @@ -15,7 +15,7 @@ import toast from '../../../components/toast/toast'; import dialogHelper from '../../../components/dialogHelper/dialogHelper'; import baseAlert from '../../../components/alert'; import { getDefaultBackgroundClass } from '../../../components/cardbuilder/cardBuilderUtils'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import './login.scss'; diff --git a/src/controllers/session/selectServer/index.js b/src/controllers/session/selectServer/index.js index 0b05409e16..3ed1986778 100644 --- a/src/controllers/session/selectServer/index.js +++ b/src/controllers/session/selectServer/index.js @@ -19,8 +19,7 @@ import '../../../elements/emby-button/emby-button'; import Dashboard from '../../../utils/dashboard'; import alert from '../../../components/alert'; import { getDefaultBackgroundClass } from '../../../components/cardbuilder/cardBuilderUtils'; -import { ConnectionState } from 'lib/jellyfin-apiclient/connectionState'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ConnectionState, ServerConnections } from 'lib/jellyfin-apiclient'; const enableFocusTransform = !browser.slow && !browser.edge; diff --git a/src/elements/emby-itemscontainer/emby-itemscontainer.js b/src/elements/emby-itemscontainer/emby-itemscontainer.js index 1c6948f9c4..e1657d0956 100644 --- a/src/elements/emby-itemscontainer/emby-itemscontainer.js +++ b/src/elements/emby-itemscontainer/emby-itemscontainer.js @@ -10,7 +10,7 @@ import browser from '../../scripts/browser'; import dom from '../../scripts/dom'; import loading from '../../components/loading/loading'; import focusManager from '../../components/focusManager'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import serverNotifications from '../../scripts/serverNotifications'; import Events from '../../utils/events.ts'; diff --git a/src/elements/emby-playstatebutton/emby-playstatebutton.js b/src/elements/emby-playstatebutton/emby-playstatebutton.js index 40dd6cccdd..f41a143525 100644 --- a/src/elements/emby-playstatebutton/emby-playstatebutton.js +++ b/src/elements/emby-playstatebutton/emby-playstatebutton.js @@ -1,6 +1,6 @@ import serverNotifications from '../../scripts/serverNotifications'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Events from '../../utils/events.ts'; import EmbyButtonPrototype from '../../elements/emby-button/emby-button'; diff --git a/src/elements/emby-ratingbutton/emby-ratingbutton.js b/src/elements/emby-ratingbutton/emby-ratingbutton.js index 6241d09dfd..40b581c7b5 100644 --- a/src/elements/emby-ratingbutton/emby-ratingbutton.js +++ b/src/elements/emby-ratingbutton/emby-ratingbutton.js @@ -1,6 +1,6 @@ import serverNotifications from '../../scripts/serverNotifications'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Events from '../../utils/events.ts'; import EmbyButtonPrototype from '../emby-button/emby-button'; diff --git a/src/hooks/useApi.tsx b/src/hooks/useApi.tsx index a0c899e2dd..b8bd88b42b 100644 --- a/src/hooks/useApi.tsx +++ b/src/hooks/useApi.tsx @@ -3,7 +3,7 @@ import type { UserDto } from '@jellyfin/sdk/lib/generated-client'; import type { ApiClient, Event } from 'jellyfin-apiclient'; import React, { type FC, type PropsWithChildren, createContext, useContext, useEffect, useMemo, useState } from 'react'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import events from 'utils/events'; import { toApi } from 'utils/jellyfin-apiclient/compat'; diff --git a/src/index.jsx b/src/index.jsx index bf426c000c..8d57c445fa 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -5,7 +5,7 @@ import React from 'react'; import { createRoot } from 'react-dom/client'; // NOTE: We need to import this first to initialize the connection -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { appHost } from './components/apphost'; import autoFocuser from './components/autoFocuser'; diff --git a/src/lib/jellyfin-apiclient/ServerConnections.js b/src/lib/jellyfin-apiclient/ServerConnections.js index 31e73531d0..bae007970a 100644 --- a/src/lib/jellyfin-apiclient/ServerConnections.js +++ b/src/lib/jellyfin-apiclient/ServerConnections.js @@ -4,13 +4,14 @@ import { Api } from '@jellyfin/sdk'; import { Credentials, ApiClient } from 'jellyfin-apiclient'; import { appHost } from 'components/apphost'; -import ConnectionManager from 'lib/jellyfin-apiclient/connectionManager'; import appSettings from 'scripts/settings/appSettings'; import { setUserInfo } from 'scripts/settings/userSettings'; import Dashboard from 'utils/dashboard'; import Events from 'utils/events.ts'; import { toApi } from 'utils/jellyfin-apiclient/compat'; +import ConnectionManager from './connectionManager'; + const normalizeImageOptions = options => { if (!options.quality && (options.maxWidth || options.width || options.maxHeight || options.height || options.fillWidth || options.fillHeight)) { options.quality = 90; diff --git a/src/lib/jellyfin-apiclient/index.ts b/src/lib/jellyfin-apiclient/index.ts new file mode 100644 index 0000000000..ce919d85f9 --- /dev/null +++ b/src/lib/jellyfin-apiclient/index.ts @@ -0,0 +1,3 @@ +export { ConnectionMode } from './connectionMode'; +export { ConnectionState } from './connectionState'; +export { default as ServerConnections } from './ServerConnections'; diff --git a/src/plugins/backdropScreensaver/plugin.js b/src/plugins/backdropScreensaver/plugin.js index 1b0c5bfb70..fc22fbb4bd 100644 --- a/src/plugins/backdropScreensaver/plugin.js +++ b/src/plugins/backdropScreensaver/plugin.js @@ -1,5 +1,5 @@ -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import * as userSettings from 'scripts/settings/userSettings'; import { PluginType } from 'types/plugin.ts'; diff --git a/src/plugins/bookPlayer/plugin.js b/src/plugins/bookPlayer/plugin.js index 9ad4e8526f..1e0ad2a001 100644 --- a/src/plugins/bookPlayer/plugin.js +++ b/src/plugins/bookPlayer/plugin.js @@ -6,7 +6,7 @@ import dialogHelper from '../../components/dialogHelper/dialogHelper'; import Screenfull from 'screenfull'; import TableOfContents from './tableOfContents'; import { translateHtml } from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import browser from 'scripts/browser'; import * as userSettings from '../../scripts/settings/userSettings'; import TouchHelper from 'scripts/touchHelper'; diff --git a/src/plugins/chromecastPlayer/plugin.js b/src/plugins/chromecastPlayer/plugin.js index ed85eedab3..a7c149ac46 100644 --- a/src/plugins/chromecastPlayer/plugin.js +++ b/src/plugins/chromecastPlayer/plugin.js @@ -4,7 +4,7 @@ import { playbackManager } from '../../components/playback/playbackmanager'; import globalize from '../../lib/globalize'; import CastSenderApi from './castSenderApi'; import alert from '../../components/alert'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { PluginType } from '../../types/plugin.ts'; import Events from '../../utils/events.ts'; import { getItems } from '../../utils/jellyfin-apiclient/getItems.ts'; diff --git a/src/plugins/comicsPlayer/plugin.js b/src/plugins/comicsPlayer/plugin.js index 8c84b121fb..24d12f0c01 100644 --- a/src/plugins/comicsPlayer/plugin.js +++ b/src/plugins/comicsPlayer/plugin.js @@ -3,7 +3,7 @@ import loading from '../../components/loading/loading'; import dialogHelper from '../../components/dialogHelper/dialogHelper'; import keyboardnavigation from '../../scripts/keyboardNavigation'; import { appRouter } from '../../components/router/appRouter'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import * as userSettings from '../../scripts/settings/userSettings'; import { PluginType } from '../../types/plugin.ts'; diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js index 5c48b5ff84..efd19e3f87 100644 --- a/src/plugins/htmlVideoPlayer/plugin.js +++ b/src/plugins/htmlVideoPlayer/plugin.js @@ -29,7 +29,7 @@ import { import itemHelper from '../../components/itemHelper'; import Screenfull from 'screenfull'; import globalize from '../../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import profileBuilder, { canPlaySecondaryAudio } from '../../scripts/browserDeviceProfile'; import { getIncludeCorsCredentials } from '../../scripts/settings/webSettings'; import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../components/backdrop/backdrop'; diff --git a/src/plugins/pdfPlayer/plugin.js b/src/plugins/pdfPlayer/plugin.js index 1c040602ff..f77c013646 100644 --- a/src/plugins/pdfPlayer/plugin.js +++ b/src/plugins/pdfPlayer/plugin.js @@ -3,7 +3,7 @@ import keyboardnavigation from '../../scripts/keyboardNavigation'; import dialogHelper from '../../components/dialogHelper/dialogHelper'; import dom from '../../scripts/dom'; import { appRouter } from '../../components/router/appRouter'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { PluginType } from '../../types/plugin.ts'; import Events from '../../utils/events.ts'; diff --git a/src/plugins/photoPlayer/plugin.js b/src/plugins/photoPlayer/plugin.js index 3977393140..7fcec8294b 100644 --- a/src/plugins/photoPlayer/plugin.js +++ b/src/plugins/photoPlayer/plugin.js @@ -1,4 +1,4 @@ -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { PluginType } from 'types/plugin.ts'; export default class PhotoPlayer { diff --git a/src/plugins/playAccessValidation/plugin.js b/src/plugins/playAccessValidation/plugin.js index 5202bf2314..cae96f8c3a 100644 --- a/src/plugins/playAccessValidation/plugin.js +++ b/src/plugins/playAccessValidation/plugin.js @@ -1,6 +1,6 @@ import alert from 'components/alert'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { PluginType } from 'types/plugin.ts'; function showErrorMessage() { diff --git a/src/plugins/sessionPlayer/plugin.js b/src/plugins/sessionPlayer/plugin.js index 0e55d599f6..40681ae81b 100644 --- a/src/plugins/sessionPlayer/plugin.js +++ b/src/plugins/sessionPlayer/plugin.js @@ -1,5 +1,5 @@ import { playbackManager } from '../../components/playback/playbackmanager'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import serverNotifications from '../../scripts/serverNotifications'; import { PluginType } from '../../types/plugin.ts'; import Events from '../../utils/events.ts'; diff --git a/src/plugins/syncPlay/plugin.ts b/src/plugins/syncPlay/plugin.ts index a32c64ec34..41f5715ab7 100644 --- a/src/plugins/syncPlay/plugin.ts +++ b/src/plugins/syncPlay/plugin.ts @@ -1,5 +1,5 @@ import { playbackManager } from '../../components/playback/playbackmanager'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Events from '../../utils/events'; import SyncPlay from './core'; import SyncPlayNoActivePlayer from './ui/players/NoActivePlayer'; diff --git a/src/plugins/syncPlay/ui/groupSelectionMenu.js b/src/plugins/syncPlay/ui/groupSelectionMenu.js index 543d839770..1b6a3d9631 100644 --- a/src/plugins/syncPlay/ui/groupSelectionMenu.js +++ b/src/plugins/syncPlay/ui/groupSelectionMenu.js @@ -5,7 +5,7 @@ import actionsheet from '../../../components/actionSheet/actionSheet'; import globalize from '../../../lib/globalize'; import playbackPermissionManager from './playbackPermissionManager'; import { pluginManager } from '../../../components/pluginManager'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { PluginType } from '../../../types/plugin.ts'; import Events from '../../../utils/events.ts'; diff --git a/src/scripts/autoBackdrops.js b/src/scripts/autoBackdrops.js index 4083e46024..8c0283740d 100644 --- a/src/scripts/autoBackdrops.js +++ b/src/scripts/autoBackdrops.js @@ -5,7 +5,7 @@ import { pageClassOn } from '../utils/dashboard'; import { queryClient } from 'utils/query/queryClient'; import { getBrandingOptionsQuery } from 'apps/dashboard/features/branding/api/useBrandingOptions'; import { SPLASHSCREEN_URL } from 'constants/branding'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; const cache = {}; diff --git a/src/scripts/autoThemes.js b/src/scripts/autoThemes.js index 673efa56f4..3a842261ae 100644 --- a/src/scripts/autoThemes.js +++ b/src/scripts/autoThemes.js @@ -1,6 +1,6 @@ import * as userSettings from './settings/userSettings'; import skinManager from './themeManager'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { pageClassOn } from 'utils/dashboard'; import Events from 'utils/events.ts'; diff --git a/src/scripts/autocast.js b/src/scripts/autocast.js index 87462f07c3..ac86286e29 100644 --- a/src/scripts/autocast.js +++ b/src/scripts/autocast.js @@ -1,5 +1,5 @@ import { playbackManager } from 'components/playback/playbackmanager'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import Events from 'utils/events.ts'; export function enable(enabled) { diff --git a/src/scripts/deleteHelper.js b/src/scripts/deleteHelper.js index d9afa4d014..3f9fc89792 100644 --- a/src/scripts/deleteHelper.js +++ b/src/scripts/deleteHelper.js @@ -5,7 +5,7 @@ import alert from 'components/alert'; import confirm from 'components/confirm/confirm'; import { appRouter } from 'components/router/appRouter'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; function alertText(options) { return alert(options); diff --git a/src/scripts/itemsByName.js b/src/scripts/itemsByName.js index 6b4cbefca2..e60d468d0b 100644 --- a/src/scripts/itemsByName.js +++ b/src/scripts/itemsByName.js @@ -2,7 +2,7 @@ import listView from 'components/listview/listview'; import cardBuilder from 'components/cardbuilder/cardBuilder'; import imageLoader from 'components/images/imageLoader'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import 'elements/emby-itemscontainer/emby-itemscontainer'; import 'elements/emby-button/emby-button'; diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js index cecd633811..c4c6c6d4d8 100644 --- a/src/scripts/libraryMenu.js +++ b/src/scripts/libraryMenu.js @@ -20,7 +20,7 @@ import { pluginManager } from '../components/pluginManager'; import groupSelectionMenu from '../plugins/syncPlay/ui/groupSelectionMenu'; import browser from './browser'; import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import imageHelper from '../utils/image'; import { getMenuLinks } from '../scripts/settings/webSettings'; import Dashboard, { pageClassOn } from '../utils/dashboard'; diff --git a/src/scripts/playlistViewer.js b/src/scripts/playlistViewer.js index ff8e22506b..2bb15930d4 100644 --- a/src/scripts/playlistViewer.js +++ b/src/scripts/playlistViewer.js @@ -1,7 +1,7 @@ import { getPlaylistsApi } from '@jellyfin/sdk/lib/utils/api/playlists-api'; import listView from 'components/listview/listview'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { toApi } from 'utils/jellyfin-apiclient/compat'; function getFetchPlaylistItemsFn(apiClient, itemId) { diff --git a/src/scripts/screensavermanager.js b/src/scripts/screensavermanager.js index f085b1a914..d0b5ef1b98 100644 --- a/src/scripts/screensavermanager.js +++ b/src/scripts/screensavermanager.js @@ -1,6 +1,6 @@ import { playbackManager } from 'components/playback/playbackmanager'; import { pluginManager } from 'components/pluginManager'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import { PluginType } from 'types/plugin.ts'; import Events from 'utils/events.ts'; diff --git a/src/scripts/serverNotifications.js b/src/scripts/serverNotifications.js index 2b0d231b8d..0f9353dcf4 100644 --- a/src/scripts/serverNotifications.js +++ b/src/scripts/serverNotifications.js @@ -4,7 +4,7 @@ import { playbackManager } from 'components/playback/playbackmanager'; import { pluginManager } from 'components/pluginManager'; import { appRouter } from 'components/router/appRouter'; import toast from 'components/toast/toast'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import inputManager from 'scripts/inputManager'; import Events from 'utils/events.ts'; import { PluginType } from 'types/plugin.ts'; diff --git a/src/scripts/taskbutton.js b/src/scripts/taskbutton.js index bb2066fcec..8a4979b602 100644 --- a/src/scripts/taskbutton.js +++ b/src/scripts/taskbutton.js @@ -1,6 +1,6 @@ import globalize from 'lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import serverNotifications from 'scripts/serverNotifications'; import Events from 'utils/events.ts'; diff --git a/src/utils/dashboard.js b/src/utils/dashboard.js index 666951acba..8c5d849eb1 100644 --- a/src/utils/dashboard.js +++ b/src/utils/dashboard.js @@ -4,7 +4,7 @@ import { appRouter } from '../components/router/appRouter'; import baseAlert from '../components/alert'; import baseConfirm from '../components/confirm/confirm'; import globalize from '../lib/globalize'; -import ServerConnections from 'lib/jellyfin-apiclient/ServerConnections'; +import { ServerConnections } from 'lib/jellyfin-apiclient'; import * as webSettings from '../scripts/settings/webSettings'; import datetime from '../scripts/datetime'; import { setBackdropTransparency } from '../components/backdrop/backdrop';