Merge branch 'master' into patch-5
This commit is contained in:
commit
f44f2b27ed
13
.gitignore
vendored
13
.gitignore
vendored
@ -1,12 +1 @@
|
|||||||
node_modules/
|
node_modules
|
||||||
error.log
|
|
||||||
helpers/categories.md
|
|
||||||
helpers/countries.md
|
|
||||||
|
|
||||||
# IDE
|
|
||||||
*.sublime-project
|
|
||||||
*.sublime-workspace
|
|
||||||
.idea
|
|
||||||
|
|
||||||
# OS
|
|
||||||
.DS_Store
|
|
3
.readme/.gitignore
vendored
Normal file
3
.readme/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
_categories.md
|
||||||
|
_countries.md
|
||||||
|
_languages.md
|
@ -1,7 +1,6 @@
|
|||||||
# IPTV
|
# IPTV
|
||||||
|
|
||||||
![auto-update](https://github.com/iptv-org/iptv/actions/workflows/auto-update.yml/badge.svg)
|
[![auto-update](https://github.com/iptv-org/iptv/actions/workflows/auto-update.yml/badge.svg)](https://github.com/iptv-org/iptv/actions/workflows/auto-update.yml)
|
||||||
![clean](https://github.com/iptv-org/iptv/actions/workflows/clean.yml/badge.svg)
|
|
||||||
|
|
||||||
Collection of publicly available IPTV channels from all over the world.
|
Collection of publicly available IPTV channels from all over the world.
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ async function main() {
|
|||||||
|
|
||||||
async function sortChannels(playlist) {
|
async function sortChannels(playlist) {
|
||||||
const channels = [...playlist.channels]
|
const channels = [...playlist.channels]
|
||||||
utils.sortBy(channels, ['name', 'url'])
|
utils.sortBy(channels, ['name', 'status', 'url'])
|
||||||
|
|
||||||
if (JSON.stringify(channels) !== JSON.stringify(playlist.channels)) {
|
if (JSON.stringify(channels) !== JSON.stringify(playlist.channels)) {
|
||||||
log.print('updated')
|
log.print('updated')
|
||||||
|
@ -25,7 +25,7 @@ function generateCategoriesTable() {
|
|||||||
for (const category of [...db.categories.all(), { name: 'Other', id: 'other' }]) {
|
for (const category of [...db.categories.all(), { name: 'Other', id: 'other' }]) {
|
||||||
categories.push({
|
categories.push({
|
||||||
category: category.name,
|
category: category.name,
|
||||||
channels: db.channels.forCategory(category).removeDuplicates().count(),
|
channels: db.channels.forCategory(category).removeOffline().removeDuplicates().count(),
|
||||||
playlist: `<code>https://iptv-org.github.io/iptv/categories/${category.id}.m3u</code>`
|
playlist: `<code>https://iptv-org.github.io/iptv/categories/${category.id}.m3u</code>`
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -53,7 +53,12 @@ function generateCountriesTable() {
|
|||||||
const prefix = flag ? `${flag} ` : ''
|
const prefix = flag ? `${flag} ` : ''
|
||||||
countries.push({
|
countries.push({
|
||||||
country: prefix + country.name,
|
country: prefix + country.name,
|
||||||
channels: db.channels.forCountry(country).removeDuplicates().removeNSFW().count(),
|
channels: db.channels
|
||||||
|
.forCountry(country)
|
||||||
|
.removeOffline()
|
||||||
|
.removeDuplicates()
|
||||||
|
.removeNSFW()
|
||||||
|
.count(),
|
||||||
playlist: `<code>https://iptv-org.github.io/iptv/countries/${country.code}.m3u</code>`
|
playlist: `<code>https://iptv-org.github.io/iptv/countries/${country.code}.m3u</code>`
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -79,7 +84,12 @@ function generateLanguagesTable() {
|
|||||||
]) {
|
]) {
|
||||||
languages.push({
|
languages.push({
|
||||||
language: language.name,
|
language: language.name,
|
||||||
channels: db.channels.forLanguage(language).removeDuplicates().removeNSFW().count(),
|
channels: db.channels
|
||||||
|
.forLanguage(language)
|
||||||
|
.removeOffline()
|
||||||
|
.removeDuplicates()
|
||||||
|
.removeNSFW()
|
||||||
|
.count(),
|
||||||
playlist: `<code>https://iptv-org.github.io/iptv/languages/${language.code}.m3u</code>`
|
playlist: `<code>https://iptv-org.github.io/iptv/languages/${language.code}.m3u</code>`
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user