Contact ${manifest.name} creator:
${manifest.contactEmail} ` : ''; - const providersHTML = Providers - .map(provider => ``) + const providersHTML = Providers.options + .map(provider => ``) .join('\n'); const sortOptionsHTML = Object.values(SortOptions.options) .map((option, i) => ``) @@ -393,17 +394,18 @@ function landingTemplate(manifest, config = {}) { const allDebrid = allDebridValue.length && allDebridValue.trim(); const putio = putioClientIdValue.length && putioTokenValue.length && putioClientIdValue.trim() + '@' + putioTokenValue.trim(); - const configurationValue = [ - ['providers', providers], + let configurationValue = [ + ['${Providers.key}', providers], ['${SortOptions.key}', sort], - ['limit', limit], ['${QualityFilter.key}', qualityFilters], + ['limit', limit], ['${DebridOptions.key}', debridOptions], ['${MochOptions.realdebrid.key}', realDebrid], ['${MochOptions.premiumize.key}', premiumize], ['${MochOptions.alldebrid.key}', allDebrid], ['${MochOptions.putio.key}', putio] ].filter(([_, value]) => value.length).map(([key, value]) => key + '=' + value).join('|'); + configurationValue = '${LiteConfigValue}' === configurationValue ? 'lite' : configurationValue; const configuration = configurationValue && configurationValue.length ? '/' + configurationValue : ''; installLink.href = 'stremio://' + window.location.host + configuration + '/manifest.json'; } diff --git a/addon/lib/manifest.js b/addon/lib/manifest.js index be36f96..3baf08a 100644 --- a/addon/lib/manifest.js +++ b/addon/lib/manifest.js @@ -3,27 +3,15 @@ const { Providers } = require('./filter'); const { showDebridCatalog } = require('../moch/options'); const { Type } = require('./types'); -const DefaultProviders = Providers +const DefaultProviders = Providers.options.map(provider => provider.key); const CatalogMochs = Object.values(MochOptions).filter(moch => moch.catalog); function manifest(config = {}) { - const providersList = config.providers && config.providers.map(provider => getProvider(provider)) || DefaultProviders; - const enabledProvidersDesc = Providers - .map(provider => `${provider}${providersList.includes(provider) ? '(+)' : '(-)'}`) - .join(', ') - const enabledMochs = Object.values(MochOptions) - .filter(moch => config[moch.key]) - .map(moch => moch.name) - .join(' & '); - const possibleMochs = Object.values(MochOptions).map(moch => moch.name).join('/') - const mochsDesc = enabledMochs ? ` and ${enabledMochs} enabled` : ''; return { - id: 'com.stremio.torrentio.addon', + id: `com.stremio.torrentio${config.lite ? '.lite' : ''}.addon`, version: '0.0.10', - name: 'Torrentio', - description: 'Provides torrent streams from scraped torrent providers.' - + ` Currently supports ${enabledProvidersDesc}${mochsDesc}.` - + ` To configure providers, ${possibleMochs} support and other settings visit https://torrentio.strem.fun`, + name: `Torrentio${config.lite ? ' Lite' : ''}`, + description: getDescription(config), catalogs: getCatalogs(config), resources: getResources(config), types: [Type.MOVIE, Type.SERIES, Type.OTHER], @@ -43,8 +31,24 @@ function dummyManifest() { return manifestDefault; } -function getProvider(configProvider) { - return Providers.find(provider => provider.toLowerCase() === configProvider); +function getDescription(config) { + if (config.lite) { + return 'Preconfigured Lite version of Torrentio addon.' + + ' To configure advanced options visit https://torrentio.strem.fun'; + } + const providersList = config.providers || DefaultProviders; + const enabledProvidersDesc = Providers.options + .map(provider => `${provider.label}${providersList.includes(provider.key) ? '(+)' : '(-)'}`) + .join(', ') + const enabledMochs = Object.values(MochOptions) + .filter(moch => config[moch.key]) + .map(moch => moch.name) + .join(' & '); + const possibleMochs = Object.values(MochOptions).map(moch => moch.name).join('/') + const mochsDesc = enabledMochs ? ` and ${enabledMochs} enabled` : ''; + return 'Provides torrent streams from scraped torrent providers.' + + ` Currently supports ${enabledProvidersDesc}${mochsDesc}.` + + ` To configure providers, ${possibleMochs} support and other settings visit https://torrentio.strem.fun` } function getCatalogs(config) { diff --git a/addon/lib/sort.js b/addon/lib/sort.js index 24eccc0..5e76cf5 100644 --- a/addon/lib/sort.js +++ b/addon/lib/sort.js @@ -1,3 +1,7 @@ +const { QualityFilter } = require('./filter'); + +const OTHER_QUALITIES = QualityFilter.options.find(option => option.key === 'other'); +const CAM_QUALITIES = QualityFilter.options.find(option => option.key === 'cam'); const HEALTHY_SEEDERS = 5; const SEEDED_SEEDERS = 1; const MIN_HEALTHY_COUNT = 10; @@ -97,6 +101,10 @@ function extractQuality(title) { return '4320p' } else if (/4k|uhd/i.test(qualityDesc)) { return '2060p' + } else if (CAM_QUALITIES.test(qualityDesc)) { + return CAM_QUALITIES.label; + } else if (OTHER_QUALITIES.test(qualityDesc)) { + return OTHER_QUALITIES.label; } return qualityDesc; } diff --git a/addon/lib/streamInfo.js b/addon/lib/streamInfo.js index d1f822e..fa509c4 100644 --- a/addon/lib/streamInfo.js +++ b/addon/lib/streamInfo.js @@ -69,8 +69,9 @@ function getQuality(record, torrentInfo, fileInfo) { function getLanguages(record, torrentInfo, fileInfo) { const providerLanguages = record.torrent.languages && titleParser.parse(record.torrent.languages).languages || []; const torrentLanguages = torrentInfo.languages || []; + const fileLanguages = fileInfo.languages || []; const dubbed = torrentInfo.dubbed || fileInfo.dubbed; - let languages = [].concat(torrentLanguages).concat(providerLanguages); + let languages = Array.from(new Set([].concat(torrentLanguages).concat(fileLanguages).concat(providerLanguages))); if (record.kitsuId || record.torrent.type === Type.ANIME) { // no need to display japanese for anime or english if anime is dubbed languages = languages.concat(dubbed ? ['dubbed'] : [])