Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-01-11 20:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #334 from chrisk325/patch-3

Browse source 
fixes trakt up next
This commit is contained in:
Nayif 2026-01-01 16:12:53 +05:30 committed by GitHub
commit 2da03d4931
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/hooks/useWatchProgress.ts
View file

@ -108,30 +108,60 @@ export const useWatchProgress = (
setWatchProgress(null);
}
} else {
// FIXED: Find the most recently watched episode instead of first unfinished
// Sort by lastUpdated timestamp (most recent first)
const sortedProgresses = seriesProgresses.sort((a, b) =>
b.progress.lastUpdated - a.progress.lastUpdated
);
if (sortedProgresses.length > 0) {
// Use the most recently watched episode
const mostRecentProgress = sortedProgresses[0];
const progress = mostRecentProgress.progress;
// Removed excessive logging for most recent progress
const COMPLETION_THRESHOLD = 85;
const incompleteProgresses = seriesProgresses.filter(({ progress }) => {
const progressPercent = (progress.currentTime / progress.duration) * 100;
return progressPercent < COMPLETION_THRESHOLD;
});
if (incompleteProgresses.length > 0) {
const sortedIncomplete = incompleteProgresses.sort((a, b) =>
b.progress.lastUpdated - a.progress.lastUpdated
);
const mostRecentIncomplete = sortedIncomplete[0];
setWatchProgress({
...progress,
episodeId: mostRecentProgress.episodeId,
traktSynced: progress.traktSynced,
traktProgress: progress.traktProgress
...mostRecentIncomplete.progress,
episodeId: mostRecentIncomplete.episodeId,
traktSynced: mostRecentIncomplete.progress.traktSynced,
traktProgress: mostRecentIncomplete.progress.traktProgress
});
} else if (seriesProgresses.length > 0) {
const watchedEpisodeNumbers = seriesProgresses
.map(({ episodeId }) => getEpisodeNumber(episodeId))
.filter(Boolean)
.sort((a, b) => {
if (a!.season !== b!.season) return a!.season - b!.season;
return a!.episode - b!.episode;
});
if (watchedEpisodeNumbers.length > 0) {
const lastWatched = watchedEpisodeNumbers[watchedEpisodeNumbers.length - 1]!;
const currentEpisodes = episodesRef.current;
const nextEpisode = currentEpisodes.find(ep => {
if (ep.season_number > lastWatched.season) return true;
if (ep.season_number === lastWatched.season && ep.episode_number > lastWatched.episode) return true;
return false;
});
if (nextEpisode) {
setWatchProgress({
currentTime: 0,
duration: nextEpisode.runtime * 60 || 0,
lastUpdated: Date.now(),
episodeId: `${id}:${nextEpisode.season_number}:${nextEpisode.episode_number}`,
traktSynced: false,
traktProgress: 0
});
} else {
setWatchProgress(null);
}
} else {
// No watched episodes found
setWatchProgress(null);
}
} else {
setWatchProgress(null);
}
}
} else {
// For movies
const progress = await storageService.getWatchProgress(id, type, episodeId);
@ -224,4 +254,4 @@ export const useWatchProgress = (
getPlayButtonText,
loadWatchProgress
};
};
};