push
This commit is contained in:
4DBug
@@ -151,7 +151,6 @@
|
||||
<div class="hero__fade"></div>
|
||||
<div class="container hero__inner">
|
||||
<div class="hero__content">
|
||||
<span class="hero__kicker">Trending now</span>
|
||||
<h1 class="hero__title">${esc(item.name)}</h1>
|
||||
<div class="hero__meta">${metaBits}</div>
|
||||
${item.overview ? `<p class="hero__overview">${esc(item.overview)}</p>` : ''}
|
||||
|
||||
+1
-1
@@ -82,7 +82,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
const PREFERRED_PROVIDERS = ['cineby', 'videasy', 'vidfast'];
|
||||
const PREFERRED_PROVIDERS = ['cineby', 'playimdb', 'vidrock'];
|
||||
|
||||
// Merge the server's provider lists with the user's toggles.
|
||||
// Returns the enabled provider names, in the server's `all` order.
|
||||
|
||||
+241
-93
@@ -19,15 +19,29 @@
|
||||
return;
|
||||
}
|
||||
|
||||
const heroEl = document.getElementById('hero');
|
||||
const heroBackdrop = document.getElementById('heroBackdrop');
|
||||
const heroTitleCard = document.getElementById('heroTitleCard');
|
||||
const heroTitle = document.getElementById('heroTitle');
|
||||
const heroMeta = document.getElementById('heroMeta');
|
||||
const heroGenres = document.getElementById('heroGenres');
|
||||
const heroOverview = document.getElementById('heroOverview');
|
||||
const playButton = document.getElementById('playButton');
|
||||
const playLabel = document.getElementById('playLabel');
|
||||
const episodeSection = document.getElementById('episodeSection');
|
||||
const seasonTabs = document.getElementById('seasonTabs');
|
||||
const episodeShelf = document.getElementById('episodeShelf');
|
||||
const playerOverlay = document.getElementById('playerOverlay');
|
||||
const playerClose = document.getElementById('playerClose');
|
||||
|
||||
// custom player controls
|
||||
const video = document.getElementById('video');
|
||||
const statusEl = document.getElementById('playerStatus');
|
||||
const sourceLabel = document.getElementById('sourceLabel');
|
||||
const resumeNote = document.getElementById('resumeNote');
|
||||
const sourcesPanel = document.getElementById('sourcesPanel');
|
||||
const sourcesClose = document.getElementById('sourcesClose');
|
||||
const episodeSection = document.getElementById('episodes');
|
||||
|
||||
// custom player controls
|
||||
const playerWrap = document.getElementById('playerWrap');
|
||||
const bigPlay = document.getElementById('bigPlay');
|
||||
const pcSeek = document.getElementById('pcSeek');
|
||||
@@ -40,10 +54,6 @@
|
||||
const pcGear = document.getElementById('pcGear');
|
||||
const pcPip = document.getElementById('pcPip');
|
||||
const pcFull = document.getElementById('pcFull');
|
||||
const seasonSelect = document.getElementById('seasonSelect');
|
||||
const episodeGrid = document.getElementById('episodeGrid');
|
||||
const prevBtn = document.getElementById('prevEpisode');
|
||||
const nextBtn = document.getElementById('nextEpisode');
|
||||
|
||||
const state = {
|
||||
details: null,
|
||||
@@ -57,8 +67,13 @@
|
||||
season: null,
|
||||
episode: null,
|
||||
loadedKey: null,
|
||||
loadToken: 0,
|
||||
overlayOpen: false,
|
||||
lastFocusedElement: null,
|
||||
pendingClose: false,
|
||||
};
|
||||
|
||||
|
||||
/* ---- status overlay ------------------------------------------------------ */
|
||||
|
||||
function closeSources() {
|
||||
@@ -323,7 +338,16 @@
|
||||
break;
|
||||
case 'Escape':
|
||||
if (!sourcesPanel.hidden) closeSources();
|
||||
else if (state.overlayOpen) {
|
||||
if (document.fullscreenElement) {
|
||||
state.pendingClose = true;
|
||||
document.exitFullscreen().catch(() => {});
|
||||
} else {
|
||||
closePlayer();
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
if (video.src || video.currentSrc) showControls();
|
||||
});
|
||||
@@ -334,36 +358,120 @@
|
||||
|
||||
/* ---- hero ------------------------------------------------------------------ */
|
||||
|
||||
function openPlayer() {
|
||||
if (state.overlayOpen) return;
|
||||
state.overlayOpen = true;
|
||||
state.lastFocusedElement = document.activeElement;
|
||||
playerOverlay.hidden = false;
|
||||
document.body.classList.add('player-open');
|
||||
playerClose.focus();
|
||||
}
|
||||
|
||||
function closePlayer() {
|
||||
if (!state.overlayOpen) return;
|
||||
state.overlayOpen = false;
|
||||
state.pendingClose = false;
|
||||
video.pause();
|
||||
playerOverlay.hidden = true;
|
||||
document.body.classList.remove('player-open');
|
||||
if (state.lastFocusedElement && typeof state.lastFocusedElement.focus === 'function') {
|
||||
state.lastFocusedElement.focus();
|
||||
}
|
||||
}
|
||||
|
||||
document.addEventListener('fullscreenchange', () => {
|
||||
if (!document.fullscreenElement && state.pendingClose && state.overlayOpen) closePlayer();
|
||||
});
|
||||
|
||||
function syncHeader() {
|
||||
document.body.classList.toggle('is-scrolled', window.scrollY > 8);
|
||||
}
|
||||
window.addEventListener('scroll', syncHeader, { passive: true });
|
||||
syncHeader();
|
||||
|
||||
function setPlayLabel() {
|
||||
if (type === 'tv' && state.season != null && state.episode != null) {
|
||||
playLabel.textContent = `Play S${state.season} E${state.episode}`;
|
||||
} else {
|
||||
playLabel.textContent = 'Play';
|
||||
}
|
||||
}
|
||||
|
||||
function renderHero(d) {
|
||||
document.title = `${d.name || d.title} — bug.tv`;
|
||||
const isTv = type === 'tv';
|
||||
const year = String((isTv ? d.first_air_date : d.release_date) || '').slice(0, 4);
|
||||
const facts = [
|
||||
isTv ? `${d.number_of_seasons || 0} seasons` : SR.util.runtimeLabel(d.runtime),
|
||||
year,
|
||||
]
|
||||
.filter(Boolean)
|
||||
.map(SR.util.escapeHtml)
|
||||
.join('<span>·</span>');
|
||||
const rating = d.vote_average
|
||||
? `<span class="watch-hero__rating">★ ${Number(d.vote_average).toFixed(1)}</span>`
|
||||
const facts = [];
|
||||
if (isTv) {
|
||||
if (d.number_of_seasons) {
|
||||
facts.push(`${d.number_of_seasons} season${d.number_of_seasons === 1 ? '' : 's'}`);
|
||||
}
|
||||
} else {
|
||||
const runtime = SR.util.runtimeLabel(d.runtime);
|
||||
if (runtime) facts.push(runtime);
|
||||
}
|
||||
if (year) facts.push(year);
|
||||
|
||||
const vote = Number(d.vote_average || 0);
|
||||
const filled = Math.max(0, Math.min(5, Math.round(vote / 2)));
|
||||
const rating = vote
|
||||
? `<span class="watch-hero__rating" role="img" aria-label="${vote.toFixed(1)} out of 10">${'★'.repeat(filled)}${'☆'.repeat(5 - filled)} ${vote.toFixed(1)}</span>`
|
||||
: '';
|
||||
const genres = (d.genres || [])
|
||||
.map((g) => `<span class="tag">${SR.util.escapeHtml(g.name)}</span>`)
|
||||
.join('');
|
||||
const poster = SR.util.tmdbResize(d.poster_url, 'w500');
|
||||
const backdrop = SR.util.tmdbResize(d.backdrop_url, 'w1280');
|
||||
document.getElementById('hero').innerHTML = `
|
||||
${backdrop ? `<div class="watch-hero__backdrop"><img src="${backdrop}" alt=""></div>` : ''}
|
||||
${poster ? `<div class="watch-hero__poster"><img src="${poster}" alt=""></div>` : ''}
|
||||
<div class="watch-hero__body">
|
||||
<h1 class="watch-hero__title">${SR.util.escapeHtml(d.name || d.title)}</h1>
|
||||
<div class="watch-hero__facts">${rating}${rating && facts ? '<span>·</span>' : ''}${facts}</div>
|
||||
${genres ? `<div class="watch-hero__genres">${genres}</div>` : ''}
|
||||
${d.overview ? `<p class="watch-hero__overview">${SR.util.escapeHtml(d.overview)}</p>` : ''}
|
||||
</div>`;
|
||||
|
||||
const title = d.name || d.title || '';
|
||||
heroTitle.textContent = title;
|
||||
heroMeta.innerHTML = [rating, ...facts.map((fact) => `<span>${SR.util.escapeHtml(fact)}</span>`)]
|
||||
.filter(Boolean)
|
||||
.join('<span class="watch-hero__dot" aria-hidden="true">·</span>');
|
||||
|
||||
heroGenres.replaceChildren();
|
||||
for (const genre of d.genres || []) {
|
||||
const tag = document.createElement('span');
|
||||
tag.className = 'tag';
|
||||
tag.textContent = genre.name;
|
||||
heroGenres.appendChild(tag);
|
||||
}
|
||||
|
||||
heroOverview.textContent = d.overview || '';
|
||||
heroOverview.hidden = !d.overview;
|
||||
|
||||
const images = d.images || {};
|
||||
const backdrop = d.backdrop_url || (images.backdrops && images.backdrops[0] && images.backdrops[0].url);
|
||||
heroBackdrop.style.backgroundImage = backdrop
|
||||
? `url("${SR.util.escapeHtml(SR.util.tmdbResize(backdrop, 'w1280'))}")`
|
||||
: '';
|
||||
|
||||
const logo = images.logos && images.logos[0] && images.logos[0].url;
|
||||
if (logo) {
|
||||
heroTitleCard.alt = title;
|
||||
heroTitleCard.src = SR.util.tmdbResize(logo, 'w500');
|
||||
heroTitleCard.hidden = false;
|
||||
heroTitle.hidden = true;
|
||||
heroTitleCard.onerror = () => {
|
||||
heroTitleCard.hidden = true;
|
||||
heroTitle.hidden = false;
|
||||
};
|
||||
} else {
|
||||
heroTitleCard.hidden = true;
|
||||
heroTitle.hidden = false;
|
||||
}
|
||||
|
||||
playButton.hidden = false;
|
||||
setPlayLabel();
|
||||
}
|
||||
|
||||
function renderHeroError(message) {
|
||||
heroTitle.textContent = 'Unavailable';
|
||||
heroTitle.hidden = false;
|
||||
heroMeta.textContent = message;
|
||||
heroOverview.textContent = '';
|
||||
heroBackdrop.style.backgroundImage = '';
|
||||
heroTitleCard.hidden = true;
|
||||
playButton.hidden = true;
|
||||
episodeSection.hidden = true;
|
||||
}
|
||||
|
||||
|
||||
/* ---- url -------------------------------------------------------------------- */
|
||||
|
||||
function syncUrl() {
|
||||
@@ -402,7 +510,10 @@
|
||||
}
|
||||
|
||||
async function loadStreams() {
|
||||
const token = ++state.loadToken;
|
||||
const providerInfo = await getProviderInfo();
|
||||
if (token !== state.loadToken) return;
|
||||
|
||||
if (!providerInfo.useServerDefaults && providerInfo.names.length === 0) {
|
||||
closeSources();
|
||||
pcQuality.textContent = '';
|
||||
@@ -411,6 +522,7 @@
|
||||
showStatus('No sources are enabled. Open Settings → Sources and enable at least one provider.', true);
|
||||
return;
|
||||
}
|
||||
|
||||
const query = {
|
||||
tmdb: id,
|
||||
type,
|
||||
@@ -421,13 +533,17 @@
|
||||
query.season = state.season;
|
||||
query.episode = state.episode;
|
||||
}
|
||||
|
||||
closeSources();
|
||||
pcQuality.textContent = '';
|
||||
showStatus('Finding streams…');
|
||||
sourceLabel.textContent = '';
|
||||
resumeNote.textContent = '';
|
||||
|
||||
try {
|
||||
const data = await SR.api.streams(query);
|
||||
if (token !== state.loadToken) return;
|
||||
|
||||
const allStreams = data.streams || [];
|
||||
state.streams = allStreams.filter(SR.util.webPlayable);
|
||||
state.unsupported = allStreams.filter((s) => !SR.util.webPlayable(s));
|
||||
@@ -449,11 +565,13 @@
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
if (token !== state.loadToken) return;
|
||||
SR.app.showError(e, 'stream lookup failed');
|
||||
showStatus('Stream lookup failed.', true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Sort the popup by provider: provider name is the primary key (A→Z),
|
||||
// original rank is the tie-breaker so order inside a provider is stable.
|
||||
function sortedStreams() {
|
||||
@@ -584,116 +702,132 @@
|
||||
|
||||
async function loadSeasons() {
|
||||
const data = await SR.api.seasons(id);
|
||||
state.seasons = data.seasons || [];
|
||||
state.seasons = (data.seasons || []).slice().sort((a, b) => a.season_number - b.season_number);
|
||||
renderSeasonTabs();
|
||||
}
|
||||
|
||||
function renderSeasonTabs() {
|
||||
seasonTabs.replaceChildren();
|
||||
for (const s of state.seasons) {
|
||||
const opt = document.createElement('option');
|
||||
opt.value = s.season_number;
|
||||
opt.textContent = `${s.name} (${s.episode_count})`;
|
||||
seasonSelect.appendChild(opt);
|
||||
const b = document.createElement('button');
|
||||
b.type = 'button';
|
||||
b.role = 'tab';
|
||||
b.className = s.season_number === state.season ? 'chip chip--active' : 'chip';
|
||||
b.textContent = `S${s.season_number}`;
|
||||
b.title = `${s.name || `Season ${s.season_number}`} (${s.episode_count || 0})`;
|
||||
b.addEventListener('click', () => {
|
||||
if (s.season_number !== state.season) loadEpisodes(s.season_number, null);
|
||||
});
|
||||
seasonTabs.appendChild(b);
|
||||
}
|
||||
}
|
||||
|
||||
function showGridSpinner() {
|
||||
episodeGrid.replaceChildren();
|
||||
function showShelfSpinner() {
|
||||
episodeShelf.replaceChildren();
|
||||
const cell = document.createElement('div');
|
||||
cell.className = 'loading-cell';
|
||||
cell.className = 'episode-shelf__loading';
|
||||
cell.innerHTML = '<div class="spinner"></div>';
|
||||
episodeGrid.appendChild(cell);
|
||||
episodeShelf.appendChild(cell);
|
||||
}
|
||||
|
||||
function progressFor(season, episode) {
|
||||
const key = SR.storage.keyFor({ type, tmdbId: Number(id), season, episode });
|
||||
const rec = SR.storage.get(key);
|
||||
if (!rec || !rec.t || !rec.d) return 0;
|
||||
return Math.max(0, Math.min(1, rec.t / rec.d));
|
||||
}
|
||||
|
||||
function renderEpisodes() {
|
||||
episodeGrid.replaceChildren();
|
||||
episodeShelf.replaceChildren();
|
||||
if (!state.episodes.length) {
|
||||
const empty = SR.cards.emptyState('No episodes listed');
|
||||
empty.style.gridColumn = '1 / -1';
|
||||
episodeGrid.appendChild(empty);
|
||||
empty.className = `${empty.className} episode-shelf__empty`;
|
||||
episodeShelf.appendChild(empty);
|
||||
return;
|
||||
}
|
||||
|
||||
for (const ep of state.episodes) {
|
||||
const current = ep.episode_number === state.episode;
|
||||
const b = document.createElement('button');
|
||||
b.type = 'button';
|
||||
b.className = ep.episode_number === state.episode ? 'episode episode--current' : 'episode';
|
||||
b.className = current ? 'episode-card episode-card--current' : 'episode-card';
|
||||
const date = ep.air_date ? ` · ${SR.util.escapeHtml(ep.air_date)}` : '';
|
||||
const still = ep.still || (ep.still_path ? SR.util.tmdbResize(ep.still_path, 'w300') : '');
|
||||
const progress = progressFor(state.season, ep.episode_number);
|
||||
|
||||
b.innerHTML = `
|
||||
<span class="episode__thumb${still ? '' : ' episode__thumb--empty'}">
|
||||
<span class="episode-card__thumb${still ? '' : ' episode-card__thumb--empty'}">
|
||||
${still ? `<img src="${still}" alt="" loading="lazy">` : `<span aria-hidden="true">${ep.episode_number}</span>`}
|
||||
<span class="episode__play">▶</span>
|
||||
${progress > 0 ? `<span class="episode-card__progress" style="width:${Math.round(progress * 100)}%"></span>` : ''}
|
||||
</span>
|
||||
<span class="episode__body">
|
||||
<span class="episode__num">S${state.season} · E${ep.episode_number}${date}</span>
|
||||
<span class="episode__title">${SR.util.escapeHtml(ep.name || `Episode ${ep.episode_number}`)}</span>
|
||||
<span class="episode-card__body">
|
||||
<span class="episode-card__num">S${state.season} · E${ep.episode_number}${date}</span>
|
||||
<span class="episode-card__title">${SR.util.escapeHtml(ep.name || `Episode ${ep.episode_number}`)}</span>
|
||||
<span class="episode-card__meta">${SR.util.escapeHtml(SR.util.runtimeLabel(ep.runtime) || '')}</span>
|
||||
</span>`;
|
||||
const img = b.querySelector('.episode__thumb img');
|
||||
|
||||
const img = b.querySelector('.episode-card__thumb img');
|
||||
if (img) {
|
||||
img.addEventListener('error', () => {
|
||||
const thumb = img.closest('.episode__thumb');
|
||||
const thumb = img.closest('.episode-card__thumb');
|
||||
img.remove();
|
||||
thumb.classList.add('episode__thumb--empty');
|
||||
thumb.classList.add('episode-card__thumb--empty');
|
||||
const num = document.createElement('span');
|
||||
num.setAttribute('aria-hidden', 'true');
|
||||
num.textContent = ep.episode_number;
|
||||
thumb.prepend(num);
|
||||
});
|
||||
}
|
||||
|
||||
b.addEventListener('click', () => playEpisode(ep.episode_number));
|
||||
episodeGrid.appendChild(b);
|
||||
episodeShelf.appendChild(b);
|
||||
}
|
||||
}
|
||||
|
||||
async function loadEpisodes(season, autoplayEpisode) {
|
||||
const token = ++state.loadToken;
|
||||
state.season = season;
|
||||
seasonSelect.value = String(season);
|
||||
showGridSpinner();
|
||||
state.episode = autoplayEpisode != null ? autoplayEpisode : null;
|
||||
renderSeasonTabs();
|
||||
showShelfSpinner();
|
||||
|
||||
const data = await SR.api.episodes(id, season);
|
||||
if (token !== state.loadToken) return;
|
||||
|
||||
state.episodes = data.episodes || [];
|
||||
if (autoplayEpisode != null && state.episodes.some((e) => e.episode_number === autoplayEpisode)) {
|
||||
playEpisode(autoplayEpisode);
|
||||
return;
|
||||
}
|
||||
state.episode = state.episodes.length ? state.episodes[0].episode_number : null;
|
||||
renderEpisodes();
|
||||
syncUrl();
|
||||
if (autoplayEpisode && state.episodes.some((e) => e.episode_number === autoplayEpisode)) {
|
||||
playEpisode(autoplayEpisode);
|
||||
}
|
||||
setPlayLabel();
|
||||
}
|
||||
|
||||
function playEpisode(n) {
|
||||
state.episode = n;
|
||||
syncUrl();
|
||||
renderEpisodes();
|
||||
setPlayLabel();
|
||||
openPlayer();
|
||||
loadStreams();
|
||||
document.getElementById('playerSection').scrollIntoView({ behavior: 'smooth', block: 'start' });
|
||||
}
|
||||
|
||||
seasonSelect.addEventListener('change', async () => {
|
||||
const season = parseInt(seasonSelect.value, 10);
|
||||
if (!season) return;
|
||||
try {
|
||||
await loadEpisodes(season);
|
||||
} catch (e) {
|
||||
SR.app.showError(e, 'failed to load episodes');
|
||||
}
|
||||
});
|
||||
|
||||
async function stepEpisode(delta) {
|
||||
if (type !== 'tv') return;
|
||||
const idx = state.episodes.findIndex((e) => e.episode_number === state.episode);
|
||||
if (idx >= 0 && idx + delta >= 0 && idx + delta < state.episodes.length) {
|
||||
playEpisode(state.episodes[idx + delta].episode_number);
|
||||
playButton.addEventListener('click', () => {
|
||||
if (state.episode == null) {
|
||||
if (state.episodes.length) playEpisode(state.episodes[0].episode_number);
|
||||
return;
|
||||
}
|
||||
const sIdx = state.seasons.findIndex((s) => s.season_number === state.season);
|
||||
if (sIdx < 0 || sIdx + delta < 0 || sIdx + delta >= state.seasons.length) return;
|
||||
try {
|
||||
await loadEpisodes(state.seasons[sIdx + delta].season_number);
|
||||
const first = state.episodes[0];
|
||||
if (first) playEpisode(first.episode_number);
|
||||
} catch (e) {
|
||||
SR.app.showError(e, 'failed to load episodes');
|
||||
if (state.loadedKey === keyFor() && state.streams.length) {
|
||||
openPlayer();
|
||||
return;
|
||||
}
|
||||
}
|
||||
openPlayer();
|
||||
loadStreams();
|
||||
});
|
||||
|
||||
prevBtn.addEventListener('click', () => stepEpisode(-1));
|
||||
nextBtn.addEventListener('click', () => stepEpisode(1));
|
||||
|
||||
/* ---- init ------------------------------------------------------------------------------ */
|
||||
playerClose.addEventListener('click', closePlayer);
|
||||
|
||||
(async function init() {
|
||||
let details;
|
||||
@@ -701,41 +835,55 @@
|
||||
details = await SR.api.details(type, id);
|
||||
} catch (e) {
|
||||
SR.app.showError(e, 'failed to load this title');
|
||||
showStatus('Could not load this title.', true);
|
||||
renderHeroError('Could not load this title.');
|
||||
return;
|
||||
}
|
||||
|
||||
state.details = details;
|
||||
renderHero(details);
|
||||
|
||||
if (type !== 'tv') {
|
||||
openPlayer();
|
||||
loadStreams();
|
||||
return;
|
||||
}
|
||||
|
||||
episodeSection.hidden = false;
|
||||
showStatus('Pick an episode to start.');
|
||||
showStatus('Loading episodes…');
|
||||
|
||||
try {
|
||||
await loadSeasons();
|
||||
} catch (e) {
|
||||
SR.app.showError(e, 'failed to load seasons');
|
||||
renderHeroError('Could not load seasons.');
|
||||
return;
|
||||
}
|
||||
|
||||
if (!state.seasons.length) {
|
||||
showStatus('No seasons found for this show.', true);
|
||||
renderHeroError('No seasons found for this show.');
|
||||
return;
|
||||
}
|
||||
|
||||
const sParam = parseInt(params.get('s'), 10);
|
||||
const eParam = parseInt(params.get('e'), 10);
|
||||
const season = state.seasons.some((s) => s.season_number === sParam)
|
||||
? sParam
|
||||
: state.seasons[0].season_number;
|
||||
const hasSeason = (n) => state.seasons.some((s) => s.season_number === n);
|
||||
const season = hasSeason(sParam) ? sParam : hasSeason(1) ? 1 : state.seasons[0].season_number;
|
||||
|
||||
try {
|
||||
await loadEpisodes(season, eParam || null);
|
||||
await loadEpisodes(season, null);
|
||||
} catch (e) {
|
||||
SR.app.showError(e, 'failed to load episodes');
|
||||
showStatus('Failed to load episodes.', true);
|
||||
renderHeroError('Could not load episodes.');
|
||||
return;
|
||||
}
|
||||
|
||||
if (!state.episodes.length) {
|
||||
renderHeroError('No episodes found for this show.');
|
||||
return;
|
||||
}
|
||||
|
||||
if (season === sParam && state.episodes.some((e) => e.episode_number === eParam)) {
|
||||
playEpisode(eParam);
|
||||
}
|
||||
})();
|
||||
})();
|
||||
|
||||
Reference in New Issue
Block a user