From daaf71900ea266a6d9fcf8440d8933d4e12effdc Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Mon, 30 Aug 2021 20:26:04 +0300 Subject: [PATCH 1/4] Move blacklist.json to data/ --- scripts/{helpers => data}/blacklist.json | 0 scripts/filter.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename scripts/{helpers => data}/blacklist.json (100%) diff --git a/scripts/helpers/blacklist.json b/scripts/data/blacklist.json similarity index 100% rename from scripts/helpers/blacklist.json rename to scripts/data/blacklist.json diff --git a/scripts/filter.js b/scripts/filter.js index 04f6f2644..3efbc492e 100644 --- a/scripts/filter.js +++ b/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') From 4e6ee2452f498f2876c7574d3028649049461d2e Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Mon, 30 Aug 2021 20:27:12 +0300 Subject: [PATCH 2/4] Move categories.json to data/ --- scripts/{helpers => data}/categories.json | 0 scripts/helpers/Channel.js | 2 +- scripts/helpers/db.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename scripts/{helpers => data}/categories.json (100%) diff --git a/scripts/helpers/categories.json b/scripts/data/categories.json similarity index 100% rename from scripts/helpers/categories.json rename to scripts/data/categories.json diff --git a/scripts/helpers/Channel.js b/scripts/helpers/Channel.js index 07d5c60bd..e0740c897 100644 --- a/scripts/helpers/Channel.js +++ b/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') diff --git a/scripts/helpers/db.js b/scripts/helpers/db.js index 52f537098..3354071c3 100644 --- a/scripts/helpers/db.js +++ b/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') From 80142f73442548a163c4c85ed4e9698ea6303ef7 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Mon, 30 Aug 2021 20:28:44 +0300 Subject: [PATCH 3/4] Move regions.json to data/ --- scripts/{helpers => data}/regions.json | 0 scripts/helpers/utils.js | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename scripts/{helpers => data}/regions.json (100%) diff --git a/scripts/helpers/regions.json b/scripts/data/regions.json similarity index 100% rename from scripts/helpers/regions.json rename to scripts/data/regions.json diff --git a/scripts/helpers/utils.js b/scripts/helpers/utils.js index 3866ae4ca..277bae92f 100644 --- a/scripts/helpers/utils.js +++ b/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'], { From 38f2b7c7f953cbbb3a8f811cc569f606157a9f26 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Mon, 30 Aug 2021 20:28:48 +0300 Subject: [PATCH 4/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef08f6c07..4f5a5e2d8 100644 --- a/CONTRIBUTING.md +++ b/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.