mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

WIP

Browse source
This commit is contained in:
MrTimscampi 2020-08-16 20:24:45 +02:00 • committed by vitorsemeano
parent 96eccd2ecd
commit 7d9208e951
143 changed files with 1000 additions and 1008 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc.js
View file

@ -25,7 +25,6 @@ module.exports = {
'eslint:recommended',
// 'plugin:promise/recommended',
'plugin:import/errors',
'plugin:import/warnings',
'plugin:eslint-comments/recommended',
'plugin:compat/recommended'
],

3
package.json
View file

@ -17,7 +17,7 @@
"browser-sync": "^2.26.13",
"confusing-browser-globals": "^1.0.10",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.1.1",
"copy-webpack-plugin": "^6.0.3",
"css-loader": "^5.0.0",
"cssnano": "^4.1.10",
"del": "^6.0.0",
@ -80,7 +80,6 @@
"material-design-icons-iconfont": "^6.1.0",
"native-promise-only": "^0.8.0-a",
"page": "^1.11.6",
"query-string": "^6.13.6",
"resize-observer-polyfill": "^1.5.1",
"screenfull": "^5.0.2",
"sortablejs": "^1.12.0",

7
src/components/activitylog.js
View file

@ -1,10 +1,9 @@
import events from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import globalize from '../scripts/globalize';
import dom from '../scripts/dom';
import * as datefns from 'date-fns';
import dfnshelper from '../scripts/dfnshelper';
import serverNotifications from '../scripts/serverNotifications';
import connectionManager from 'jellyfin-apiclient';
import '../elements/emby-button/emby-button';
import './listview/listview.css';
@ -141,7 +140,7 @@ class ActivityLog {
const element = options.element;
element.classList.add('activityLogListWidget');
element.addEventListener('click', onListClick.bind(this));
const apiClient = window.connectionManager.getApiClient(options.serverId);
const apiClient = ConnectionManager.getApiClient(options.serverId);
reloadData(this, element, apiClient);
const onUpdate = onActivityLogUpdate.bind(this);
this.updateFn = onUpdate;
@ -153,7 +152,7 @@ class ActivityLog {
if (options) {
options.element.classList.remove('activityLogListWidget');
window.connectionManager.getApiClient(options.serverId).sendMessage('ActivityLogEntryStop', '0,1500');
ConnectionManager.getApiClient(options.serverId).sendMessage('ActivityLogEntryStop', '0,1500');
}
const onUpdate = this.updateFn;

23
src/components/appRouter.js
View file

@ -1,9 +1,8 @@
import appHost from './apphost';
import { appHost } from './apphost';
import appSettings from '../scripts/settings/appSettings';
import backdrop from './backdrop/backdrop';
import browser from '../scripts/browser';
import connectionManager from 'jellyfin-apiclient';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import globalize from '../scripts/globalize';
import itemHelper from './itemHelper';
import loading from './loading/loading';
@ -95,7 +94,7 @@ class AppRouter {
beginConnectionWizard() {
backdrop.clearBackdrop();
loading.show();
window.connectionManager.connect({
window.ConnectionManager.connect({
enableAutoLogin: appSettings.enableAutoLogin()
}).then((result) => {
this.handleConnectionResult(result);
@ -154,7 +153,7 @@ class AppRouter {
events.on(appHost, 'beforeexit', this.onBeforeExit);
events.on(appHost, 'resume', this.onAppResume);
window.connectionManager.connect({
window.ConnectionManager.connect({
enableAutoLogin: appSettings.enableAutoLogin()
}).then((result) => {
this.firstConnectionResult = result;
@ -210,7 +209,7 @@ class AppRouter {
showItem(item, serverId, options) {
// TODO: Refactor this so it only gets items, not strings.
if (typeof (item) === 'string') {
const apiClient = serverId ? window.connectionManager.getApiClient(serverId) : window.connectionManager.currentApiClient();
const apiClient = serverId ? window.ConnectionManager.getApiClient(serverId) : window.ConnectionManager.currentApiClient();
apiClient.getItem(apiClient.getCurrentUserId(), item).then((itemObject) => {
this.showItem(itemObject, options);
});
@ -324,7 +323,7 @@ class AppRouter {
url += '?' + ctx.querystring;
}
import('' + url).then(({default: html}) => {
import(/* webpackChunkName: "[request]" */ `../controllers/${url}`).then((html) => {
this.loadContent(ctx, route, html, request);
});
}
@ -494,15 +493,15 @@ class AppRouter {
}
initApiClients() {
window.connectionManager.getApiClients().forEach((apiClient) => {
window.ConnectionManager.getApiClients().forEach((apiClient) => {
this.initApiClient(apiClient, this);
});
events.on(window.connectionManager, 'apiclientcreated', this.onApiClientCreated);
events.on(window.ConnectionManager, 'apiclientcreated', this.onApiClientCreated);
}
onAppResume() {
const apiClient = window.connectionManager.currentApiClient();
const apiClient = window.ConnectionManager.currentApiClient();
if (apiClient) {
apiClient.ensureWebSocket();
@ -520,7 +519,7 @@ class AppRouter {
}
}
const apiClient = window.connectionManager.currentApiClient();
const apiClient = window.ConnectionManager.currentApiClient();
const pathname = ctx.pathname.toLowerCase();
console.debug('appRouter - processing path request ' + pathname);
@ -847,4 +846,4 @@ class AppRouter {
}
}
export default new AppRouter();
export const appRouter = new AppRouter();

7
src/components/apphost.js
View file

@ -1,6 +1,7 @@
import appSettings from '../scripts/settings/appSettings';
import browser from '../scripts/browser';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import * as htmlMediaHelper from '../components/htmlMediaHelper';
import * as webSettings from '../scripts/settings/webSettings';
import globalize from '../scripts/globalize';
@ -318,7 +319,7 @@ let deviceName;
const appName = 'Jellyfin Web';
const appVersion = '10.7.0';
const appHost = {
export const appHost = {
getWindowState: function () {
return document.windowState || 'Normal';
},
@ -406,5 +407,3 @@ if (window.addEventListener) {
window.addEventListener('focus', onAppVisible);
window.addEventListener('blur', onAppHidden);
}
export default appHost;

5
src/components/backdrop/backdrop.js
View file

@ -1,6 +1,5 @@
import browser from '../../scripts/browser';
import connectionManager from 'jellyfin-apiclient';
import playbackManager from '../playback/playbackmanager';
import { playbackManager } from '../playback/playbackmanager';
import dom from '../../scripts/dom';
import * as userSettings from '../../scripts/settings/userSettings';
import './backdrop.css';
@ -177,7 +176,7 @@ import './backdrop.css';
function getItemImageUrls(item, imageOptions) {
imageOptions = imageOptions || {};
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = window.ConnectionManager.getApiClient(item.ServerId);
if (item.BackdropImageTags && item.BackdropImageTags.length > 0) {
return item.BackdropImageTags.map((imgTag, index) => {
return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, {

5
src/components/cardbuilder/cardBuilder.js
View file

@ -7,7 +7,6 @@
import datetime from '../../scripts/datetime';
import imageLoader from '../images/imageLoader';
import connectionManager from 'jellyfin-apiclient';
import itemHelper from '../itemHelper';
import focusManager from '../focusManager';
import indicators from '../indicators/indicators';
@ -15,7 +14,7 @@ import globalize from '../../scripts/globalize';
import layoutManager from '../layoutManager';
import dom from '../../scripts/dom';
import browser from '../../scripts/browser';
import playbackManager from '../playback/playbackmanager';
import { playbackManager } from '../playback/playbackmanager';
import itemShortcuts from '../shortcuts';
import imageHelper from '../../scripts/imagehelper';
import './card.css';
@ -371,7 +370,7 @@ import '../guide/programs.css';
if (serverId !== lastServerId) {
lastServerId = serverId;
apiClient = window.connectionManager.getApiClient(lastServerId);
apiClient = window.ConnectionManager.getApiClient(lastServerId);
}
if (options.indexBy) {

4
src/components/cardbuilder/chaptercardbuilder.js
View file

@ -7,7 +7,7 @@
import datetime from '../../scripts/datetime';
import imageLoader from '../images/imageLoader';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import layoutManager from '../layoutManager';
import browser from '../../scripts/browser';
@ -48,7 +48,7 @@ import browser from '../../scripts/browser';
let html = '';
let itemsInRow = 0;
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
for (let i = 0, length = chapters.length; i < length; i++) {
if (options.rows && itemsInRow === 0) {

6
src/components/channelMapper/channelMapper.js
View file

@ -1,7 +1,7 @@
import dom from '../../scripts/dom';
import dialogHelper from '../dialogHelper/dialogHelper';
import loading from '../loading/loading';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import globalize from '../../scripts/globalize';
import actionsheet from '../actionSheet/actionSheet';
import '../../elements/emby-input/emby-input';
@ -16,7 +16,7 @@ export default class channelMapper {
function mapChannel(button, channelId, providerChannelId) {
loading.show();
const providerId = options.providerId;
window.connectionManager.getApiClient(options.serverId).ajax({
ConnectionManager.getApiClient(options.serverId).ajax({
type: 'POST',
url: ApiClient.getUrl('LiveTv/ChannelMappings'),
data: JSON.stringify({
@ -59,7 +59,7 @@ export default class channelMapper {
}
function getChannelMappingOptions(serverId, providerId) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
return apiClient.getJSON(apiClient.getUrl('LiveTv/ChannelMappingOptions', {
providerId: providerId
}));

8
src/components/collectionEditor/collectionEditor.js
View file

@ -2,8 +2,8 @@ import dom from '../../scripts/dom';
import dialogHelper from '../dialogHelper/dialogHelper';
import loading from '../loading/loading';
import layoutManager from '../layoutManager';
import connectionManager from 'jellyfin-apiclient';
import appRouter from '../appRouter';
import { ConnectionManager } from 'jellyfin-apiclient';
import { appRouter } from '../appRouter';
import globalize from '../../scripts/globalize';
import '../../elements/emby-button/emby-button';
import '../../elements/emby-button/paper-icon-button-light';
@ -25,7 +25,7 @@ import '../../assets/css/flexstyles.css';
const collectionId = panel.querySelector('#selectCollectionToAddTo').value;
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
if (collectionId) {
addToCollection(apiClient, panel, collectionId);
@ -106,7 +106,7 @@ import '../../assets/css/flexstyles.css';
EnableTotalRecordCount: false
};
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => {
let html = '';

2
src/components/dialogHelper/dialogHelper.js
View file

@ -1,4 +1,4 @@
import appRouter from '../appRouter';
import { appRouter } from '../appRouter';
import focusManager from '../focusManager';
import browser from '../../scripts/browser';
import layoutManager from '../layoutManager';

11
src/components/displaySettings/displaySettings.js
View file

@ -1,14 +1,13 @@
import browser from '../../scripts/browser';
import layoutManager from '../layoutManager';
import pluginManager from '../pluginManager';
import appHost from '../apphost';
import { pluginManager } from '../pluginManager';
import { appHost } from '../apphost';
import focusManager from '../focusManager';
import datetime from '../../scripts/datetime';
import globalize from '../../scripts/globalize';
import loading from '../loading/loading';
import connectionManager from 'jellyfin-apiclient';
import skinManager from '../../scripts/themeManager';
import events from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import '../../elements/emby-select/emby-select';
import '../../elements/emby-checkbox/emby-checkbox';
import '../../elements/emby-button/emby-button';
@ -182,7 +181,7 @@ import '../../elements/emby-button/emby-button';
function onSubmit(e) {
const self = this;
const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const apiClient = ConnectionManager.getApiClient(self.options.serverId);
const userId = self.options.userId;
const userSettings = self.options.userSettings;
@ -221,7 +220,7 @@ import '../../elements/emby-button/emby-button';
loading.show();
const userId = self.options.userId;
const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const apiClient = ConnectionManager.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings;
return apiClient.getUser(userId).then(user => {

2
src/components/favoriteitems.js
View file

@ -1,7 +1,7 @@
import loading from './loading/loading';
import cardBuilder from './cardbuilder/cardBuilder';
import dom from '../scripts/dom';
import appHost from './apphost';
import { appHost } from './apphost';
import imageLoader from './images/imageLoader';
import globalize from '../scripts/globalize';
import layoutManager from './layoutManager';

5
src/components/filterdialog/filterdialog.js
View file

@ -1,8 +1,7 @@
import dom from '../../scripts/dom';
import dialogHelper from '../dialogHelper/dialogHelper';
import globalize from '../../scripts/globalize';
import connectionManager from 'jellyfin-apiclient';
import events from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import '../../elements/emby-checkbox/emby-checkbox';
import '../../elements/emby-collapse/emby-collapse';
import './style.css';
@ -420,7 +419,7 @@ import './style.css';
this.bindEvents(dlg);
if (enableDynamicFilters(this.options.mode)) {
dlg.classList.add('dynamicFilterDialog');
const apiClient = window.connectionManager.getApiClient(this.options.serverId);
const apiClient = ConnectionManager.getApiClient(this.options.serverId);
loadDynamicFilters(dlg, apiClient, apiClient.getCurrentUserId(), this.options.query);
}
});

4
src/components/filtermenu/filtermenu.js
View file

@ -3,7 +3,7 @@ import focusManager from '../focusManager';
import dialogHelper from '../dialogHelper/dialogHelper';
import inputManager from '../../scripts/inputManager';
import layoutManager from '../layoutManager';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import globalize from '../../scripts/globalize';
import * as userSettings from '../../scripts/settings/userSettings';
import '../../elements/emby-checkbox/emby-checkbox';
@ -194,7 +194,7 @@ function initEditor(context, settings) {
}
}
function loadDynamicFilters(context, options) {
const apiClient = window.connectionManager.getApiClient(options.serverId);
var apiClient = ConnectionManager.getApiClient(options.serverId);
const filterMenuOptions = Object.assign(options.filterMenuOptions, {

6
src/components/groupedcards.js
View file

@ -1,13 +1,13 @@
/* eslint-disable indent */
import dom from '../scripts/dom';
import appRouter from './appRouter';
import connectionManager from 'jellyfin-apiclient';
import { appRouter } from './appRouter';
import { ConnectionManager } from 'jellyfin-apiclient';
function onGroupedCardClick(e, card) {
const itemId = card.getAttribute('data-id');
const serverId = card.getAttribute('data-serverid');
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = window.ConnectionManager.getApiClient(serverId);
const userId = apiClient.getCurrentUserId();
const playedIndicator = card.querySelector('.playedIndicator');
const playedIndicatorHtml = playedIndicator ? playedIndicator.innerHTML : null;

9
src/components/guide/guide.js
View file

@ -1,16 +1,15 @@
import inputManager from '../../scripts/inputManager';
import browser from '../../scripts/browser';
import globalize from '../../scripts/globalize';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import scrollHelper from '../../scripts/scrollHelper';
import serverNotifications from '../../scripts/serverNotifications';
import loading from '../loading/loading';
import datetime from '../../scripts/datetime';
import focusManager from '../focusManager';
import playbackManager from '../playback/playbackmanager';
import { playbackManager } from '../playback/playbackmanager';
import * as userSettings from '../../scripts/settings/userSettings';
import imageLoader from '../images/imageLoader';
import events from 'jellyfin-apiclient';
import layoutManager from '../layoutManager';
import itemShortcuts from '../shortcuts';
import dom from '../../scripts/dom';
@ -213,7 +212,7 @@ function Guide(options) {
}
function reloadGuide(context, newStartDate, scrollToTimeMs, focusToTimeMs, startTimeOfDayMs, focusProgramOnRender) {
const apiClient = window.connectionManager.getApiClient(options.serverId);
const apiClient = ConnectionManager.getApiClient(options.serverId);
const channelQuery = {
@ -873,7 +872,7 @@ function Guide(options) {
function reloadPage(page) {
showLoading();
const apiClient = window.connectionManager.getApiClient(options.serverId);
const apiClient = ConnectionManager.getApiClient(options.serverId);
apiClient.getLiveTvGuideInfo().then(function (guideInfo) {
setDateRange(page, guideInfo);

7
src/components/homeScreenSettings/homeScreenSettings.js
View file

@ -3,10 +3,9 @@ import layoutManager from '../layoutManager';
import focusManager from '../focusManager';
import globalize from '../../scripts/globalize';
import loading from '../loading/loading';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import homeSections from '../homesections/homesections';
import dom from '../../scripts/dom';
import events from 'jellyfin-apiclient';
import '../listview/listview.css';
import '../../elements/emby-select/emby-select';
import '../../elements/emby-checkbox/emby-checkbox';
@ -385,7 +384,7 @@ import '../../elements/emby-checkbox/emby-checkbox';
function onSubmit(e) {
const self = this;
const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const apiClient = ConnectionManager.getApiClient(self.options.serverId);
const userId = self.options.userId;
const userSettings = self.options.userSettings;
@ -457,7 +456,7 @@ import '../../elements/emby-checkbox/emby-checkbox';
loading.show();
const userId = self.options.userId;
const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const apiClient = ConnectionManager.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(user => {

17
src/components/homesections/homesections.js
View file

@ -1,16 +1,15 @@
import connectionManager from 'jellyfin-apiclient';
import cardBuilder from '../cardbuilder/cardBuilder';
import dom from '../../scripts/dom';
import layoutManager from '../layoutManager';
import imageLoader from '../images/imageLoader';
import globalize from '../../scripts/globalize';
import appRouter from '../appRouter';
import { appRouter } from '../appRouter';
import imageHelper from '../../scripts/imagehelper';
import '../../elements/emby-button/paper-icon-button-light';
import '../../elements/emby-itemscontainer/emby-itemscontainer';
import '../../elements/emby-scroller/emby-scroller';
import '../../elements/emby-button/emby-button';
import './homesections';
import './homesections.css';
/* eslint-disable indent */
@ -212,7 +211,7 @@ import './homesections';
function getFetchLatestItemsFn(serverId, parentId, collectionType) {
return function () {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = window.ConnectionManager.getApiClient(serverId);
let limit = 16;
if (enableScrollX()) {
@ -368,7 +367,7 @@ import './homesections';
function getContinueWatchingFetchFn(serverId) {
return function () {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = window.ConnectionManager.getApiClient(serverId);
const screenWidth = dom.getWindowSize().innerWidth;
let limit;
@ -441,7 +440,7 @@ import './homesections';
function getContinueListeningFetchFn(serverId) {
return function () {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = window.ConnectionManager.getApiClient(serverId);
const screenWidth = dom.getWindowSize().innerWidth;
let limit;
@ -514,7 +513,7 @@ import './homesections';
function getOnNowFetchFn(serverId) {
return function () {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = window.ConnectionManager.getApiClient(serverId);
return apiClient.getLiveTvRecommendedPrograms({
userId: apiClient.getCurrentUserId(),
IsAiring: true,
@ -657,7 +656,7 @@ import './homesections';
function getNextUpFetchFn(serverId) {
return function () {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = window.ConnectionManager.getApiClient(serverId);
return apiClient.getNextUpEpisodes({
Limit: enableScrollX() ? 24 : 15,
Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo,Path',
@ -728,7 +727,7 @@ import './homesections';
function getLatestRecordingsFetchFn(serverId, activeRecordingsOnly) {
return function () {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = window.ConnectionManager.getApiClient(serverId);
return apiClient.getLiveTvRecordings({
userId: apiClient.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 5,

2
src/components/htmlMediaHelper.js
View file

@ -3,7 +3,7 @@
import appSettings from '../scripts/settings/appSettings' ;
import browser from '../scripts/browser';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
export function getSavedVolume() {
return appSettings.get('volume') || 1;

6
src/components/imageDownloader/imageDownloader.js
View file

@ -1,8 +1,8 @@
import dom from '../../scripts/dom';
import loading from '../loading/loading';
import appHost from '../apphost';
import { appHost } from '../apphost';
import dialogHelper from '../dialogHelper/dialogHelper';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import imageLoader from '../images/imageLoader';
import browser from '../../scripts/browser';
import layoutManager from '../layoutManager';
@ -317,7 +317,7 @@ import '../cardbuilder/card.css';
loading.show();
import('./imageDownloader.template.html').then(({default: template}) => {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
currentItemId = itemId;
currentItemType = itemType;

4
src/components/imageUploader/imageUploader.js
View file

@ -6,7 +6,7 @@
*/
import dialogHelper from '../dialogHelper/dialogHelper';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import dom from '../../scripts/dom';
import loading from '../loading/loading';
import scrollHelper from '../../scripts/scrollHelper';
@ -108,7 +108,7 @@ import './style.css';
return false;
}
window.connectionManager.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(() => {
ConnectionManager.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(() => {
dlg.querySelector('#uploadImage').value = '';
loading.hide();

16
src/components/imageeditor/imageeditor.js
View file

@ -1,5 +1,5 @@
import dialogHelper from '../dialogHelper/dialogHelper';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import loading from '../loading/loading';
import dom from '../../scripts/dom';
import layoutManager from '../layoutManager';
@ -8,7 +8,7 @@ import globalize from '../../scripts/globalize';
import scrollHelper from '../../scripts/scrollHelper';
import imageLoader from '../images/imageLoader';
import browser from '../../scripts/browser';
import appHost from '../apphost';
import { appHost } from '../apphost';
import '../cardbuilder/card.css';
import '../formdialog.css';
import '../../elements/emby-button/emby-button';
@ -36,10 +36,10 @@ import './imageeditor.css';
let apiClient;
if (item) {
apiClient = window.connectionManager.getApiClient(item.ServerId);
apiClient = ConnectionManager.getApiClient(item.ServerId);
reloadItem(page, item, apiClient, focusContext);
} else {
apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
apiClient = ConnectionManager.getApiClient(currentItem.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), currentItem.Id).then(function (item) {
reloadItem(page, item, apiClient, focusContext);
});
@ -293,7 +293,7 @@ import './imageeditor.css';
function showActionSheet(context, imageCard) {
const itemId = imageCard.getAttribute('data-id');
const serverId = imageCard.getAttribute('data-serverid');
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
const type = imageCard.getAttribute('data-imagetype');
const index = parseInt(imageCard.getAttribute('data-index'));
@ -404,7 +404,7 @@ import './imageeditor.css';
const type = this.getAttribute('data-imagetype');
let index = this.getAttribute('data-index');
index = index === 'null' ? null : parseInt(index);
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
const apiClient = ConnectionManager.getApiClient(currentItem.ServerId);
deleteImage(context, currentItem.Id, type, index, apiClient, true);
});
@ -412,7 +412,7 @@ import './imageeditor.css';
const type = this.getAttribute('data-imagetype');
const index = this.getAttribute('data-index');
const newIndex = this.getAttribute('data-newindex');
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
const apiClient = ConnectionManager.getApiClient(currentItem.ServerId);
moveImage(context, apiClient, currentItem.Id, type, index, newIndex, dom.parentWithClass(this, 'itemsContainer'));
});
}
@ -424,7 +424,7 @@ import './imageeditor.css';
loading.show();
import('./imageeditor.template.html').then(({default: template}) => {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
const dialogOptions = {
removeOnClose: true

13
src/components/images/imageLoader.js
View file

@ -1,6 +1,6 @@
import * as lazyLoader from '../lazyLoader/lazyLoaderIntersectionObserver';
import * as userSettings from '../../scripts/settings/userSettings';
import * as blurhash from 'blurhash';
import { decode, isBlurhashValid } from 'blurhash';
import './style.css';
/* eslint-disable indent */
@ -13,7 +13,7 @@ import './style.css';
}
function itemBlurhashing(target, blurhashstr) {
if (blurhash.isBlurhashValid(blurhashstr)) {
if (isBlurhashValid(blurhashstr)) {
// Although the default values recommended by Blurhash developers is 32x32, a size of 18x18 seems to be the sweet spot for us,
// improving the performance and reducing the memory usage, while retaining almost full blur quality.
// Lower values had more visible pixelation
@ -21,7 +21,7 @@ import './style.css';
const height = 18;
let pixels;
try {
pixels = blurhash.decode(blurhashstr, width, height);
pixels = decode(blurhashstr, width, height);
} catch (err) {
console.error('Blurhash decode error: ', err);
target.classList.add('non-blurhashable');
@ -124,15 +124,18 @@ import './style.css';
export function lazyChildren(elem) {
if (userSettings.enableBlurhash()) {
for (const lazyElem of elem.querySelectorAll('.lazy')) {
const lazyElems = Array.from(elem.querySelectorAll('.lazy'));
console.warn(lazyElems);
lazyElems.forEach((lazyElem) => {
const blurhashstr = lazyElem.getAttribute('data-blurhash');
if (!lazyElem.classList.contains('blurhashed', 'non-blurhashable') && blurhashstr) {
itemBlurhashing(lazyElem, blurhashstr);
} else if (!blurhashstr && !lazyElem.classList.contains('blurhashed')) {
lazyElem.classList.add('non-blurhashable');
}
});
}
}
console.warn(elem);
lazyLoader.lazyChildren(elem, fillImage);
}

10
src/components/itemContextMenu.js
View file

@ -1,11 +1,11 @@
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import browser from '../scripts/browser';
import globalize from '../scripts/globalize';
import actionsheet from './actionSheet/actionSheet';
import appHost from './apphost';
import appRouter from './appRouter';
import { appHost } from './apphost';
import { appRouter } from './appRouter';
import itemHelper from './itemHelper';
import playbackManager from './playback/playbackmanager';
import { playbackManager } from './playback/playbackmanager';
/* eslint-disable indent */
export function getCommands(options) {
@ -330,7 +330,7 @@ import playbackManager from './playback/playbackmanager';
function executeCommand(item, id, options) {
const itemId = item.Id;
const serverId = item.ServerId;
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
return new Promise(function (resolve, reject) {
switch (id) {

2
src/components/itemHelper.js
View file

@ -1,4 +1,4 @@
import appHost from './apphost';
import { appHost } from './apphost';
import globalize from '../scripts/globalize';
export function getDisplayName(item, options = {}) {

4
src/components/itemMediaInfo/itemMediaInfo.js
View file

@ -8,7 +8,7 @@
import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from '../layoutManager';
import globalize from '../../scripts/globalize';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import loading from '../loading/loading';
import '../../elements/emby-select/emby-select';
import '../listview/listview.css';
@ -163,7 +163,7 @@ import '../../assets/css/flexstyles.css';
}
function loadMediaInfo(itemId, serverId, template) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(item => {
const dialogOptions = {
size: 'small',

4
src/components/itemidentifier/itemidentifier.js
View file

@ -7,7 +7,7 @@
import dialogHelper from '../dialogHelper/dialogHelper';
import loading from '../loading/loading';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import globalize from '../../scripts/globalize';
import scrollHelper from '../../scripts/scrollHelper';
import layoutManager from '../layoutManager';
@ -31,7 +31,7 @@ import '../cardbuilder/card.css';
let currentSearchResult;
function getApiClient() {
return window.connectionManager.getApiClient(currentServerId);
return ConnectionManager.getApiClient(currentServerId);
}
function searchForIdentificationResults(page) {

4
src/components/itemsrefresher.js
View file

@ -1,6 +1,6 @@
import playbackManager from './playback/playbackmanager';
import { playbackManager } from './playback/playbackmanager';
import serverNotifications from '../scripts/serverNotifications';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
function onUserDataChanged(e, apiClient, userData) {
const instance = this;

5
src/components/layoutManager.js
View file

@ -1,7 +1,8 @@
import appHost from './apphost';
import { appHost } from './apphost';
import browser from '../scripts/browser';
import { set, get } from '../scripts/settings/appSettings';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
function setLayout(instance, layout, selectedLayout) {
if (layout === selectedLayout) {

6
src/components/listview/listview.js
View file

@ -8,7 +8,7 @@
import itemHelper from '../itemHelper';
import mediaInfo from '../mediainfo/mediainfo';
import indicators from '../indicators/indicators';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import layoutManager from '../layoutManager';
import globalize from '../../scripts/globalize';
import datetime from '../../scripts/datetime';
@ -77,7 +77,7 @@ import '../../elements/emby-playstatebutton/emby-playstatebutton';
}
function getImageUrl(item, width) {
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
let itemId;
const options = {
@ -106,7 +106,7 @@ import '../../elements/emby-playstatebutton/emby-playstatebutton';
}
function getChannelImageUrl(item, width) {
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
const options = {
maxWidth: width,
type: 'Primary'

2
src/components/maintabsmanager.js
View file

@ -1,6 +1,6 @@
import dom from '../scripts/dom';
import browser from '../scripts/browser';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import '../elements/emby-tabs/emby-tabs';
import '../elements/emby-button/emby-button';

2
src/components/mediainfo/mediainfo.js
View file

@ -1,6 +1,6 @@
import datetime from '../../scripts/datetime';
import globalize from '../../scripts/globalize';
import appRouter from '../appRouter';
import { appRouter } from '../appRouter';
import itemHelper from '../itemHelper';
import indicators from '../indicators/indicators';
import 'material-design-icons-iconfont';

12
src/components/metadataEditor/metadataEditor.js
View file

@ -4,7 +4,7 @@ import dialogHelper from '../dialogHelper/dialogHelper';
import datetime from '../../scripts/datetime';
import loading from '../loading/loading';
import focusManager from '../focusManager';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import globalize from '../../scripts/globalize';
import shell from '../../scripts/shell';
import '../../elements/emby-checkbox/emby-checkbox';
@ -290,7 +290,7 @@ import '../../assets/css/flexstyles.css';
}
function getApiClient() {
return window.connectionManager.getApiClient(currentItem.ServerId);
return ConnectionManager.getApiClient(currentItem.ServerId);
}
function bindAll(elems, eventName, fn) {
@ -370,7 +370,7 @@ import '../../assets/css/flexstyles.css';
}
function getItem(itemId, serverId) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
if (itemId) {
return apiClient.getItem(apiClient.getCurrentUserId(), itemId);
@ -380,7 +380,7 @@ import '../../assets/css/flexstyles.css';
}
function getEditorConfig(itemId, serverId) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
if (itemId) {
return apiClient.getJSON(apiClient.getUrl('Items/' + itemId + '/MetadataEditor'));
@ -1068,7 +1068,7 @@ import '../../assets/css/flexstyles.css';
currentContext = dlg;
init(dlg, window.connectionManager.getApiClient(serverId));
init(dlg, ConnectionManager.getApiClient(serverId));
reload(dlg, itemId, serverId);
});
@ -1095,7 +1095,7 @@ import '../../assets/css/flexstyles.css';
currentContext = elem;
init(elem, window.connectionManager.getApiClient(serverId));
init(elem, ConnectionManager.getApiClient(serverId));
reload(elem, itemId, serverId);
focusManager.autoFocus(elem);

6
src/components/multiSelect/multiSelect.js
View file

@ -1,7 +1,7 @@
import browser from '../../scripts/browser';
import appHost from '../apphost';
import { appHost } from '../apphost';
import loading from '../loading/loading';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import globalize from '../../scripts/globalize';
import dom from '../../scripts/dom';
import './multiSelect.css';
@ -170,7 +170,7 @@ import './multiSelect.css';
}
function showMenuForSelectedItems(e) {
const apiClient = window.connectionManager.currentApiClient();
const apiClient = ConnectionManager.currentApiClient();
apiClient.getCurrentUser().then(user => {
const menuItems = [];

4
src/components/notifications/notifications.js
View file

@ -1,6 +1,6 @@
import serverNotifications from '../../scripts/serverNotifications';
import playbackManager from '../playback/playbackmanager';
import events from 'jellyfin-apiclient';
import { playbackManager } from '../playback/playbackmanager';
import { events } from 'jellyfin-apiclient';
import globalize from '../../scripts/globalize';
function onOneDocumentClick() {

19
src/components/nowPlayingBar/nowPlayingBar.js
View file

@ -1,13 +1,12 @@
import datetime from '../../scripts/datetime';
import events from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import browser from '../../scripts/browser';
import imageLoader from '../../scripts/imagehelper';
import layoutManager from '../layoutManager';
import playbackManager from '../playback/playbackmanager';
import { playbackManager } from '../playback/playbackmanager';
import nowPlayingHelper from '../playback/nowplayinghelper';
import appHost from '../apphost';
import { appHost } from '../apphost';
import dom from '../../scripts/dom';
import connectionManager from 'jellyfin-apiclient';
import itemContextMenu from '../itemContextMenu';
import '../../elements/emby-button/paper-icon-button-light';
import '../../elements/emby-ratingbutton/emby-ratingbutton';
@ -452,7 +451,7 @@ import '../../elements/emby-ratingbutton/emby-ratingbutton';
if (item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
}
}
@ -460,12 +459,12 @@ import '../../elements/emby-ratingbutton/emby-ratingbutton';
if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
}
if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
}
}
@ -482,12 +481,12 @@ import '../../elements/emby-ratingbutton/emby-ratingbutton';
if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type];
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
}
if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
}
return null;
@ -548,7 +547,7 @@ import '../../elements/emby-ratingbutton/emby-ratingbutton';
if (nowPlayingItem.Id) {
if (isRefreshing) {
const apiClient = window.connectionManager.getApiClient(nowPlayingItem.ServerId);
const apiClient = ConnectionManager.getApiClient(nowPlayingItem.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
const userData = item.UserData || {};
const likes = userData.Likes == null ? '' : userData.Likes;

2
src/components/packageManager.js
View file

@ -1,5 +1,5 @@
import appSettings from '../scripts/settings/appSettings';
import pluginManager from './pluginManager';
import { pluginManager } from './pluginManager';
/* eslint-disable indent */
class PackageManager {

4
src/components/playback/brightnessosd.js
View file

@ -1,5 +1,5 @@
import events from 'jellyfin-apiclient';
import playbackManager from './playbackmanager';
import { events } from 'jellyfin-apiclient';
import { playbackManager } from './playbackmanager';
import dom from '../../scripts/dom';
import browser from '../../scripts/browser';
import './iconosd.css';

15
src/components/playback/mediasession.js
View file

@ -1,7 +1,6 @@
import playbackManager from '../playback/playbackmanager';
import { playbackManager } from '../playback/playbackmanager';
import nowPlayingHelper from '../playback/nowplayinghelper';
import events from 'jellyfin-apiclient';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
/* eslint-disable indent */
// Reports media playback to the device for lock screen control
@ -16,16 +15,16 @@ import connectionManager from 'jellyfin-apiclient';
} else if (options.type === 'Primary' && item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} else if (options.type === 'Thumb') {
if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} else if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
}
}
@ -38,11 +37,11 @@ import connectionManager from 'jellyfin-apiclient';
if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type];
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.Id, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.Id, options);
} else if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
}
return null;

73
src/components/playback/playbackmanager.js
View file

@ -1,15 +1,14 @@
import events from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import datetime from '../../scripts/datetime';
import appSettings from '../../scripts/settings/appSettings';
import itemHelper from '../itemHelper';
import pluginManager from '../pluginManager';
import { pluginManager } from '../pluginManager';
import PlayQueueManager from './playqueuemanager';
import * as userSettings from '../../scripts/settings/userSettings';
import globalize from '../../scripts/globalize';
import connectionManager from 'jellyfin-apiclient';
import loading from '../loading/loading';
import appHost from '../apphost';
import screenfull from 'screenfull';
import { appHost } from '../apphost';
import * as Screenfull from 'screenfull';
function enableLocalPlaylistManagement(player) {
if (player.getPlaylist) {
@ -24,8 +23,8 @@ function enableLocalPlaylistManagement(player) {
}
function bindToFullscreenChange(player) {
if (screenfull.isEnabled) {
screenfull.on('change', function () {
if (Screenfull.isEnabled) {
Screenfull.on('change', function () {
events.trigger(player, 'fullscreenchange');
});
} else {
@ -69,7 +68,7 @@ function reportPlayback(playbackManagerInstance, state, player, reportPlaylist,
addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId);
}
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
const reportPlaybackPromise = apiClient[method](info);
// Notify that report has been sent
reportPlaybackPromise.then(() => {
@ -106,7 +105,7 @@ function normalizeName(t) {
}
function getItemsForPlayback(serverId, query) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
if (query.Ids && query.Ids.split(',').length === 1) {
const itemId = query.Ids.split(',');
@ -870,7 +869,7 @@ class PlaybackManager {
const promises = players.filter(displayPlayerIndividually).map(getPlayerTargets);
return Promise.all(promises).then(function (responses) {
return window.connectionManager.currentApiClient().getCurrentUser().then(function (user) {
return ConnectionManager.currentApiClient().getCurrentUser().then(function (user) {
const targets = [];
targets.push({
@ -1368,7 +1367,7 @@ class PlaybackManager {
function getSavedMaxStreamingBitrate(apiClient, mediaType) {
if (!apiClient) {
// This should hopefully never happen
apiClient = window.connectionManager.currentApiClient();
apiClient = ConnectionManager.currentApiClient();
}
const endpointInfo = apiClient.getSavedEndpointInfo() || {};
@ -1391,7 +1390,7 @@ class PlaybackManager {
const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
const currentItem = self.currentItem(player);
const apiClient = currentItem ? window.connectionManager.getApiClient(currentItem.ServerId) : window.connectionManager.currentApiClient();
const apiClient = currentItem ? ConnectionManager.getApiClient(currentItem.ServerId) : ConnectionManager.currentApiClient();
return getSavedMaxStreamingBitrate(apiClient, mediaType);
};
@ -1405,7 +1404,7 @@ class PlaybackManager {
const mediaType = playerData.streamInfo ? playerData.streamInfo.mediaType : null;
const currentItem = self.currentItem(player);
const apiClient = currentItem ? window.connectionManager.getApiClient(currentItem.ServerId) : window.connectionManager.currentApiClient();
const apiClient = currentItem ? ConnectionManager.getApiClient(currentItem.ServerId) : ConnectionManager.currentApiClient();
const endpointInfo = apiClient.getSavedEndpointInfo() || {};
return appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType);
@ -1417,7 +1416,7 @@ class PlaybackManager {
return player.setMaxStreamingBitrate(options);
}
const apiClient = window.connectionManager.getApiClient(self.currentItem(player).ServerId);
const apiClient = ConnectionManager.getApiClient(self.currentItem(player).ServerId);
apiClient.getEndpointInfo().then(function (endpointInfo) {
const playerData = getPlayerData(player);
@ -1448,12 +1447,12 @@ class PlaybackManager {
return player.isFullscreen();
}
if (!screenfull.isEnabled) {
if (!Screenfull.isEnabled) {
// iOS Safari
return document.webkitIsFullScreen;
}
return screenfull.isFullscreen;
return Screenfull.isFullscreen;
};
self.toggleFullscreen = function (player) {
@ -1462,8 +1461,8 @@ class PlaybackManager {
return player.toggleFullscreen();
}
if (screenfull.isEnabled) {
screenfull.toggle();
if (Screenfull.isEnabled) {
Screenfull.toggle();
} else {
// iOS Safari
if (document.webkitIsFullScreen && document.webkitCancelFullscreen) {
@ -1679,7 +1678,7 @@ class PlaybackManager {
const subtitleStreamIndex = params.SubtitleStreamIndex == null ? getPlayerData(player).subtitleStreamIndex : params.SubtitleStreamIndex;
let currentMediaSource = self.currentMediaSource(player);
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
const apiClient = ConnectionManager.getApiClient(currentItem.ServerId);
if (ticks) {
ticks = parseInt(ticks);
@ -1835,7 +1834,7 @@ class PlaybackManager {
}, queryOptions));
} else if (firstItem.Type === 'Episode' && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {
promise = new Promise(function (resolve, reject) {
const apiClient = window.connectionManager.getApiClient(firstItem.ServerId);
const apiClient = ConnectionManager.getApiClient(firstItem.ServerId);
apiClient.getCurrentUser().then(function (user) {
if (!user.Configuration.EnableNextEpisodeAutoPlay || !firstItem.SeriesId) {
@ -2066,7 +2065,7 @@ class PlaybackManager {
return playOther(items, options, user);
}
const apiClient = window.connectionManager.getApiClient(firstItem.ServerId);
const apiClient = ConnectionManager.getApiClient(firstItem.ServerId);
return getIntros(firstItem, apiClient, options).then(function (introsResult) {
const introItems = introsResult.Items;
@ -2129,14 +2128,14 @@ class PlaybackManager {
const mediaType = item.MediaType;
const onBitrateDetectionFailure = function () {
return playAfterBitrateDetect(getSavedMaxStreamingBitrate(window.connectionManager.getApiClient(item.ServerId), mediaType), item, playOptions, onPlaybackStartedFn);
return playAfterBitrateDetect(getSavedMaxStreamingBitrate(ConnectionManager.getApiClient(item.ServerId), mediaType), item, playOptions, onPlaybackStartedFn);
};
if (!isServerItem(item) || itemHelper.isLocalItem(item)) {
return onBitrateDetectionFailure();
}
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
apiClient.getEndpointInfo().then(function (endpointInfo) {
if ((mediaType === 'Video' || mediaType === 'Audio') && appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType)) {
return apiClient.detectBitrate().then(function (bitrate) {
@ -2255,7 +2254,7 @@ class PlaybackManager {
return Promise.all([promise, player.getDeviceProfile(item)]).then(function (responses) {
const deviceProfile = responses[1];
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
const mediaSourceId = playOptions.mediaSourceId;
const audioStreamIndex = playOptions.audioStreamIndex;
@ -2300,11 +2299,11 @@ class PlaybackManager {
const startPosition = options.startPositionTicks || 0;
const mediaType = options.mediaType || item.MediaType;
const player = getPlayer(item, options);
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
// Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
return apiClient.getEndpointInfo().then(function () {
const maxBitrate = getSavedMaxStreamingBitrate(window.connectionManager.getApiClient(item.ServerId), mediaType);
const maxBitrate = getSavedMaxStreamingBitrate(ConnectionManager.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) {
return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, options.mediaSourceId, options.audioStreamIndex, options.subtitleStreamIndex).then(function (mediaSource) {
@ -2320,11 +2319,11 @@ class PlaybackManager {
const mediaType = options.mediaType || item.MediaType;
// TODO: Remove the true forceLocalPlayer hack
const player = getPlayer(item, options, true);
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
// Call this just to ensure the value is recorded, it is needed with getSavedMaxStreamingBitrate
return apiClient.getEndpointInfo().then(function () {
const maxBitrate = getSavedMaxStreamingBitrate(window.connectionManager.getApiClient(item.ServerId), mediaType);
const maxBitrate = getSavedMaxStreamingBitrate(ConnectionManager.getApiClient(item.ServerId), mediaType);
return player.getDeviceProfile(item).then(function (deviceProfile) {
return getPlaybackInfo(player, apiClient, item, deviceProfile, maxBitrate, startPosition, false, null, null, null, null).then(function (playbackInfoResult) {
@ -2708,7 +2707,7 @@ class PlaybackManager {
const queueDirectToPlayer = player && !enableLocalPlaylistManagement(player);
if (queueDirectToPlayer) {
const apiClient = window.connectionManager.getApiClient(items[0].ServerId);
const apiClient = ConnectionManager.getApiClient(items[0].ServerId);
player.getDeviceProfile(items[0]).then(function (profile) {
setStreamUrls(items, profile, self.getMaxStreamingBitrate(player), apiClient, 0).then(function () {
@ -3158,13 +3157,13 @@ class PlaybackManager {
streamInfo.lastMediaInfoQuery = new Date().getTime();
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
if (!apiClient.isMinServerVersion('3.2.70.7')) {
return;
}
window.connectionManager.getApiClient(serverId).getLiveStreamMediaInfo(liveStreamId).then(function (info) {
ConnectionManager.getApiClient(serverId).getLiveStreamMediaInfo(liveStreamId).then(function (info) {
mediaSource.MediaStreams = info.MediaStreams;
events.trigger(player, 'mediastreamschange');
}, function () {
@ -3221,7 +3220,7 @@ class PlaybackManager {
return Promise.reject();
}
const apiClient = window.connectionManager.getApiClient(nextItem.item.ServerId);
const apiClient = ConnectionManager.getApiClient(nextItem.item.ServerId);
return apiClient.getItem(apiClient.getCurrentUserId(), nextItem.item.Id);
}
@ -3362,7 +3361,7 @@ class PlaybackManager {
return player.playTrailers(item);
}
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
const instance = this;
@ -3394,7 +3393,7 @@ class PlaybackManager {
}
getSubtitleUrl(textStream, serverId) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
return !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
}
@ -3474,7 +3473,7 @@ class PlaybackManager {
return player.instantMix(item);
}
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
const options = {};
options.UserId = apiClient.getCurrentUserId();
@ -3758,7 +3757,7 @@ class PlaybackManager {
}
}
const playbackManager = new PlayQueueManager();
export const playbackManager = new PlaybackManager();
window.addEventListener('beforeunload', function () {
try {
@ -3767,5 +3766,3 @@ window.addEventListener('beforeunload', function () {
console.error('error in onAppClose: ' + err);
}
});
export default playbackManager;

4
src/components/playback/playbackorientation.js
View file

@ -1,7 +1,7 @@
import playbackManager from './playbackmanager';
import { playbackManager } from './playbackmanager';
import layoutManager from '../layoutManager';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
let orientationLocked;

8
src/components/playback/playerSelectionMenu.js
View file

@ -1,11 +1,11 @@
import appSettings from '../../scripts/settings/appSettings';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import browser from '../../scripts/browser';
import loading from '../loading/loading';
import playbackManager from '../playback/playbackmanager';
import appRouter from '../appRouter';
import { playbackManager } from '../playback/playbackmanager';
import { appRouter } from '../appRouter';
import globalize from '../../scripts/globalize';
import appHost from '../apphost';
import { appHost } from '../apphost';
import { enable, isEnabled, supported } from '../../scripts/autocast';
function mirrorItem(info, player) {

6
src/components/playback/playersettingsmenu.js
View file

@ -1,6 +1,6 @@
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import actionsheet from '../actionSheet/actionSheet';
import playbackManager from '../playback/playbackmanager';
import { playbackManager } from '../playback/playbackmanager';
import globalize from '../../scripts/globalize';
import qualityoptions from '../qualityOptions';
@ -251,7 +251,7 @@ export function show(options) {
return showWithUser(options, player, null);
}
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
var apiClient = ConnectionManager.getApiClient(currentItem.ServerId);
return apiClient.getCurrentUser().then(function (user) {
return showWithUser(options, player, user);
});

4
src/components/playback/remotecontrolautoplay.js
View file

@ -1,5 +1,5 @@
import events from 'jellyfin-apiclient';
import playbackManager from '../playback/playbackmanager';
import { events } from 'jellyfin-apiclient';
import { playbackManager } from '../playback/playbackmanager';
function transferPlayback(oldPlayer, newPlayer) {
const state = playbackManager.getPlayerState(oldPlayer);

4
src/components/playback/volumeosd.js
View file

@ -1,6 +1,6 @@
import events from 'jellyfin-apiclient';
import playbackManager from './playbackmanager';
import { events } from 'jellyfin-apiclient';
import { playbackManager } from './playbackmanager';
import dom from '../../scripts/dom';
import browser from '../../scripts/browser';
import './iconosd.css';

9
src/components/playbackSettings/playbackSettings.js
View file

@ -1,12 +1,11 @@
import browser from '../../scripts/browser';
import appSettings from '../../scripts/settings/appSettings';
import appHost from '../apphost';
import { appHost } from '../apphost';
import focusManager from '../focusManager';
import qualityoptions from '../qualityOptions';
import globalize from '../../scripts/globalize';
import loading from '../loading/loading';
import connectionManager from 'jellyfin-apiclient';
import events from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import '../../elements/emby-select/emby-select';
import '../../elements/emby-checkbox/emby-checkbox';
@ -258,7 +257,7 @@ import '../../elements/emby-checkbox/emby-checkbox';
function onSubmit(e) {
const self = this;
const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const apiClient = ConnectionManager.getApiClient(self.options.serverId);
const userId = self.options.userId;
const userSettings = self.options.userSettings;
@ -305,7 +304,7 @@ import '../../elements/emby-checkbox/emby-checkbox';
loading.show();
const userId = self.options.userId;
const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const apiClient = ConnectionManager.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(user => {

9
src/components/playerstats/playerstats.js
View file

@ -1,9 +1,8 @@
import connectionManager from 'jellyfin-apiclient';
import events from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import '../../elements/emby-button/paper-icon-button-light';
import globalize from '../../scripts/globalize';
import layoutManager from '../layoutManager';
import playbackManager from '../playback/playbackmanager';
import { playbackManager } from '../playback/playbackmanager';
import playMethodHelper from '../playback/playmethodhelper';
import syncPlayManager from '../syncPlay/syncPlayManager';
import './playerstats.css';
@ -95,7 +94,7 @@ import './playerstats.css';
return Promise.resolve(instance.lastSession);
}
const apiClient = window.connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
const apiClient = ConnectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
return apiClient.getSessions({
deviceId: apiClient.deviceId()
@ -414,7 +413,7 @@ import './playerstats.css';
name: 'Original Media Info'
});
const apiClient = window.connectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
var apiClient = ConnectionManager.getApiClient(playbackManager.currentItem(player).ServerId);
if (syncPlayManager.isSyncPlayEnabled() && apiClient.isMinServerVersion('10.6.0')) {
categories.push({
stats: getSyncPlayStats(),

10
src/components/playlisteditor/playlisteditor.js
View file

@ -2,10 +2,10 @@ import dom from '../../scripts/dom';
import dialogHelper from '../dialogHelper/dialogHelper';
import loading from '../loading/loading';
import layoutManager from '../layoutManager';
import playbackManager from '../playback/playbackmanager';
import connectionManager from 'jellyfin-apiclient';
import { playbackManager } from '../playback/playbackmanager';
import { ConnectionManager } from 'jellyfin-apiclient';
import * as userSettings from '../../scripts/settings/userSettings';
import appRouter from '../appRouter';
import { appRouter } from '../appRouter';
import globalize from '../../scripts/globalize';
import '../../elements/emby-button/emby-button';
import '../../elements/emby-input/emby-input';
@ -22,7 +22,7 @@ import '../formdialog.css';
const panel = dom.parentWithClass(this, 'dialog');
const playlistId = panel.querySelector('#selectPlaylistToAddTo').value;
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
if (playlistId) {
userSettings.set('playlisteditor-lastplaylistid', playlistId);
@ -113,7 +113,7 @@ import '../formdialog.css';
EnableTotalRecordCount: false
};
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
apiClient.getItems(apiClient.getCurrentUserId(), options).then(result => {
let html = '';

2
src/components/playmenu.js
View file

@ -1,6 +1,6 @@
import actionsheet from './actionSheet/actionSheet';
import datetime from '../scripts/datetime';
import playbackManager from './playback/playbackmanager';
import { playbackManager } from './playback/playbackmanager';
import globalize from '../scripts/globalize';
export function show(options) {

22
src/components/pluginManager.js
View file

@ -1,4 +1,4 @@
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import globalize from '../scripts/globalize';
/* eslint-disable indent */
@ -41,7 +41,7 @@ import globalize from '../scripts/globalize';
return Promise.resolve(plugin);
} else {
return new Promise((resolve, reject) => {
this.#loadStrings(plugin)
PluginManager.loadStrings(plugin)
.then(function () {
resolve(plugin);
})
@ -52,19 +52,16 @@ import globalize from '../scripts/globalize';
loadPlugin(pluginSpec) {
if (typeof pluginSpec === 'string') {
console.debug('Loading plugin (via deprecated requirejs method): ' + pluginSpec);
return new Promise((resolve, reject) => {
require([pluginSpec], (pluginFactory) => {
const plugin = pluginFactory.default ? new pluginFactory.default() : new pluginFactory();
console.debug('Loading plugin (via dynamic import): ' + pluginSpec);
import(/* webpackChunkName: "[request]" */ `../plugins/${pluginSpec}`).then((plugin) => {
// See if it's already installed
const existing = this.pluginsList.filter(function (p) {
const existing = this.plugins.filter(function (p) {
return p.id === plugin.id;
})[0];
if (existing) {
resolve(pluginSpec);
return Promise.resolve(pluginSpec);
}
plugin.installUrl = pluginSpec;
@ -80,11 +77,10 @@ import globalize from '../scripts/globalize';
paths: paths
});
this.#registerPlugin(plugin).then(resolve).catch(reject);
});
this.#registerPlugin(plugin).then(Promise.resolve).catch(Promise.reject);
});
} else if (pluginSpec.then) {
return pluginSpec.then(pluginBuilder => {
return pluginSpec.then(({ default: pluginBuilder }) => {
return pluginBuilder();
}).then((plugin) => {
console.debug(`Plugin loaded: ${plugin.id}`);
@ -148,4 +144,4 @@ import globalize from '../scripts/globalize';
/* eslint-enable indent */
export default new PluginManager();
export const pluginManager = new PluginManager();

4
src/components/recordingcreator/recordingbutton.js
View file

@ -1,4 +1,4 @@
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import dom from '../../scripts/dom';
import recordingHelper from './recordinghelper';
import '../../elements/emby-button/paper-icon-button-light';
@ -53,7 +53,7 @@ class RecordingButton {
}
refresh(serverId, itemId) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
const self = this;
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
self.refreshItem(item);

9
src/components/recordingcreator/recordingcreator.js
View file

@ -2,13 +2,12 @@ import dialogHelper from '../dialogHelper/dialogHelper';
import globalize from '../../scripts/globalize';
import layoutManager from '../layoutManager';
import mediaInfo from '../mediainfo/mediainfo';
import connectionManager from 'jellyfin-apiclient';
import loading from '../loading/loading';
import scrollHelper from '../../scripts/scrollHelper';
import datetime from '../../scripts/datetime';
import imageLoader from '../images/imageLoader';
import recordingFields from './recordingfields';
import events from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import '../../elements/emby-button/emby-button';
import '../../elements/emby-button/paper-icon-button-light';
import '../../elements/emby-checkbox/emby-checkbox';
@ -102,7 +101,7 @@ function renderRecording(context, defaultTimer, program, apiClient, refreshRecor
function reload(context, programId, serverId, refreshRecordingStateOnly) {
loading.show();
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
const promise1 = apiClient.getNewLiveTvTimerDefaults({ programId: programId });
const promise2 = apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId());
@ -117,8 +116,8 @@ function reload(context, programId, serverId, refreshRecordingStateOnly) {
function executeCloseAction(action, programId, serverId) {
if (action === 'play') {
import('../playback/playbackmanager').then(({ default: playbackManager }) => {
const apiClient = connectionManager.getApiClient(serverId);
import('../playback/playbackmanager').then((playbackManager) => {
const apiClient = ConnectionManager.getApiClient(serverId);
apiClient.getLiveTvProgram(programId, apiClient.getCurrentUserId()).then(function (item) {
playbackManager.play({

8
src/components/recordingcreator/recordingeditor.js
View file

@ -2,7 +2,7 @@
import dialogHelper from '../dialogHelper/dialogHelper';
import globalize from '../../scripts/globalize';
import layoutManager from '../layoutManager';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import loading from '../loading/loading';
import scrollHelper from '../../scripts/scrollHelper';
import '../../assets/css/scrollstyles.css';
@ -42,7 +42,7 @@ function closeDialog(isDeleted) {
function onSubmit(e) {
const form = this;
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
apiClient.getLiveTvTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
@ -62,7 +62,7 @@ function init(context) {
});
context.querySelector('.btnCancelRecording').addEventListener('click', function () {
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
deleteTimer(apiClient, currentItemId).then(function () {
closeDialog(true);
@ -76,7 +76,7 @@ function reload(context, id) {
loading.show();
currentItemId = id;
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
apiClient.getLiveTvTimer(id).then(function (result) {
renderTimer(context, result, apiClient);
loading.hide();

9
src/components/recordingcreator/recordingfields.js
View file

@ -1,10 +1,9 @@
import globalize from '../../scripts/globalize';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import serverNotifications from '../../scripts/serverNotifications';
import loading from '../loading/loading';
import dom from '../../scripts/dom';
import recordingHelper from './recordinghelper';
import events from 'jellyfin-apiclient';
import '../../elements/emby-button/emby-button';
import '../../elements/emby-button/paper-icon-button-light';
import './recordingfields.css';
@ -46,7 +45,7 @@ function loadData(parent, program, apiClient) {
function fetchData(instance) {
const options = instance.options;
const apiClient = window.connectionManager.getApiClient(options.serverId);
const apiClient = ConnectionManager.getApiClient(options.serverId);
options.parent.querySelector('.recordingFields').classList.remove('hide');
return apiClient.getLiveTvProgram(options.programId, apiClient.getCurrentUserId()).then(function (program) {
@ -197,7 +196,7 @@ function onRecordChange(e) {
const self = this;
const options = this.options;
const apiClient = window.connectionManager.getApiClient(options.serverId);
const apiClient = ConnectionManager.getApiClient(options.serverId);
const button = dom.parentWithTag(e.target, 'BUTTON');
const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');
@ -236,7 +235,7 @@ function onRecordSeriesChange(e) {
const self = this;
const options = this.options;
const apiClient = window.connectionManager.getApiClient(options.serverId);
const apiClient = ConnectionManager.getApiClient(options.serverId);
const button = dom.parentWithTag(e.target, 'BUTTON');
const isChecked = !button.querySelector('.material-icons').classList.contains('recordingIcon-active');

10
src/components/recordingcreator/recordinghelper.js
View file

@ -1,6 +1,6 @@
import globalize from '../../scripts/globalize';
import loading from '../loading/loading';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
/*eslint prefer-const: "error"*/
@ -40,7 +40,7 @@ function cancelTimerWithConfirmation(timerId, serverId) {
}).then(function () {
loading.show();
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
cancelTimer(apiClient, timerId, true).then(resolve, reject);
}, reject);
});
@ -60,7 +60,7 @@ function cancelSeriesTimerWithConfirmation(timerId, serverId) {
}).then(function () {
loading.show();
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
apiClient.cancelLiveTvSeriesTimer(timerId).then(function () {
import('../toast/toast').then((toast) => {
toast(globalize.translate('SeriesCancelled'));
@ -141,7 +141,7 @@ function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus,
buttons: items
}).then(function (result) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
if (result === 'canceltimer') {
loading.show();
@ -167,7 +167,7 @@ function showMultiCancellationPrompt(serverId, programId, timerId, timerStatus,
}
function toggleRecording(serverId, programId, timerId, timerStatus, seriesTimerId) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
const hasTimer = timerId && timerStatus !== 'Cancelled';
if (seriesTimerId && hasTimer) {
// cancel

8
src/components/recordingcreator/seriesrecordingeditor.js
View file

@ -1,7 +1,7 @@
import dialogHelper from '../dialogHelper/dialogHelper';
import globalize from '../../scripts/globalize';
import layoutManager from '../layoutManager';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import loading from '../loading/loading';
import scrollHelper from '../../scripts/scrollHelper';
import datetime from '../../scripts/datetime';
@ -64,7 +64,7 @@ function closeDialog(isDeleted) {
function onSubmit(e) {
const form = this;
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
apiClient.getLiveTvSeriesTimer(currentItemId).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
@ -92,7 +92,7 @@ function init(context) {
});
context.querySelector('.btnCancelRecording').addEventListener('click', function () {
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
deleteTimer(apiClient, currentItemId).then(function () {
closeDialog(true);
});
@ -102,7 +102,7 @@ function init(context) {
}
function reload(context, id) {
const apiClient = window.connectionManager.getApiClient(currentServerId);
const apiClient = ConnectionManager.getApiClient(currentServerId);
loading.show();
if (typeof id === 'string') {

4
src/components/refreshdialog/refreshdialog.js
View file

@ -2,7 +2,7 @@ import dom from '../../scripts/dom';
import dialogHelper from '../dialogHelper/dialogHelper';
import loading from '../loading/loading';
import layoutManager from '../layoutManager';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import globalize from '../../scripts/globalize';
import '../../elements/emby-input/emby-input';
import '../../elements/emby-button/emby-button';
@ -66,7 +66,7 @@ function onSubmit(e) {
const dlg = dom.parentWithClass(e.target, 'dialog');
const options = instance.options;
const apiClient = window.connectionManager.getApiClient(options.serverId);
const apiClient = ConnectionManager.getApiClient(options.serverId);
const replaceAllMetadata = dlg.querySelector('#selectMetadataRefreshMode').value === 'all';

19
src/components/remotecontrol/remotecontrol.js
View file

@ -2,11 +2,10 @@ import datetime from '../../scripts/datetime';
import backdrop from '../backdrop/backdrop';
import listView from '../listview/listview';
import imageLoader from '../images/imageLoader';
import playbackManager from '../playback/playbackmanager';
import { playbackManager } from '../playback/playbackmanager';
import nowPlayingHelper from '../playback/nowplayinghelper';
import events from 'jellyfin-apiclient';
import connectionManager from 'jellyfin-apiclient';
import appHost from '../apphost';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import { appHost } from '../apphost';
import globalize from '../../scripts/globalize';
import layoutManager from '../layoutManager';
import * as userSettings from '../../scripts/settings/userSettings';
@ -96,18 +95,18 @@ function seriesImageUrl(item, options) {
options.type = options.type || 'Primary';
if (options.type === 'Primary' && item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
}
if (options.type === 'Thumb') {
if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
}
if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
}
}
@ -120,12 +119,12 @@ function imageUrl(item, options) {
if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type];
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.PrimaryImageItemId || item.Id, options);
}
if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag;
return window.connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
return ConnectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
}
return null;
@ -216,7 +215,7 @@ function updateNowPlayingInfo(context, state, serverId) {
openAlbum: false,
positionTo: contextButton
};
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
apiClient.getCurrentUser().then(function (user) {
contextButton.addEventListener('click', function () {

2
src/components/search/searchfields.js
View file

@ -1,6 +1,6 @@
import layoutManager from '../layoutManager';
import globalize from '../../scripts/globalize';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import browser from '../../scripts/browser';
import AlphaPicker from '../alphaPicker/alphaPicker';
import '../../elements/emby-input/emby-input';

6
src/components/search/searchresults.js
View file

@ -1,8 +1,8 @@
import layoutManager from '../layoutManager';
import globalize from '../../scripts/globalize';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import cardBuilder from '../cardbuilder/cardBuilder';
import appRouter from '../appRouter';
import { appRouter } from '../appRouter';
import '../../elements/emby-scroller/emby-scroller';
import '../../elements/emby-itemscontainer/emby-itemscontainer';
import '../../elements/emby-button/emby-button';
@ -606,7 +606,7 @@ class SearchResults {
embed(options.element, this, options);
}
search(value) {
const apiClient = window.connectionManager.getApiClient(this.options.serverId);
const apiClient = ConnectionManager.getApiClient(this.options.serverId);
search(this, apiClient, this.options.element, value);
}

14
src/components/shortcuts.js
View file

@ -5,10 +5,10 @@
* @module components/shortcuts
*/
import playbackManager from './playback/playbackmanager';
import { playbackManager } from './playback/playbackmanager';
import inputManager from '../scripts/inputManager';
import connectionManager from 'jellyfin-apiclient';
import appRouter from './appRouter';
import { ConnectionManager } from 'jellyfin-apiclient';
import { appRouter } from './appRouter';
import globalize from '../scripts/globalize';
import dom from '../scripts/dom';
import recordingHelper from './recordingcreator/recordinghelper';
@ -82,7 +82,7 @@ import recordingHelper from './recordingcreator/recordinghelper';
const id = button.getAttribute('data-id');
const type = button.getAttribute('data-type');
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
if (type === 'Timer') {
return apiClient.getLiveTvTimer(id);
@ -112,7 +112,7 @@ import recordingHelper from './recordingcreator/recordinghelper';
}
import('./itemContextMenu').then((itemContextMenu) => {
window.connectionManager.getApiClient(item.ServerId).getCurrentUser().then(user => {
ConnectionManager.getApiClient(item.ServerId).getCurrentUser().then(user => {
itemContextMenu.show(Object.assign({
item: item,
play: true,
@ -281,7 +281,7 @@ import recordingHelper from './recordingcreator/recordinghelper';
}
function playTrailer(item) {
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(trailers => {
playbackManager.play({ items: trailers });
@ -289,7 +289,7 @@ import recordingHelper from './recordingcreator/recordinghelper';
}
function editItem(item, serverId) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
return new Promise((resolve, reject) => {
const serverId = apiClient.serverInfo().Id;

6
src/components/slideshow/slideshow.js
View file

@ -4,11 +4,11 @@
*/
import dialogHelper from '../dialogHelper/dialogHelper';
import inputManager from '../../scripts/inputManager';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import layoutManager from '../layoutManager';
import focusManager from '../focusManager';
import browser from '../../scripts/browser';
import appHost from '../apphost';
import { appHost } from '../apphost';
import dom from '../../scripts/dom';
import './style.css';
import 'material-design-icons-iconfont';
@ -85,7 +85,7 @@ function getBackdropImageUrl(item, options, apiClient) {
* @returns {string} URL of the item's image.
*/
function getImgUrl(item, user) {
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
const imageOptions = {};
if (item.BackdropImageTags && item.BackdropImageTags.length) {

10
src/components/subtitleeditor/subtitleeditor.js
View file

@ -3,7 +3,7 @@ import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from '../layoutManager';
import globalize from '../../scripts/globalize';
import * as userSettings from '../../scripts/settings/userSettings';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import loading from '../loading/loading';
import focusManager from '../focusManager';
import dom from '../../scripts/dom';
@ -22,7 +22,7 @@ let hasChanges;
function downloadRemoteSubtitles(context, id) {
const url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id;
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
const apiClient = ConnectionManager.getApiClient(currentItem.ServerId);
apiClient.ajax({
type: 'POST',
@ -56,7 +56,7 @@ function deleteLocalSubtitle(context, index) {
const itemId = currentItem.Id;
const url = 'Videos/' + itemId + '/Subtitles/' + index;
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
const apiClient = ConnectionManager.getApiClient(currentItem.ServerId);
apiClient.ajax({
@ -244,7 +244,7 @@ function searchForSubtitles(context, language) {
loading.show();
const apiClient = window.connectionManager.getApiClient(currentItem.ServerId);
const apiClient = ConnectionManager.getApiClient(currentItem.ServerId);
const url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language);
apiClient.getJSON(url).then(function (results) {
@ -357,7 +357,7 @@ function centerFocus(elem, horiz, on) {
function showEditorInternal(itemId, serverId, template) {
hasChanges = false;
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
const dialogOptions = {
removeOnClose: true,

9
src/components/subtitlesettings/subtitlesettings.js
View file

@ -1,14 +1,13 @@
import globalize from '../../scripts/globalize';
import appHost from '../apphost';
import { appHost } from '../apphost';
import appSettings from '../../scripts/settings/appSettings';
import focusManager from '../focusManager';
import layoutManager from '../layoutManager';
import loading from '../loading/loading';
import connectionManager from 'jellyfin-apiclient';
import subtitleAppearanceHelper from './subtitleappearancehelper';
import settingsHelper from '../settingshelper';
import dom from '../../scripts/dom';
import events from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import '../listview/listview.css';
import '../../elements/emby-select/emby-select';
import '../../elements/emby-slider/emby-slider';
@ -232,7 +231,7 @@ export class SubtitleSettings {
loading.show();
const userId = self.options.userId;
const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const apiClient = ConnectionManager.getApiClient(self.options.serverId);
const userSettings = self.options.userSettings;
apiClient.getUser(userId).then(function (user) {
@ -256,7 +255,7 @@ export class SubtitleSettings {
onSubmit(e) {
const self = this;
const apiClient = window.connectionManager.getApiClient(self.options.serverId);
const apiClient = ConnectionManager.getApiClient(self.options.serverId);
const userId = self.options.userId;
const userSettings = self.options.userSettings;

2
src/components/subtitlesync/subtitlesync.js
View file

@ -1,5 +1,5 @@
import playbackManager from '../playback/playbackmanager';
import { playbackManager } from '../playback/playbackmanager';
import layoutManager from '../layoutManager';
import template from './subtitlesync.template.html';
import './subtitlesync.css';

9
src/components/syncPlay/groupSelectionMenu.js
View file

@ -1,6 +1,5 @@
import events from 'jellyfin-apiclient';
import connectionManager from 'jellyfin-apiclient';
import playbackManager from '../playback/playbackmanager';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import { playbackManager } from '../playback/playbackmanager';
import syncPlayManager from './syncPlayManager';
import loading from '../loading/loading';
import toast from '../toast/toast';
@ -172,8 +171,8 @@ export default function show (button) {
});
});
const apiClient = window.connectionManager.currentApiClient();
window.connectionManager.user(apiClient).then((user) => {
const apiClient = ConnectionManager.currentApiClient();
ConnectionManager.user(apiClient).then((user) => {
if (syncPlayEnabled) {
showLeaveGroupSelection(button, user, apiClient);
} else {

13
src/components/syncPlay/syncPlayManager.js
View file

@ -3,9 +3,8 @@
* @module components/syncPlay/syncPlayManager
*/
import events from 'jellyfin-apiclient';
import connectionManager from 'jellyfin-apiclient';
import playbackManager from '../playback/playbackmanager';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import { playbackManager } from '../playback/playbackmanager';
import timeSyncManager from './timeSyncManager';
import toast from '../toast/toast';
import globalize from '../../scripts//globalize';
@ -128,7 +127,7 @@ class SyncPlayManager {
// Report ping
if (this.syncEnabled) {
const apiClient = window.connectionManager.currentApiClient();
const apiClient = ConnectionManager.currentApiClient();
const sessionId = getActivePlayerId();
if (!sessionId) {
@ -660,7 +659,7 @@ class SyncPlayManager {
* Overrides PlaybackManager's unpause method.
*/
playRequest (player) {
const apiClient = window.connectionManager.currentApiClient();
const apiClient = ConnectionManager.currentApiClient();
apiClient.requestSyncPlayStart();
}
@ -668,7 +667,7 @@ class SyncPlayManager {
* Overrides PlaybackManager's pause method.
*/
pauseRequest (player) {
const apiClient = window.connectionManager.currentApiClient();
const apiClient = ConnectionManager.currentApiClient();
apiClient.requestSyncPlayPause();
// Pause locally as well, to give the user some little control
playbackManager._localUnpause(player);
@ -678,7 +677,7 @@ class SyncPlayManager {
* Overrides PlaybackManager's seek method.
*/
seekRequest (PositionTicks, player) {
const apiClient = window.connectionManager.currentApiClient();
const apiClient = ConnectionManager.currentApiClient();
apiClient.requestSyncPlaySeek({
PositionTicks: PositionTicks
});

5
src/components/syncPlay/timeSyncManager.js
View file

@ -3,8 +3,7 @@
* @module components/syncPlay/timeSyncManager
*/
import events from 'jellyfin-apiclient';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
/**
* Time estimation
@ -114,7 +113,7 @@ class TimeSyncManager {
if (!this.poller) {
this.poller = setTimeout(() => {
this.poller = null;
const apiClient = window.connectionManager.currentApiClient();
const apiClient = ConnectionManager.currentApiClient();
const requestSent = new Date();
apiClient.getServerTime().then((response) => {
const responseReceived = new Date();

6
src/components/themeMediaPlayer.js
View file

@ -1,6 +1,6 @@
import playbackManager from './playback/playbackmanager';
import { playbackManager } from './playback/playbackmanager';
import * as userSettings from '../scripts/settings/userSettings';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
let currentOwnerId;
let currentThemeIds = [];
@ -62,7 +62,7 @@ function loadThemeMedia(item) {
return;
}
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
apiClient.getThemeMedia(apiClient.getCurrentUserId(), item.Id, true).then(function (themeMediaResult) {
const ownerId = themeMediaResult.ThemeVideosResult.Items.length ? themeMediaResult.ThemeVideosResult.OwnerId : themeMediaResult.ThemeSongsResult.OwnerId;

4
src/components/tunerPicker.js
View file

@ -1,7 +1,7 @@
import dialogHelper from './dialogHelper/dialogHelper';
import dom from '../scripts/dom';
import layoutManager from './layoutManager';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import globalize from '../scripts/globalize';
import loading from './loading/loading';
import browser from '../scripts/browser';
@ -163,7 +163,7 @@ function tunerPicker() {
scrollHelper.centerFocus.on(dlg.querySelector('.formDialogContent'), false);
}
const apiClient = window.connectionManager.getApiClient(options.serverId);
const apiClient = ConnectionManager.getApiClient(options.serverId);
discoverDevices(dlg, apiClient);
if (layoutManager.tv) {

5
src/components/upnextdialog/upnextdialog.js
View file

@ -1,7 +1,6 @@
import dom from '../../scripts/dom';
import playbackManager from '../playback/playbackmanager';
import connectionManager from 'jellyfin-apiclient';
import events from 'jellyfin-apiclient';
import { playbackManager } from '../playback/playbackmanager';
import { events } from 'jellyfin-apiclient';
import mediaInfo from '../mediainfo/mediainfo';
import layoutManager from '../layoutManager';
import focusManager from '../focusManager';

10
src/components/userdatabuttons/userdatabuttons.js
View file

@ -1,4 +1,4 @@
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import globalize from '../../scripts/globalize';
import dom from '../../scripts/dom';
import itemHelper from '../itemHelper';
@ -188,12 +188,12 @@ function markPlayed(link) {
}
function likes(id, serverId, isLiked) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
return apiClient.updateUserItemRating(apiClient.getCurrentUserId(), id, isLiked);
}
function played(id, serverId, isPlayed) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
const method = isPlayed ? 'markPlayed' : 'markUnplayed';
@ -201,13 +201,13 @@ function played(id, serverId, isPlayed) {
}
function favorite(id, serverId, isFavorite) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
return apiClient.updateFavoriteStatus(apiClient.getCurrentUserId(), id, isFavorite);
}
function clearLike(id, serverId) {
const apiClient = window.connectionManager.getApiClient(serverId);
const apiClient = ConnectionManager.getApiClient(serverId);
return apiClient.clearUserItemRating(apiClient.getCurrentUserId(), id);
}

3
src/components/viewManager/viewManager.js
View file

@ -1,6 +1,5 @@
import viewContainer from '../viewContainer';
import focusManager from '../focusManager';
import queryString from 'query-string';
import layoutManager from '../layoutManager';
let currentView;
@ -101,7 +100,7 @@ function dispatchViewEvent(view, eventInfo, eventName, isCancellable) {
function getViewEventDetail(view, options, isRestore) {
const url = options.url;
const index = url.indexOf('?');
const params = index === -1 ? {} : queryString.parse(url.substring(index + 1));
const params = new URLSearchParams(url.substring(index + 1));
return {
detail: {

12
src/controllers/dashboard/dashboard.js
View file

@ -1,5 +1,5 @@
import datetime from '../../scripts/datetime';
import { connectionManager, events } from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import itemHelper from '../../components/itemHelper';
import serverNotifications from '../../scripts/serverNotifications';
import dom from '../../scripts/dom';
@ -60,7 +60,7 @@ import taskButton from '../../scripts/taskbutton';
confirmText: globalize.translate('ButtonSend')
}).then(function (text) {
if (text) {
window.connectionManager.getApiClient(session.ServerId).sendMessageCommand(session.Id, {
ConnectionManager.getApiClient(session.ServerId).sendMessageCommand(session.Id, {
Text: text,
TimeoutMs: 5e3
});
@ -73,7 +73,7 @@ import taskButton from '../../scripts/taskbutton';
import('../../components/actionSheet/actionSheet').then(({default: actionsheet}) => {
const menuItems = [];
if (session.ServerId && session.DeviceId !== window.connectionManager.deviceId()) {
if (session.ServerId && session.DeviceId !== ConnectionManager.deviceId()) {
menuItems.push({
name: globalize.translate('SendMessage'),
id: 'sendmessage'
@ -123,9 +123,9 @@ import taskButton from '../../scripts/taskbutton';
} else if (btn.classList.contains('btnSessionSendMessage')) {
showSendMessageForm(btn, session);
} else if (btn.classList.contains('btnSessionStop')) {
window.connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, 'Stop');
ConnectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, 'Stop');
} else if (btn.classList.contains('btnSessionPlayPause') && session.PlayState) {
window.connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, 'PlayPause');
ConnectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, 'PlayPause');
}
}
}
@ -313,7 +313,7 @@ import taskButton from '../../scripts/taskbutton';
btnCssClass = session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length ? '' : ' hide';
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionInfo paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('ViewPlaybackInfo') + '"><span class="material-icons info"></span></button>';
btnCssClass = session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== window.connectionManager.deviceId() ? '' : ' hide';
btnCssClass = session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== ConnectionManager.deviceId() ? '' : ' hide';
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionSendMessage paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('SendMessage') + '"><span class="material-icons message"></span></button>';
html += '</div>';

2
src/controllers/dashboard/scheduledtasks/scheduledtasks.js
View file

@ -1,6 +1,6 @@
import 'jquery';
import loading from '../../../components/loading/loading';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import globalize from '../../../scripts/globalize';
import serverNotifications from '../../../scripts/serverNotifications';
import { formatDistance, formatDistanceToNow } from 'date-fns';

8
src/controllers/favorites.js
View file

@ -1,9 +1,9 @@
import appRouter from '../components/appRouter';
import { appRouter } from '../components/appRouter';
import cardBuilder from '../components/cardbuilder/cardBuilder';
import dom from '../scripts/dom';
import globalize from '../scripts/globalize';
import connectionManager from 'jellyfin-apiclient';
import appHost from '../components/apphost';
import { ConnectionManager } from 'jellyfin-apiclient';
import { appHost } from '../components/apphost';
import layoutManager from '../components/layoutManager';
import focusManager from '../components/focusManager';
import '../elements/emby-itemscontainer/emby-itemscontainer';
@ -270,7 +270,7 @@ class FavoritesTab {
constructor(view, params) {
this.view = view;
this.params = params;
this.apiClient = window.connectionManager.currentApiClient();
this.apiClient = ConnectionManager.currentApiClient();
this.sectionsContainer = view.querySelector('.sections');
createSections(this, this.sectionsContainer, this.apiClient);
}

6
src/controllers/home.js
View file

@ -44,15 +44,15 @@ class HomeView extends TabbedView {
switch (index) {
case 0:
depends = 'controllers/hometab';
depends = 'hometab';
break;
case 1:
depends = 'controllers/favorites';
depends = 'favorites';
}
const instance = this;
return import(depends).then(({ default: controllerFactory }) => {
return import(/* webpackChunkName: "[request]" */ `../controllers/${depends}`).then(({ default: controllerFactory }) => {
let controller = instance.tabControllers[index];
if (!controller) {

3
src/controllers/hometab.js
View file

@ -1,6 +1,5 @@
import * as userSettings from '../scripts/settings/userSettings';
import loading from '../components/loading/loading';
import connectionManager from 'jellyfin-apiclient';
import focusManager from '../components/focusManager';
import homeSections from '../components/homesections/homesections';
import '../elements/emby-itemscontainer/emby-itemscontainer';
@ -9,7 +8,7 @@ class HomeTab {
constructor(view, params) {
this.view = view;
this.params = params;
this.apiClient = window.connectionManager.currentApiClient();
this.apiClient = window.ConnectionManager.currentApiClient();
this.sectionsContainer = view.querySelector('.sections');
view.querySelector('.sections').addEventListener('settingschange', onHomeScreenSettingsChanged.bind(this));
}

32
src/controllers/itemDetails/index.js
View file

@ -1,8 +1,8 @@
import appHost from '../../components/apphost';
import { appHost } from '../../components/apphost';
import loading from '../../components/loading/loading';
import appRouter from '../../components/appRouter';
import { appRouter } from '../../components/appRouter';
import layoutManager from '../../components/layoutManager';
import { connectionManager, events } from 'jellyfin-apiclient';
import { ConnectionManager, events } from 'jellyfin-apiclient';
import * as userSettings from '../../scripts/settings/userSettings';
import cardBuilder from '../../components/cardbuilder/cardBuilder';
import datetime from '../../scripts/datetime';
@ -17,7 +17,7 @@ import imageLoader from '../../components/images/imageLoader';
import libraryMenu from '../../scripts/libraryMenu';
import globalize from '../../scripts/globalize';
import browser from '../../scripts/browser';
import playbackManager from '../../components/playback/playbackmanager';
import { playbackManager } from '../../components/playback/playbackmanager';
import '../../assets/css/scrollstyles.css';
import '../../elements/emby-itemscontainer/emby-itemscontainer';
import '../../elements/emby-checkbox/emby-checkbox';
@ -563,7 +563,7 @@ function renderDetailPageBackdrop(page, item, apiClient) {
}
function reloadFromItem(instance, page, params, item, user) {
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
Emby.Page.setTitle('');
@ -805,7 +805,7 @@ function renderNextUp(page, item, user) {
return void section.classList.add('hide');
}
window.connectionManager.getApiClient(item.ServerId).getNextUpEpisodes({
ConnectionManager.getApiClient(item.ServerId).getNextUpEpisodes({
SeriesId: item.Id,
UserId: user.Id
}).then(function (result) {
@ -1209,7 +1209,7 @@ function renderSimilarItems(page, item, context) {
}
similarCollapsible.classList.remove('hide');
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
const options = {
userId: apiClient.getCurrentUserId(),
limit: 12,
@ -1323,7 +1323,7 @@ function renderChildren(page, item) {
}
let promise;
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
const userId = apiClient.getCurrentUserId();
if (item.Type == 'Series') {
@ -1571,7 +1571,7 @@ function renderChannelGuide(page, apiClient, item) {
}
function renderSeriesSchedule(page, item) {
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
apiClient.getLiveTvPrograms({
UserId: apiClient.getCurrentUserId(),
HasAired: false,
@ -1731,7 +1731,7 @@ function renderCollectionItemType(page, parentItem, type, items) {
}
function renderMusicVideos(page, item, user) {
window.connectionManager.getApiClient(item.ServerId).getItems(user.Id, {
ConnectionManager.getApiClient(item.ServerId).getItems(user.Id, {
SortBy: 'SortName',
SortOrder: 'Ascending',
IncludeItemTypes: 'MusicVideo',
@ -1751,7 +1751,7 @@ function renderMusicVideos(page, item, user) {
}
function renderAdditionalParts(page, item, user) {
window.connectionManager.getApiClient(item.ServerId).getAdditionalVideoParts(user.Id, item.Id).then(function (result) {
ConnectionManager.getApiClient(item.ServerId).getAdditionalVideoParts(user.Id, item.Id).then(function (result) {
if (result.Items.length) {
page.querySelector('#additionalPartsCollapsible').classList.remove('hide');
const additionalPartsContent = page.querySelector('#additionalPartsContent');
@ -1796,7 +1796,7 @@ function getVideosHtml(items) {
}
function renderSpecials(page, item, user) {
window.connectionManager.getApiClient(item.ServerId).getSpecialFeatures(user.Id, item.Id).then(function (specials) {
ConnectionManager.getApiClient(item.ServerId).getSpecialFeatures(user.Id, item.Id).then(function (specials) {
const specialsContent = page.querySelector('#specialsContent');
specialsContent.innerHTML = getVideosHtml(specials);
imageLoader.lazyChildren(specialsContent);
@ -1852,7 +1852,7 @@ export default function (view, params) {
function reload(instance, page, params) {
loading.show();
const apiClient = params.serverId ? window.connectionManager.getApiClient(params.serverId) : ApiClient;
const apiClient = params.serverId ? ConnectionManager.getApiClient(params.serverId) : ApiClient;
Promise.all([getPromise(apiClient, params), apiClient.getCurrentUser()]).then(([item, user]) => {
currentItem = item;
@ -1901,7 +1901,7 @@ export default function (view, params) {
const item = currentItem;
if (item.Type === 'Program') {
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
return void apiClient.getLiveTvChannel(item.ChannelId, apiClient.getCurrentUserId()).then(function (channel) {
playbackManager.play({
items: [channel]
@ -1938,7 +1938,7 @@ export default function (view, params) {
function onCancelTimerClick() {
import('../../components/recordingcreator/recordinghelper').then(({ default: recordingHelper }) => {
recordingHelper.cancelTimer(window.connectionManager.getApiClient(currentItem.ServerId), currentItem.TimerId).then(function () {
recordingHelper.cancelTimer(ConnectionManager.getApiClient(currentItem.ServerId), currentItem.TimerId).then(function () {
reload(self, view, params);
});
});
@ -2002,7 +2002,7 @@ export default function (view, params) {
let currentItem;
const self = this;
const apiClient = params.serverId ? window.connectionManager.getApiClient(params.serverId) : ApiClient;
const apiClient = params.serverId ? ConnectionManager.getApiClient(params.serverId) : ApiClient;
const btnResume = view.querySelector('.mainDetailButtons .btnResume');
const btnPlay = view.querySelector('.mainDetailButtons .btnPlay');

10
src/controllers/list.js
View file

@ -5,9 +5,9 @@ import * as userSettings from '../scripts/settings/userSettings';
import focusManager from '../components/focusManager';
import cardBuilder from '../components/cardbuilder/cardBuilder';
import loading from '../components/loading/loading';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import AlphaNumericShortcuts from '../scripts/alphanumericshortcuts';
import playbackManager from '../components/playback/playbackmanager';
import { playbackManager } from '../components/playback/playbackmanager';
import AlphaPicker from '../components/alphaPicker/alphaPicker';
import '../elements/emby-itemscontainer/emby-itemscontainer';
import '../elements/emby-scroller/emby-scroller';
@ -16,7 +16,7 @@ import '../elements/emby-scroller/emby-scroller';
function getInitialLiveTvQuery(instance, params) {
const query = {
UserId: window.connectionManager.getApiClient(params.serverId).getCurrentUserId(),
UserId: ConnectionManager.getApiClient(params.serverId).getCurrentUserId(),
StartIndex: 0,
Fields: 'ChannelInfo,PrimaryImageAspectRatio',
Limit: 300
@ -232,7 +232,7 @@ import '../elements/emby-scroller/emby-scroller';
}
function getItems(instance, params, item, sortBy, startIndex, limit) {
const apiClient = window.connectionManager.getApiClient(params.serverId);
const apiClient = ConnectionManager.getApiClient(params.serverId);
instance.queryRecursive = false;
if (params.type === 'Recordings') {
@ -333,7 +333,7 @@ import '../elements/emby-scroller/emby-scroller';
return Promise.resolve(null);
}
const apiClient = window.connectionManager.getApiClient(params.serverId);
const apiClient = ConnectionManager.getApiClient(params.serverId);
const itemId = params.genreId || params.musicGenreId || params.studioId || params.personId || params.parentId;
if (itemId) {

2
src/controllers/livetv/livetvchannels.js
View file

@ -2,7 +2,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
import imageLoader from '../../components/images/imageLoader';
import libraryBrowser from '../../scripts/libraryBrowser';
import loading from '../../components/loading/loading';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import * as userSettings from '../../scripts/settings/userSettings';
import '../../elements/emby-itemscontainer/emby-itemscontainer';

2
src/controllers/livetvguideprovider.js
View file

@ -1,4 +1,4 @@
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import loading from '../components/loading/loading';
import globalize from '../scripts/globalize';

2
src/controllers/movies/moviegenres.js
View file

@ -4,7 +4,7 @@ import libraryBrowser from '../../scripts/libraryBrowser';
import cardBuilder from '../../components/cardbuilder/cardBuilder';
import lazyLoader from '../../components/lazyLoader/lazyLoaderIntersectionObserver';
import globalize from '../../scripts/globalize';
import appRouter from '../../components/appRouter';
import { appRouter } from '../../components/appRouter';
import '../../elements/emby-button/emby-button';
/* eslint-disable indent */

2
src/controllers/movies/movies.js
View file

@ -1,6 +1,6 @@
import loading from '../../components/loading/loading';
import * as userSettings from '../../scripts/settings/userSettings';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import { AlphaPicker } from '../../components/alphaPicker/alphaPicker';
import listView from '../../components/listview/listview';

4
src/controllers/movies/moviesrecommended.js
View file

@ -1,5 +1,5 @@
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import layoutManager from '../../components/layoutManager';
import inputManager from '../../scripts/inputManager';
import * as userSettings from '../../scripts/settings/userSettings';
@ -8,7 +8,7 @@ import * as mainTabsManager from '../../components/maintabsmanager';
import cardBuilder from '../../components/cardbuilder/cardBuilder';
import dom from '../../scripts/dom';
import imageLoader from '../../components/images/imageLoader';
import playbackManager from '../../components/playback/playbackmanager';
import { playbackManager } from '../../components/playback/playbackmanager';
import globalize from '../../scripts/globalize';
import '../../elements/emby-scroller/emby-scroller';
import '../../elements/emby-itemscontainer/emby-itemscontainer';

2
src/controllers/movies/movietrailers.js
View file

@ -1,5 +1,5 @@
import loading from '../../components/loading/loading';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import { AlphaPicker } from '../../components/alphaPicker/alphaPicker';

4
src/controllers/music/musicalbums.js
View file

@ -1,6 +1,6 @@
import playbackManager from '../../components/playback/playbackmanager';
import { playbackManager } from '../../components/playback/playbackmanager';
import loading from '../../components/loading/loading';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import AlphaPicker from '../../components/alphaPicker/alphaPicker';

2
src/controllers/music/musicartists.js
View file

@ -1,5 +1,5 @@
import loading from '../../components/loading/loading';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import { AlphaPicker } from '../../components/alphaPicker/alphaPicker';

2
src/controllers/music/songs.js
View file

@ -1,5 +1,5 @@
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import listView from '../../components/listview/listview';

12
src/controllers/playback/video/index.js
View file

@ -1,4 +1,4 @@
import playbackManager from '../../../components/playback/playbackmanager';
import { playbackManager } from '../../../components/playback/playbackmanager';
import dom from '../../../scripts/dom';
import inputManager from '../../../scripts/inputManager';
import mouseManager from '../../../scripts/mouseManager';
@ -6,10 +6,10 @@ import datetime from '../../../scripts/datetime';
import itemHelper from '../../../components/itemHelper';
import mediaInfo from '../../../components/mediainfo/mediainfo';
import focusManager from '../../../components/focusManager';
import { connectionManager, events } from 'jellyfin-apiclient';;
import { ConnectionManager, events } from 'jellyfin-apiclient';
import browser from '../../../scripts/browser';
import globalize from '../../../scripts/globalize';
import appHost from '../../../components/apphost';
import { appHost } from '../../../components/apphost';
import layoutManager from '../../../components/layoutManager';
import * as userSettings from '../../../scripts/settings/userSettings';
import keyboardnavigation from '../../../scripts/keyboardNavigation';
@ -73,7 +73,7 @@ import '../../../assets/css/videoosd.css';
function getDisplayItem(item) {
if (item.Type === 'TvChannel') {
const apiClient = window.connectionManager.getApiClient(item.ServerId);
const apiClient = ConnectionManager.getApiClient(item.ServerId);
return apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (refreshedItem) {
return {
originalItem: refreshedItem,
@ -97,7 +97,7 @@ import '../../../assets/css/videoosd.css';
return void view.querySelector('.btnRecord').classList.add('hide');
}
window.connectionManager.getApiClient(item.ServerId).getCurrentUser().then(function (user) {
ConnectionManager.getApiClient(item.ServerId).getCurrentUser().then(function (user) {
if (user.Policy.EnableLiveTvManagement) {
import('../../../components/recordingcreator/recordingbutton').then((RecordingButton) => {
if (recordingButtonManager) {
@ -1515,7 +1515,7 @@ import '../../../assets/css/videoosd.css';
const item = currentItem;
if (item && item.Chapters && item.Chapters.length && item.Chapters[0].ImageTag) {
const html = getChapterBubbleHtml(window.connectionManager.getApiClient(item.ServerId), item, item.Chapters, ticks);
const html = getChapterBubbleHtml(ConnectionManager.getApiClient(item.ServerId), item, item.Chapters, ticks);
if (html) {
return html;

2
src/controllers/searchpage.js
View file

@ -1,6 +1,6 @@
import SearchFields from '../components/search/searchfields';
import SearchResults from '../components/search/searchresults';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
export default function (view, params) {
function onSearch(e, value) {

6
src/controllers/session/login/index.js
View file

@ -1,7 +1,7 @@
import appHost from '../../../components/apphost';
import { appHost } from '../../../components/apphost';
import appSettings from '../../../scripts/settings/appSettings';
import dom from '../../../scripts/dom';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import loading from '../../../components/loading/loading';
import layoutManager from '../../../components/layoutManager';
import libraryMenu from '../../../scripts/libraryMenu';
@ -192,7 +192,7 @@ import '../../../elements/emby-checkbox/emby-checkbox';
const serverId = params.serverid;
if (serverId) {
return window.connectionManager.getOrCreateApiClient(serverId);
return ConnectionManager.getOrCreateApiClient(serverId);
}
return ApiClient;

10
src/controllers/session/selectServer/index.js
View file

@ -1,10 +1,10 @@
import loading from '../../../components/loading/loading';
import appRouter from '../../../components/appRouter';
import { appRouter } from '../../../components/appRouter';
import layoutManager from '../../../components/layoutManager';
import libraryMenu from '../../../scripts/libraryMenu';
import appSettings from '../../../scripts/settings/appSettings';
import focusManager from '../../../components/focusManager';
import connectionManager from 'jellyfin-apiclient';
import { ConnectionManager } from 'jellyfin-apiclient';
import globalize from '../../../scripts/globalize';
import actionSheet from '../../../components/actionSheet/actionSheet';
import dom from '../../../scripts/dom';
@ -113,7 +113,7 @@ import '../../../elements/emby-button/emby-button';
export default function (view, params) {
function connectToServer(server) {
loading.show();
window.connectionManager.connectToServer(server, {
ConnectionManager.connectToServer(server, {
enableAutoLogin: appSettings.enableAutoLogin()
}).then(function (result) {
loading.hide();
@ -145,7 +145,7 @@ import '../../../elements/emby-button/emby-button';
function deleteServer(server) {
loading.show();
window.connectionManager.deleteServer(server.Id).then(function () {
ConnectionManager.deleteServer(server.Id).then(function () {
loading.hide();
loadServers();
});
@ -187,7 +187,7 @@ import '../../../elements/emby-button/emby-button';
function loadServers() {
loading.show();
window.connectionManager.getAvailableServers().then(onServersRetrieved);
ConnectionManager.getAvailableServers().then(onServersRetrieved);
}
let servers;

2
src/controllers/shows/episodes.js
View file

@ -1,5 +1,5 @@
import loading from '../../components/loading/loading';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import listView from '../../components/listview/listview';

2
src/controllers/shows/tvgenres.js
View file

@ -4,7 +4,7 @@ import libraryBrowser from '../../scripts/libraryBrowser';
import cardBuilder from '../../components/cardbuilder/cardBuilder';
import lazyLoader from '../../components/lazyLoader/lazyLoaderIntersectionObserver';
import globalize from '../../scripts/globalize';
import appRouter from '../../components/appRouter';
import { appRouter } from '../../components/appRouter';
import '../../elements/emby-button/emby-button';
/* eslint-disable indent */

4
src/controllers/shows/tvrecommended.js
View file

@ -1,5 +1,5 @@
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import inputManager from '../../scripts/inputManager';
import libraryMenu from '../../scripts/libraryMenu';
import layoutManager from '../../components/layoutManager';
@ -7,7 +7,7 @@ import loading from '../../components/loading/loading';
import dom from '../../scripts/dom';
import * as userSettings from '../../scripts/settings/userSettings';
import cardBuilder from '../../components/cardbuilder/cardBuilder';
import playbackManager from '../../components/playback/playbackmanager';
import { playbackManager } from '../../components/playback/playbackmanager';
import * as mainTabsManager from '../../components/maintabsmanager';
import globalize from '../../scripts/globalize';
import '../../assets/css/scrollstyles.css';

2
src/controllers/shows/tvshows.js
View file

@ -1,5 +1,5 @@
import loading from '../../components/loading/loading';
import events from 'jellyfin-apiclient';
import { events } from 'jellyfin-apiclient';
import libraryBrowser from '../../scripts/libraryBrowser';
import imageLoader from '../../components/images/imageLoader';
import listView from '../../components/listview/listview';

2
src/controllers/user/menu/index.js
View file

@ -1,4 +1,4 @@
import appHost from '../../../components/apphost';
import { appHost } from '../../../components/apphost';
import '../../../components/listview/listview.css';
import '../../../elements/emby-button/emby-button';
import layoutManager from '../../../components/layoutManager';

2
src/controllers/user/profile/index.js
View file

@ -1,7 +1,7 @@
import UserPasswordPage from '../../dashboard/users/userpasswordpage';
import loading from '../../../components/loading/loading';
import libraryMenu from '../../../scripts/libraryMenu';
import appHost from '../../../components/apphost';
import { appHost } from '../../../components/apphost';
import globalize from '../../../scripts/globalize';
import '../../../elements/emby-button/emby-button';

Some files were not shown because too many files have changed in this diff Show more