From 3eb349c31ec075e5d0fd41db50ba5a237f7dde32 Mon Sep 17 00:00:00 2001 From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com> Date: Tue, 20 Aug 2024 17:16:29 +0200 Subject: [PATCH] fix: dont exclude torrents if user is using external player --- common/modules/extensions/index.js | 19 +++++++++++++++++-- common/modules/rss.js | 16 ---------------- common/modules/util.js | 5 ++++- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/common/modules/extensions/index.js b/common/modules/extensions/index.js index 19de4b9f..e7a527cf 100644 --- a/common/modules/extensions/index.js +++ b/common/modules/extensions/index.js @@ -1,5 +1,4 @@ import { settings } from '@/modules/settings.js' -import { exclusions } from '../rss.js' import { sleep } from '../util.js' import { anilistClient } from '../anilist.js' import { anitomyscript } from '../anime.js' @@ -10,6 +9,22 @@ import Debug from 'debug' const debug = Debug('ui:extensions') +const exclusions = ['DTS', 'TrueHD', '[EMBER]'] +const isDev = location.hostname === 'localhost' + +const video = document.createElement('video') + +if (!isDev && !video.canPlayType('video/mp4; codecs="hev1.1.6.L93.B0"')) { + exclusions.push('HEVC', 'x265', 'H.265') +} +if (!isDev && !video.canPlayType('audio/mp4; codecs="ac-3"')) { + exclusions.push('AC3', 'AC-3') +} +if (!('audioTracks' in HTMLVideoElement.prototype)) { + exclusions.push('DUAL') +} +video.remove() + /** @typedef {import('@thaunknown/ani-resourced/sources/types.d.ts').Options} Options */ /** @typedef {import('@thaunknown/ani-resourced/sources/types.d.ts').Result} Result */ @@ -40,7 +55,7 @@ export default async function getResultsFromExtensions ({ media, episode, batch, anidbEid, titles: createTitles(media), resolution, - exclusions + exclusions: settings.value.enableExternal ? [] : exclusions } const { results, errors } = await worker.query(options, { movie, batch }, settings.value.sources) diff --git a/common/modules/rss.js b/common/modules/rss.js index fd559001..016cfd8e 100644 --- a/common/modules/rss.js +++ b/common/modules/rss.js @@ -10,22 +10,6 @@ import Debug from 'debug' const debug = Debug('ui:rss') -export const exclusions = ['DTS', 'TrueHD', '[EMBER]'] -const isDev = location.hostname === 'localhost' - -const video = document.createElement('video') - -if (!isDev && !video.canPlayType('video/mp4; codecs="hev1.1.6.L93.B0"')) { - exclusions.push('HEVC', 'x265', 'H.265') -} -if (!isDev && !video.canPlayType('audio/mp4; codecs="ac-3"')) { - exclusions.push('AC3', 'AC-3') -} -if (!('audioTracks' in HTMLVideoElement.prototype)) { - exclusions.push('DUAL') -} -video.remove() - export function parseRSSNodes (nodes) { return nodes.map(item => { const pubDate = item.querySelector('pubDate')?.textContent diff --git a/common/modules/util.js b/common/modules/util.js index 88574201..1c8bd9b0 100644 --- a/common/modules/util.js +++ b/common/modules/util.js @@ -1,4 +1,5 @@ import { SUPPORTS } from '@/modules/support.js' +import { enable } from './debug.js' export function countdown (s) { const d = Math.floor(s / (3600 * 24)) @@ -153,7 +154,9 @@ export const defaults = { angle: 'default', toshoURL: SUPPORTS.extensions ? decodeURIComponent(atob('aHR0cHM6Ly9mZWVkLmFuaW1ldG9zaG8ub3JnLw==')) : '', extensions: SUPPORTS.extensions ? ['@thaunknown/ani-resourced'] : [], - sources: {} + sources: {}, + enableExternal: false, + playerPath: '' } export const subtitleExtensions = ['srt', 'vtt', 'ass', 'ssa', 'sub', 'txt']