Skip to content

refactor add DeviceId check #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sususu98 wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

refactor add DeviceId check #333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions backend/tasks/ActivityMonitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ async function getSessionsInWatchDog(SessionData, WatchdogData) {
let matchesEpisodeId =
sessionData.NowPlayingItem.SeriesId != undefined ? wdData.EpisodeId === sessionData.NowPlayingItem.Id : true;

// check if the same device
let sameDevice = wdData.DeviceId === sessionData.DeviceId;

let matchingSessionFound =
// wdData.Id === sessionData.Id &&
wdData.UserId === sessionData.UserId &&
wdData.DeviceId === sessionData.DeviceId &&
wdData.NowPlayingItemId === NowPlayingItemId &&
matchesEpisodeId;
matchesEpisodeId &&
sameDevice;

if (matchingSessionFound && wdData.IsPaused != sessionData.PlayState.IsPaused) {
wdData.IsPaused = sessionData.PlayState.IsPaused;
Expand Down Expand Up @@ -58,12 +62,15 @@ async function getSessionsNotInWatchDog(SessionData, WatchdogData) {
let matchesEpisodeId =
sessionData.NowPlayingItem.SeriesId != undefined ? wdData.EpisodeId === sessionData.NowPlayingItem.Id : true;

let sameDevice = wdData.DeviceId === sessionData.DeviceId;

let matchingSessionFound =
// wdData.Id === sessionData.Id &&
wdData.UserId === sessionData.UserId &&
wdData.DeviceId === sessionData.DeviceId &&
wdData.NowPlayingItemId === NowPlayingItemId &&
matchesEpisodeId;
matchesEpisodeId &&
sameDevice;

return matchingSessionFound;
});
Expand All @@ -81,12 +88,16 @@ function getWatchDogNotInSessions(SessionData, WatchdogData) {
let matchesEpisodeId =
sessionData.NowPlayingItem.SeriesId != undefined ? wdData.EpisodeId === sessionData.NowPlayingItem.Id : true;

let sameDevice = wdData.DeviceId === sessionData.DeviceId;

let noMatchingSessionFound =
// wdData.Id === sessionData.Id &&
wdData.UserId === sessionData.UserId &&
wdData.DeviceId === sessionData.DeviceId &&
wdData.NowPlayingItemId === NowPlayingItemId &&
matchesEpisodeId;
matchesEpisodeId &&
sameDevice;

return noMatchingSessionFound;
});
});
Expand Down Expand Up @@ -191,11 +202,16 @@ async function ActivityMonitor(interval) {
(Number(existing.PlaybackDuration) + Number(playbackData.PlaybackDuration)) * 10000000 <=
Number(existing.RunTimeTicks);
}

// check if user switched playback device
const sameDevice = existing.DeviceId === playbackData.DeviceId;

return (
existing.NowPlayingItemId === playbackData.NowPlayingItemId &&
existing.EpisodeId === playbackData.EpisodeId &&
existing.UserId === playbackData.UserId &&
newDurationWithingRunTime
newDurationWithingRunTime &&
sameDevice
);
});

Expand All @@ -214,7 +230,11 @@ async function ActivityMonitor(interval) {
(pb) =>
pb.PlaybackDuration >= MINIMUM_SECONDS_TO_INCLUDE_PLAYBACK &&
!ExistingRecords.some(
(er) => er.NowPlayingItemId === pb.NowPlayingItemId && er.EpisodeId === pb.EpisodeId && er.UserId === pb.UserId
(er) =>
er.NowPlayingItemId === pb.NowPlayingItemId &&
er.EpisodeId === pb.EpisodeId &&
er.UserId === pb.UserId &&
er.DeviceId === pb.DeviceId
)
);

Expand Down