Merge branch 'master' into patch-27

CONTRIBUTING.md

@@ -168,6 +168,7 @@ http://example.com/stream.m3u8
   - ...
   - `unsorted.m3u`: playlist with channels not yet sorted.
 - `scripts/`
+  - `data/`: data used in scripts.
   - `helpers/`: helper scripts used in GitHub Actions.
   - `filter.js`: used within GitHub Action to remove blacklisted channels from playlists.
   - `format.js`: used within GitHub Action to format channel descriptions.

scripts/filter.js

@@ -1,4 +1,4 @@
-const blacklist = require('./helpers/blacklist.json')
+const blacklist = require('./data/blacklist.json')
 const parser = require('./helpers/parser')
 const log = require('./helpers/log')
 

scripts/helpers/Channel.js

@@ -1,4 +1,4 @@
-const categories = require('./categories')
+const categories = require('../data/categories')
 const utils = require('./utils')
 const file = require('./file')
 

scripts/helpers/db.js

@@ -1,4 +1,4 @@
-const categories = require('./categories')
+const categories = require('../data/categories')
 const parser = require('./parser')
 const utils = require('./utils')
 

scripts/helpers/utils.js

@@ -1,7 +1,7 @@
 const transliteration = require('transliteration')
 const iso6393 = require('@freearhey/iso-639-3')
-const categories = require('./categories')
-const regions = require('./regions')
+const categories = require('../data/categories')
+const regions = require('../data/regions')
 
 const utils = {}
 const intlDisplayNames = new Intl.DisplayNames(['en'], {