Merge pull request #3031 from iptv-org/remove-adult-channels-from-most-playlists

Remove adult channels from most playlists, and implement new way of sorting them.

.readme/template.md

@@ -18,6 +18,7 @@ Also you can instead use one of these playlists:
 - `https://iptv-org.github.io/iptv/index.country.m3u` (grouped by country)
 - `https://iptv-org.github.io/iptv/index.category.m3u` (grouped by category)
 - `https://iptv-org.github.io/iptv/index.language.m3u` (grouped by language)
+- `https://iptv-org.github.io/iptv/index.nsfw.m3u` (includes adult channels)
 
 Or select one of the playlists from the list below.
 
@@ -54,8 +55,6 @@ Or select one of the playlists from the list below.
 
 </details>
 
-**NOTE:** Add `.sfw` to the end of the filename for the lists without any adult channels (For example: `https://iptv-org.github.io/iptv/countries/fr.sfw.m3u`).
-
 ## For Developers
 
 In addition to the above methods, you can also get a list of all available channels in JSON format.

scripts/generate.js

@@ -34,15 +34,15 @@ function generateIndex() {
   const filename = `${ROOT_DIR}/index.m3u`
   utils.createFile(filename, '#EXTM3U\n')
 
-  const sfwFilename = `${ROOT_DIR}/index.sfw.m3u`
+  const nsfwFilename = `${ROOT_DIR}/index.nsfw.m3u`
-  utils.createFile(sfwFilename, '#EXTM3U\n')
+  utils.createFile(nsfwFilename, '#EXTM3U\n')
 
   const channels = db.channels.sortBy(['name', 'url']).removeDuplicates().get()
   for (const channel of channels) {
+    if (!channel.isNSFW()) {
       utils.appendToFile(filename, channel.toString())
-    if (channel.isSFW()) {
-      utils.appendToFile(sfwFilename, channel.toString())
     }
+    utils.appendToFile(nsfwFilename, channel.toString())
   }
 }
 
@@ -51,15 +51,9 @@ function generateCategoryIndex() {
   const filename = `${ROOT_DIR}/index.category.m3u`
   utils.createFile(filename, '#EXTM3U\n')
 
-  const sfwFilename = `${ROOT_DIR}/index.category.sfw.m3u`
-  utils.createFile(sfwFilename, '#EXTM3U\n')
-
   const channels = db.channels.sortBy(['category', 'name', 'url']).removeDuplicates().get()
   for (const channel of channels) {
     utils.appendToFile(filename, channel.toString())
-    if (channel.isSFW()) {
-      utils.appendToFile(sfwFilename, channel.toString())
-    }
   }
 }
 
@@ -68,9 +62,6 @@ function generateCountryIndex() {
   const filename = `${ROOT_DIR}/index.country.m3u`
   utils.createFile(filename, '#EXTM3U\n')
 
-  const sfwFilename = `${ROOT_DIR}/index.country.sfw.m3u`
-  utils.createFile(sfwFilename, '#EXTM3U\n')
-
   for (const country of [{ code: 'undefined' }, ...db.countries.sortBy(['name']).all()]) {
     const channels = db.channels
       .sortBy(['name', 'url'])
@@ -79,11 +70,10 @@ function generateCountryIndex() {
       .get()
     for (const channel of channels) {
       const category = channel.category
-      const sfw = channel.isSFW()
+      const nsfw = channel.isNSFW()
       channel.category = country.name || ''
+      if (!nsfw) {
         utils.appendToFile(filename, channel.toString())
-      if (sfw) {
-        utils.appendToFile(sfwFilename, channel.toString())
       }
       channel.category = category
     }
@@ -95,9 +85,6 @@ function generateLanguageIndex() {
   const filename = `${ROOT_DIR}/index.language.m3u`
   utils.createFile(filename, '#EXTM3U\n')
 
-  const sfwFilename = `${ROOT_DIR}/index.language.sfw.m3u`
-  utils.createFile(sfwFilename, '#EXTM3U\n')
-
   for (const language of [{ code: 'undefined' }, ...db.languages.sortBy(['name']).all()]) {
     const channels = db.channels
       .sortBy(['name', 'url'])
@@ -106,11 +93,10 @@ function generateLanguageIndex() {
       .get()
     for (const channel of channels) {
       const category = channel.category
-      const sfw = channel.isSFW()
+      const nsfw = channel.isNSFW()
       channel.category = language.name || ''
+      if (!nsfw) {
         utils.appendToFile(filename, channel.toString())
-      if (sfw) {
-        utils.appendToFile(sfwFilename, channel.toString())
       }
       channel.category = category
     }
@@ -146,18 +132,14 @@ function generateCountries() {
     const filename = `${outputDir}/${country.code}.m3u`
     utils.createFile(filename, '#EXTM3U\n')
 
-    const sfwFilename = `${outputDir}/${country.code}.sfw.m3u`
-    utils.createFile(sfwFilename, '#EXTM3U\n')
-
     const channels = db.channels
       .sortBy(['name', 'url'])
       .forCountry(country)
       .removeDuplicates()
       .get()
     for (const channel of channels) {
+      if (!channel.isNSFW()) {
         utils.appendToFile(filename, channel.toString())
-      if (channel.isSFW()) {
-        utils.appendToFile(sfwFilename, channel.toString())
       }
     }
   }
@@ -172,18 +154,14 @@ function generateLanguages() {
     const filename = `${outputDir}/${language.code}.m3u`
     utils.createFile(filename, '#EXTM3U\n')
 
-    const sfwFilename = `${outputDir}/${language.code}.sfw.m3u`
-    utils.createFile(sfwFilename, '#EXTM3U\n')
-
     const channels = db.channels
       .sortBy(['name', 'url'])
       .forLanguage(language)
       .removeDuplicates()
       .get()
     for (const channel of channels) {
+      if (!channel.isNSFW()) {
         utils.appendToFile(filename, channel.toString())
-      if (channel.isSFW()) {
-        utils.appendToFile(sfwFilename, channel.toString())
       }
     }
   }

scripts/parser.js

@@ -4,6 +4,7 @@ const categories = require('./categories')
 const path = require('path')
 
 const sfwCategories = categories.filter(c => !c.nsfw).map(c => c.name)
+const nsfwCategories = categories.filter(c => c.nsfw).map(c => c.name)
 
 const parser = {}
 
@@ -234,6 +235,10 @@ class Channel {
   isSFW() {
     return sfwCategories.includes(this.category)
   }
+
+  isNSFW() {
+    return nsfwCategories.includes(this.category)
+  }
 }
 
 module.exports = parser