iptv-org/iptv
1
0
Fork 0
mirror of https://github.com/iptv-org/iptv synced 2025-12-17 02:47:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update-regions-json

Browse Source
This commit is contained in:
Shadix A
2022-01-01 12:05:25 +02:00
committed by GitHub
parent fd3f5e9a0e 19c6200a32
commit 7b5555f48c
88 changed files with 966 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/commands/generate-playlists.js
View File

@@ -178,7 +178,31 @@ async function generateIndexCategory() {
await generator.generate(
`${PUBLIC_PATH}/index.category.m3u`,
{},
{ sortBy: item => item.group_title }
{
onLoad: function (items) {
let results = items
.filter(item => !item.categories || !item.categories.length)
.map(item => {
const newItem = _.cloneDeep(item)
newItem.group_title = ''
return newItem
})
for (const category of _.sortBy(Object.values(categories), ['name'])) {
let filtered = items
.filter(item => {
return Array.isArray(item.categories) && item.categories.map(c => c.slug).includes(category.slug)
})
.map(item => {
const newItem = _.cloneDeep(item)
newItem.group_title = category.name
return newItem
})
results = results.concat(filtered)
}
return results
},
sortBy: item => item.group_title }
)
}
@@ -191,7 +215,7 @@ async function generateIndexCountry() {
{
onLoad: function (items) {
let results = items
.filter(item => !item.countries.length)
.filter(item => !item.countries || !item.countries.length)
.map(item => {
const newItem = _.cloneDeep(item)
newItem.group_title = ''
@@ -200,7 +224,7 @@ async function generateIndexCountry() {
for (const country of _.sortBy(Object.values(countries), ['name'])) {
let filtered = items
.filter(item => {
return item.countries.map(c => c.code).includes(country.code)
return Array.isArray(item.countries) && item.countries.map(c => c.code).includes(country.code)
})
.map(item => {
const newItem = _.cloneDeep(item)
@@ -226,7 +250,7 @@ async function generateIndexLanguage() {
{
onLoad: function (items) {
let results = items
.filter(item => !item.languages.length)
.filter(item => !item.languages || !item.languages.length)
.map(item => {
const newItem = _.cloneDeep(item)
newItem.group_title = ''
@@ -235,7 +259,7 @@ async function generateIndexLanguage() {
for (const language of languages) {
let filtered = items
.filter(item => {
return item.languages.map(c => c.code).includes(language.code)
return Array.isArray(item.languages) && item.languages.map(c => c.code).includes(language.code)
})
.map(item => {
const newItem = _.cloneDeep(item)
@@ -290,16 +314,16 @@ async function generateIndexRegion() {
async function generateChannelsJson() {
logger.info('Generating channels.json...')
await generator.generate(`${PUBLIC_PATH}/channels.json`, {}, { format: 'json' })
await generator.generate(`${PUBLIC_PATH}/channels.json`, {}, { format: 'json', includeNSFW: true })
}
async function setUp() {
logger.info(`Loading database...`)
const items = await db.find({})
categories = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.categories)), 'slug'), ['name'])
countries = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.countries)), 'code'), ['name'])
languages = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.languages)), 'code'), ['name'])
regions = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.regions)), 'code'), ['name'])
categories = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.categories)), 'slug'), ['name']).filter(i => i)
countries = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.countries)), 'code'), ['name']).filter(i => i)
languages = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.languages)), 'code'), ['name']).filter(i => i)
regions = _.sortBy(_.uniqBy(_.flatten(items.map(i => i.regions)), 'code'), ['name']).filter(i => i)
const categoriesLog = `${LOGS_PATH}/generate-playlists/categories.log`
const countriesLog = `${LOGS_PATH}/generate-playlists/countries.log`

4
scripts/commands/update-database.js
View File

@@ -96,7 +96,9 @@ async function updateStreams() {
status = item.status
else if (prevStatus.code === 'geo_blocked') // geo_blocked -> * = geo_blocked
status = item.status
else if(prevStatus.code === 'offline' && status.code === 'online') // offline -> online = not_247
else if (status.code === 'geo_blocked') // * -> geo_blocked = *
status = item.status
else if (prevStatus.code === 'offline' && status.code === 'online') // offline -> online = not_247
status = statuses['not_247']