milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix lint errors

Browse source
This commit is contained in:
gion 2020-04-01 19:27:38 +02:00
parent 6c18b655e0
commit 460c2a1f77
4 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3789,7 +3789,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
player = player || this._currentPlayer; player = player || this._currentPlayer;
if (player) { if (player) {
return player.getPlaybackRate(val); return player.getPlaybackRate();
} }
return null; return null;

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

@ -345,7 +345,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncplay
label: globalize.translate("LabelSyncplaySyncMethod"), label: globalize.translate("LabelSyncplaySyncMethod"),
value: stats.SyncMethod value: stats.SyncMethod
}); });
return syncStats; return syncStats;
} }

4
src/components/syncplay/groupSelectionMenu.js
View file

@ -24,7 +24,7 @@ define(['events', 'loading', 'connectionManager', 'playbackManager', 'syncplayMa
var menuItems = groups.map(function (group) { var menuItems = groups.map(function (group) {
var name = datetime.getDisplayRunningTime(group.PositionTicks); var name = datetime.getDisplayRunningTime(group.PositionTicks);
if (!inSession) { if (!inSession) {
name = group.PlayingItemName name = group.PlayingItemName;
} }
return { return {
name: name, name: name,
@ -32,7 +32,7 @@ define(['events', 'loading', 'connectionManager', 'playbackManager', 'syncplayMa
id: group.GroupId, id: group.GroupId,
selected: false, selected: false,
secondaryText: group.Partecipants.join(", ") secondaryText: group.Partecipants.join(", ")
} };
}); });
if (inSession) { if (inSession) {

76
src/components/syncplay/syncplaymanager.js
View file

@ -6,7 +6,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
var callback = function () { var callback = function () {
events.off(emitter, eventType, callback); events.off(emitter, eventType, callback);
resolve(arguments); resolve(arguments);
} };
events.on(emitter, eventType, callback); events.on(emitter, eventType, callback);
}); });
} }
@ -80,11 +80,11 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
if (self.playbackRateSupported && absDiffMillis > self.maxAcceptedDelaySpeedToSync && absDiffMillis < self.syncMethodThreshold) { if (self.playbackRateSupported && absDiffMillis > self.maxAcceptedDelaySpeedToSync && absDiffMillis < self.syncMethodThreshold) {
// SpeedToSync method // SpeedToSync method
var speed = 1 + diffMillis / self.speedUpToSyncTime; var speed = 1 + diffMillis / self.speedUpToSyncTime;
self.currentPlayer.setPlaybackRate(speed); self.currentPlayer.setPlaybackRate(speed);
self.syncEnabled = false; self.syncEnabled = false;
self.showSyncIcon("SpeedToSync (x" + speed + ")"); self.showSyncIcon("SpeedToSync (x" + speed + ")");
self.syncTimeout = setTimeout(() => { self.syncTimeout = setTimeout(() => {
self.currentPlayer.setPlaybackRate(1); self.currentPlayer.setPlaybackRate(1);
self.syncEnabled = true; self.syncEnabled = true;
@ -95,7 +95,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
playbackManager.syncplay_seek(ServerPositionTicks); playbackManager.syncplay_seek(ServerPositionTicks);
self.syncEnabled = false; self.syncEnabled = false;
self.showSyncIcon("SkipToSync"); self.showSyncIcon("SkipToSync");
self.syncTimeout = setTimeout(() => { self.syncTimeout = setTimeout(() => {
self.syncEnabled = true; self.syncEnabled = true;
self.clearSyncIcon(); self.clearSyncIcon();
@ -105,7 +105,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
} }
} }
self.lastPlaybackWaiting = null; // used to determine if player's buffering self.lastPlaybackWaiting = null; // used to determine if player's buffering
self.minBufferingThresholdMillis = 1000; self.minBufferingThresholdMillis = 1000;
// TODO: implement group wait // TODO: implement group wait
@ -119,13 +119,13 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
if (!self.lastPlaybackWaiting) { if (!self.lastPlaybackWaiting) {
self.lastPlaybackWaiting = new Date(); self.lastPlaybackWaiting = new Date();
} }
events.trigger(self, "PlayerWaiting"); events.trigger(self, "PlayerWaiting");
} }
self.isBuffering = function () { self.isBuffering = function () {
if (self.lastPlaybackWaiting === null) return false; if (self.lastPlaybackWaiting === null) return false;
return (new Date() - self.lastPlaybackWaiting) > self.minBufferingThresholdMillis; return (new Date() - self.lastPlaybackWaiting) > self.minBufferingThresholdMillis;
} };
function bindToPlayer(player) { function bindToPlayer(player) {
if (player !== self.currentPlayer) { if (player !== self.currentPlayer) {
@ -165,7 +165,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
self.syncplayEnabledAt = null; // Server time of when Syncplay has been enabled self.syncplayEnabledAt = null; // Server time of when Syncplay has been enabled
self.syncplayReady = false; // Syncplay is ready after first ping to server self.syncplayReady = false; // Syncplay is ready after first ping to server
self.processGroupUpdate = function (cmd, apiClient) { self.processGroupUpdate = function (cmd, apiClient) {
switch (cmd.Type) { switch (cmd.Type) {
case 'PrepareSession': case 'PrepareSession':
var serverId = apiClient.serverInfo().Id; var serverId = apiClient.serverInfo().Id;
@ -199,17 +199,17 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
break; break;
case 'UserJoined': case 'UserJoined':
displaySyncplayUpdate({ displaySyncplayUpdate({
Text: globalize.translate('MessageSyncplayUserJoined', cmd.Data), Text: globalize.translate('MessageSyncplayUserJoined', cmd.Data)
}); });
break; break;
case 'UserLeft': case 'UserLeft':
displaySyncplayUpdate({ displaySyncplayUpdate({
Text: globalize.translate('MessageSyncplayUserLeft', cmd.Data), Text: globalize.translate('MessageSyncplayUserLeft', cmd.Data)
}); });
break; break;
case 'GroupJoined': case 'GroupJoined':
displaySyncplayUpdate({ displaySyncplayUpdate({
Text: globalize.translate('MessageSyncplayEnabled'), Text: globalize.translate('MessageSyncplayEnabled')
}); });
// Enable Syncplay // Enable Syncplay
self.syncplayEnabledAt = new Date(cmd.Data); self.syncplayEnabledAt = new Date(cmd.Data);
@ -225,7 +225,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
case 'NotInGroup': case 'NotInGroup':
case 'GroupLeft': case 'GroupLeft':
displaySyncplayUpdate({ displaySyncplayUpdate({
Text: globalize.translate('MessageSyncplayDisabled'), Text: globalize.translate('MessageSyncplayDisabled')
}); });
// Disable Syncplay // Disable Syncplay
self.syncplayEnabledAt = null; self.syncplayEnabledAt = null;
@ -236,7 +236,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
break; break;
case 'GroupWait': case 'GroupWait':
displaySyncplayUpdate({ displaySyncplayUpdate({
Text: globalize.translate('MessageSyncplayGroupWait', cmd.Data), Text: globalize.translate('MessageSyncplayGroupWait', cmd.Data)
}); });
break; break;
case 'KeepAlive': case 'KeepAlive':
@ -245,7 +245,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
console.error('processSyncplayGroupUpdate does not recognize: ' + cmd.Type); console.error('processSyncplayGroupUpdate does not recognize: ' + cmd.Type);
break; break;
} }
} };
self.lastCommand = null; self.lastCommand = null;
self.queuedCommand = null; self.queuedCommand = null;
@ -283,7 +283,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
self.lastCommand = cmd; self.lastCommand = cmd;
console.log("Syncplay will", cmd.Command, "at", cmd.When, "PositionTicks", cmd.PositionTicks); console.log("Syncplay will", cmd.Command, "at", cmd.When, "PositionTicks", cmd.PositionTicks);
switch (cmd.Command) { switch (cmd.Command) {
case 'Play': case 'Play':
self.schedulePlay(cmd.When, cmd.PositionTicks); self.schedulePlay(cmd.When, cmd.PositionTicks);
@ -298,7 +298,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
console.error('processSyncplayCommand does not recognize: ' + cmd.Type); console.error('processSyncplayCommand does not recognize: ' + cmd.Type);
break; break;
} }
} };
self.scheduledCommand = null; self.scheduledCommand = null;
self.syncTimeout = null; self.syncTimeout = null;
@ -332,7 +332,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
self.syncEnabled = true self.syncEnabled = true
}, self.syncMethodThreshold / 2); }, self.syncMethodThreshold / 2);
} }
} };
self.schedulePause = function (pauseAtTime, positionTicks) { self.schedulePause = function (pauseAtTime, positionTicks) {
self.clearScheduledCommand(); self.clearScheduledCommand();
@ -355,11 +355,11 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
playbackManager.syncplay_seek(positionTicks); playbackManager.syncplay_seek(positionTicks);
}, 800); }, 800);
} }
} };
self.scheduleSeek = function (seekAtTime, positionTicks) { self.scheduleSeek = function (seekAtTime, positionTicks) {
self.schedulePause(seekAtTime, positionTicks); self.schedulePause(seekAtTime, positionTicks);
} };
self.clearScheduledCommand = function () { self.clearScheduledCommand = function () {
clearTimeout(self.scheduledCommand); clearTimeout(self.scheduledCommand);
@ -370,7 +370,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
self.currentPlayer.setPlaybackRate(1); self.currentPlayer.setPlaybackRate(1);
} }
self.clearSyncIcon(); self.clearSyncIcon();
} };
self.injectPlaybackManager = function () { self.injectPlaybackManager = function () {
if (!self.isSyncplayEnabled()) return; if (!self.isSyncplayEnabled()) return;
@ -379,12 +379,12 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
playbackManager.syncplay_unpause = playbackManager.unpause; playbackManager.syncplay_unpause = playbackManager.unpause;
playbackManager.syncplay_pause = playbackManager.pause; playbackManager.syncplay_pause = playbackManager.pause;
playbackManager.syncplay_seek = playbackManager.seek; playbackManager.syncplay_seek = playbackManager.seek;
playbackManager.unpause = self.playRequest; playbackManager.unpause = self.playRequest;
playbackManager.pause = self.pauseRequest; playbackManager.pause = self.pauseRequest;
playbackManager.seek = self.seekRequest; playbackManager.seek = self.seekRequest;
playbackManager.syncplayEnabled = true; playbackManager.syncplayEnabled = true;
} };
self.restorePlaybackManager = function () { self.restorePlaybackManager = function () {
if (self.isSyncplayEnabled()) return; if (self.isSyncplayEnabled()) return;
@ -394,13 +394,13 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
playbackManager.pause = playbackManager.syncplay_pause; playbackManager.pause = playbackManager.syncplay_pause;
playbackManager.seek = playbackManager.syncplay_seek; playbackManager.seek = playbackManager.syncplay_seek;
playbackManager.syncplayEnabled = false; playbackManager.syncplayEnabled = false;
} };
self.playRequest = function (player) { self.playRequest = function (player) {
var apiClient = connectionManager.currentApiClient(); var apiClient = connectionManager.currentApiClient();
var sessionId = getActivePlayerId(); var sessionId = getActivePlayerId();
apiClient.sendSyncplayCommand(sessionId, "PlayRequest"); apiClient.sendSyncplayCommand(sessionId, "PlayRequest");
} };
self.pauseRequest = function (player) { self.pauseRequest = function (player) {
var apiClient = connectionManager.currentApiClient(); var apiClient = connectionManager.currentApiClient();
@ -408,7 +408,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
apiClient.sendSyncplayCommand(sessionId, "PauseRequest"); apiClient.sendSyncplayCommand(sessionId, "PauseRequest");
// Pause locally as well, to give the user some little control // Pause locally as well, to give the user some little control
playbackManager.syncplay_pause(); playbackManager.syncplay_pause();
} };
self.seekRequest = function (PositionTicks, player) { self.seekRequest = function (PositionTicks, player) {
var apiClient = connectionManager.currentApiClient(); var apiClient = connectionManager.currentApiClient();
@ -416,7 +416,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
apiClient.sendSyncplayCommand(sessionId, "SeekRequest", { apiClient.sendSyncplayCommand(sessionId, "SeekRequest", {
PositionTicks: PositionTicks PositionTicks: PositionTicks
}); });
} };
self.pingIntervalTimeoutGreedy = 1000; self.pingIntervalTimeoutGreedy = 1000;
self.pingIntervalTimeoutLowProfile = 60000; self.pingIntervalTimeoutLowProfile = 60000;
@ -459,7 +459,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
} }
// console.debug("Syncplay updateTimeDiff:", serverTime, self.timeDiff, self.roundTripDuration, newTimeDiff); // console.debug("Syncplay updateTimeDiff:", serverTime, self.timeDiff, self.roundTripDuration, newTimeDiff);
} };
self.requestPing = function () { self.requestPing = function () {
if (self.pingInterval === null && !self.pingStop) { if (self.pingInterval === null && !self.pingStop) {
@ -493,14 +493,14 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
events.trigger(self, "SyncplayReady"); events.trigger(self, "SyncplayReady");
self.notifySyncplayReady = false; self.notifySyncplayReady = false;
} }
self.requestPing(); self.requestPing();
}); });
}); });
}, self.pingIntervalTimeout); }, self.pingIntervalTimeout);
} }
} };
self.startPing = function () { self.startPing = function () {
self.notifySyncplayReady = true; self.notifySyncplayReady = true;
@ -509,7 +509,7 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
self.pingIntervalTimeout = self.pingIntervalTimeoutGreedy; self.pingIntervalTimeout = self.pingIntervalTimeoutGreedy;
self.requestPing(); self.requestPing();
} };
self.stopPing = function () { self.stopPing = function () {
self.pingStop = true; self.pingStop = true;
@ -517,17 +517,17 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
clearTimeout(self.pingInterval); clearTimeout(self.pingInterval);
self.pingInterval = null; self.pingInterval = null;
} }
} };
self.serverDateToLocal = function (server) { self.serverDateToLocal = function (server) {
// local - server = diff // local - server = diff
return new Date(server.getTime() + self.timeDiff); return new Date(server.getTime() + self.timeDiff);
} };
self.localDateToServer = function (local) { self.localDateToServer = function (local) {
// local - server = diff // local - server = diff
return new Date(local.getTime() - self.timeDiff); return new Date(local.getTime() - self.timeDiff);
} };
// THIS FEATURE IS CURRENTLY DISABLED // THIS FEATURE IS CURRENTLY DISABLED
// Mainly because SpeedToSync seems to do the job // Mainly because SpeedToSync seems to do the job
@ -569,12 +569,12 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
}, 1000); }, 1000);
}, 2000); }, 2000);
} }
} };
// Stats // Stats
self.isSyncplayEnabled = function () { self.isSyncplayEnabled = function () {
return self.syncplayEnabledAt !== null ? true : false; return self.syncplayEnabledAt !== null ? true : false;
} };
self.getStats = function () { self.getStats = function () {
return { return {
@ -582,18 +582,18 @@ define(['events', 'globalize', 'loading', 'connectionManager', 'playbackManager'
PlaybackDiff: self.playbackDiffMillis, PlaybackDiff: self.playbackDiffMillis,
SyncMethod: self.syncMethod SyncMethod: self.syncMethod
} }
} };
// UI // UI
self.showSyncIcon = function (syncMethod) { self.showSyncIcon = function (syncMethod) {
self.syncMethod = syncMethod; self.syncMethod = syncMethod;
events.trigger(self, "SyncplayError", [true]); events.trigger(self, "SyncplayError", [true]);
} };
self.clearSyncIcon = function () { self.clearSyncIcon = function () {
self.syncMethod = "None"; self.syncMethod = "None";
events.trigger(self, "SyncplayError", [false]); events.trigger(self, "SyncplayError", [false]);
} };
} }
return new SyncplayManager(); return new SyncplayManager();