From ec7795fafbe1d40778e5c64465540898007747c6 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 29 Jan 2025 05:42:41 +0300 Subject: [PATCH 1/5] Update channels.ts --- scripts/schemes/channels.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/schemes/channels.ts b/scripts/schemes/channels.ts index a4a5bb52..25481753 100644 --- a/scripts/schemes/channels.ts +++ b/scripts/schemes/channels.ts @@ -11,6 +11,7 @@ export default { .required(), name: Joi.string() .regex(/^[a-z0-9-!:&.+'/»#%°$@?|¡–\s_—]+$/i) + .regex(/^((?!\s-\s).)*$/) .required(), alt_names: Joi.array().items( Joi.string() From 0d7efa6128b52ae943c3b85a645f093e7f807749 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 29 Jan 2025 05:42:54 +0300 Subject: [PATCH 2/5] Update channels.csv --- data/channels.csv | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/channels.csv b/data/channels.csv index 86da668e..60760ad5 100644 --- a/data/channels.csv +++ b/data/channels.csv @@ -1928,7 +1928,7 @@ ArteInvestimenti.it,Arte Investimenti,,,,IT,,Milan,c/IT,ita,shop,FALSE,,,,https: ArtemisaVision.cu,Artemisa Vision,Artemisa Visión;ArTV,ICRT,,CU,,Artemisa,c/CU,spa,general,FALSE,2005-09-03,,,https://www.tvartemisa.icrt.cu/,https://i.imgur.com/nDZkrXC.png ArteNetworkOrlerCanaleDue.it,Arte Network Orler Canale Due,,,,IT,,Venice,c/IT,ita,documentary,FALSE,,,,https://www.artenetwork.it/streamingtv/,https://www.lyngsat.com/logo/tv/aa/arte-network-orler-canale-due-it.png ArteNetworkOrlerCanaleUno.it,Arte Network Orler Canale Uno,Canale 123,,,IT,,Venice,c/IT,ita,culture;education,FALSE,,,,https://www.artenetwork.it/streamingtv/,https://www.lyngsat.com/logo/tv/aa/arte-network-orler-canale-uno-it.png -ARTFLIXMovieClassics.us,ARTFLIX - Movie Classics,,,,US,,,c/US,eng,movies;classic,FALSE,,,,https://watch.plex.tv/live-tv/channel/artflix-movie-classics,https://i.imgur.com/5pOZQB4.png +ARTFLIXMovieClassics.us,ARTFLIX Movie Classics,,,,US,,,c/US,eng,movies;classic,FALSE,,,,https://watch.plex.tv/live-tv/channel/artflix-movie-classics,https://i.imgur.com/5pOZQB4.png ARTHekayat.sa,ART Hekayat,,,Orbit Showtime Network,SA,,Jeddah,c/SA,ara,series,FALSE,1993-10-15,,,https://www.artonline.tv/,https://i.imgur.com/kzNnSoV.png ARTHekayat2.sa,ART Hekayat 2,,,Orbit Showtime Network,SA,,Jeddah,c/SA,ara,series,FALSE,1993-10-15,,,https://www.artonline.tv/,https://i.imgur.com/EfzfrOL.png ArtigasTelevision.uy,Artigas Television,Artigas Televisión,,,UY,,Montevideo,c/UY,spa,general,FALSE,,,,http://artigastv.com/,https://i.imgur.com/XMqXdfI.png @@ -4022,7 +4022,7 @@ Canal162.mx,Canal 16.2,,,SET Puebla,MX,MX-PUE,Puebla,s/MX-PUE,spa,general,FALSE, Canal16PacificoTV.ar,Canal 16 Pacifico TV,,,,AR,AR-A,Salta,s/AR-A,spa,,FALSE,,,,http://pacifico929.com.ar/,https://i.imgur.com/nn6Kl0r.png Canal17TVNosara.cr,Canal 17 TV Nosara,,,,CR,,Nosara,c/CR,spa,general,FALSE,,,,https://www.radioytvnosara.online/,https://i.imgur.com/pqMTMgF.jpg Canal180.pt,Canal180,,,OSTV,PT,,Porto,c/PT,por,culture,FALSE,2011-04-25,,,https://www.canal180.pt/,https://i.imgur.com/2JgwPmm.jpeg -Canal1MarMenorTorrePacheco.es,Canal 1 Mar Menor - Torre Pacheco,,,Consorcio del Mar Menor,ES,ES-MC,,s/ES-MC,spa,general;news,FALSE,,,,https://www.tuwebtv.es/,https://i.imgur.com/MQOwCdZ.png +Canal1MarMenorTorrePacheco.es,Canal 1 Mar Menor Torre Pacheco,,,Consorcio del Mar Menor,ES,ES-MC,,s/ES-MC,spa,general;news,FALSE,,,,https://www.tuwebtv.es/,https://i.imgur.com/MQOwCdZ.png Canal2.co,Canal 2,,,,CO,CO-VAC,Cali,s/CO-VAC,spa,general,FALSE,,,,https://www.canal2.co/,https://i.imgur.com/BCrsZTQ.png Canal2.cr,Canal 2,,,,CR,,,c/CR,spa,general,FALSE,,,,https://www.repretel.com/envivo-canal2/,https://i.imgur.com/Nn8BtH5.png Canal2.md,Canal 2,,,Telestar Media,MD,,Chisinau,c/MD,ron;rus,general,FALSE,2007-11-21,2023-10-30,,http://www.canal2.md/,https://i.imgur.com/67NyxhK.png @@ -9424,7 +9424,7 @@ FrecuenciaAmazonica.pe,Frecuencia Amazonica,Frecuencia Amazónica,,,PE,PE-LOR,Yu FrecuenciaFTV.co,Frecuencia F TV,,,Iglesia Centro Cristiano,CO,,Cúcuta,c/CO,spa,religious,FALSE,,,,https://www.frecuenciaf.com/canal,https://i.imgur.com/Cw5k96N.png FrederiksbergLokalTV.dk,Frederiksberg Lokal TV,,,,DK,,Frederiksberg,c/DK,dan,general,FALSE,,,,https://frederiksberglokaltv.dk/,https://i.imgur.com/xB64ACe.jpeg FreebieTV.us,Freebie TV,,,,US,US-TX,Austin,c/US,eng,entertainment,FALSE,,,,https://freebie.tv/,https://i.imgur.com/KbmXdjm.png -FreebieTVLosPitufos.us,Freebie TV - Los Pitufos,,,,US,US-TX,Austin,c/US,eng,series,FALSE,,,,https://watch.plex.tv/live-tv/channel/freebie-tv-los-pitufos,https://i.imgur.com/Gd7XpUE.png +FreebieTVLosPitufos.us,Freebie TV Los Pitufos,,,,US,US-TX,Austin,c/US,eng,series,FALSE,,,,https://watch.plex.tv/live-tv/channel/freebie-tv-los-pitufos,https://i.imgur.com/Gd7XpUE.png FreeChannel.ge,Free Channel,თავისუფალი არხი,,,GE,,Tbilisi,c/GE,kat,general,FALSE,,,,,https://i.imgur.com/iYsgMRe.png FREEDOM.ua,FREEDOM,FREEДOM;UATV;Ukraine Tomorrow,,The National News Agency of Ukraine;Ukrinform,UA,UA-30,Kyiv,c/UA,rus,news,FALSE,2015-10-01,,,https://tvfreedom.io/,https://upload.wikimedia.org/wikipedia/commons/thumb/f/f2/FreeDOMUAlogo.svg/512px-FreeDOMUAlogo.svg.png FreedomExperienceTV.ug,Freedom Experience TV,,,,UG,,Kampala,c/UG,eng,religious,FALSE,,,,https://freedomflixtv.org/,https://i.imgur.com/1SiJpPy.png @@ -10128,7 +10128,7 @@ Gribuvisuzinat.lv,Gribu visu zinat,Хочу всё знать,,Teledistribution Grit.us,Grit,,,E. W. Scripps Company,US,US-GA,Atlanta,c/US,eng,entertainment,FALSE,2014-08-18,,,https://www.grittv.com/,https://i.imgur.com/6w1Wj3j.png GritXtra.us,Grit Xtra,,,E. W. Scripps Company,US,US-GA,Atlanta,c/US,eng,entertainment,FALSE,,,,https://www.grittv.com/gritxtra,https://pbs.twimg.com/profile_images/1587656647803113472/tANAElTS_400x400.jpg Grjngo.pl,Grjngo,Grjngo - Westerny,,,PL,,,c/PL;r/EU,pol,,FALSE,,,,https://www.rakuten.tv,https://images-3.rakuten.tv/storage/global-live-channel/translation/artwork/1fe37ff8-c6b7-4123-8c68-653d657b4c5f-width200-quality90.jpeg -GrjngoWesternMovies.de,Grjngo - Western Movies,,,,DE,,Potsdam,c/DE;c/US,eng;deu,movies,FALSE,,,,https://www.grjngo.com/,https://i.imgur.com/wFqhK3p.png +GrjngoWesternMovies.de,Grjngo Western Movies,,,,DE,,Potsdam,c/DE;c/US,eng;deu,movies,FALSE,,,,https://www.grjngo.com/,https://i.imgur.com/wFqhK3p.png Groningen1.nl,Groningen1,,,,NL,,Groningen,c/NL,nld,general,FALSE,,,,https://groningen1.org/,https://i.imgur.com/Ze4uC7j.png Groovezzo.ru,Groovezzo,,,Taurer Media,RU,,Moscow,c/RU,eng;rus,music,FALSE,,,,https://taurer.org/en/projects/,https://avatars.githubusercontent.com/u/75569950?v=4 GroovyTV.gr,Groovy TV,,,,GR,,,c/GR,ell,movies,FALSE,,,,,https://i.imgur.com/ZYNQuf1.png @@ -11409,7 +11409,7 @@ ImperialTelevision.pe,Imperial Television,Imperial Televisión,,,PE,PE-JUN,Huanc ImperialTV.bo,Imperial TV,,,,BO,,Potosí,c/BO,spa,general,FALSE,,,,https://imperialradiotv.com/,https://i.ibb.co/8XHSVWY/IMG-20210613-153444.png ImperialTV.br,Imperial TV,,,,BR,BR-SP,,s/BR-SP,por,news;sports,FALSE,,,,https://imperialtv.com.br/,https://i.imgur.com/Bj0OqOc.png ImperioTVCanal6.ec,Imperio TV Canal 6,,,,EC,,Velasco Ibarra,c/EC,spa,general,FALSE,,,,https://imperiotvcanal6.blogspot.com/,https://i.imgur.com/NrsNljx.png -ImpossibleQuizShow.us,Impossible - Quiz Show,,,,US,,,c/US,eng,series,FALSE,,,,https://watch.plex.tv/live-tv/channel/impossible-quiz-show,https://i.imgur.com/9EWffqx.png +ImpossibleQuizShow.us,Impossible Quiz Show,,,,US,,,c/US,eng,series,FALSE,,,,https://watch.plex.tv/live-tv/channel/impossible-quiz-show,https://i.imgur.com/9EWffqx.png IMRyT.mx,IMRyT,,,Gobierno del Estado de Morelos,MX,MX-MOR,Cuernavaca,s/MX-MOR,spa,general,FALSE,,,,http://imryt.org/,https://i.imgur.com/D91O6ka.png IMTV.sn,IMTV,Islam TV Sénégal,,,SN,,Dakar,c/SN,fra,religious,FALSE,,,,https://imediasn.com/,https://i.imgur.com/B19cWx1.jpg InahealthTV.id,Inahealth TV,,,,ID,,,c/ID,ind,lifestyle,FALSE,,,,,https://i.imgur.com/UH8y2CD.png @@ -16540,7 +16540,7 @@ KSTVComedySeries.ua,KS TV | Comedy Series,КС ТБ | Комедійні сер KSTVConcert.ua,KS TV | Concert,КС ТБ | Концерт,,Kyivstar,UA,,Kyiv,c/UA,ukr,music,FALSE,,,,https://tv.kyivstar.ua/en/live-channels/5fd36a935414fee0a809c916-ks-tv-concert-hd,https://i.imgur.com/TWhZf9c.png KSTVCopWars.ua,KS TV | Cop Wars,КС ТБ | Ментівські війни,,Kyivstar,UA,,Kyiv,c/UA,ukr,,FALSE,,,,https://tv.kyivstar.ua/en/live-channels/6493029e8b94b9c41a08beda-ks-tv-cop-wars,https://i.imgur.com/U6xFbCa.png KSTVCrime.ua,KS TV | Crime,КС ТБ | Кримінал,,Kyivstar,UA,,Kyiv,c/UA,ukr,,FALSE,,,,https://tv.kyivstar.ua/en/live-channels/633458df50347fd195aeeb37-ks-tv-crime-hd,https://i.imgur.com/14Y1dAm.png -KSTVCrimeanbridgeitsover.ua,KS TV | Crimean bridge - it's over,КС ТБ | Кримський міст – всьо,,Kyivstar,UA,,Kyiv,c/UA,ukr,,FALSE,,,,https://tv.kyivstar.ua/en/live-channels/634155b445b4e86497aa384f-ks-tv-crimean-bridge-its-over,https://i.imgur.com/ipxyxZj.png +KSTVCrimeanbridgeitsover.ua,KS TV | Crimean bridge it's over,KS TV | Crimean bridge - it's over;КС ТБ | Кримський міст – всьо,,Kyivstar,UA,,Kyiv,c/UA,ukr,,FALSE,,,,https://tv.kyivstar.ua/en/live-channels/634155b445b4e86497aa384f-ks-tv-crimean-bridge-its-over,https://i.imgur.com/ipxyxZj.png KSTVCulinary.ua,KS TV | Culinary,КС ТБ | Кулінар,,Kyivstar,UA,,Kyiv,c/UA,ukr,cooking,FALSE,,,,https://tv.kyivstar.ua/en/live-channels/64f83591e4b0a1c5db131360-ks-tv-culinary,https://i.imgur.com/Sjsuhyr.png KSTVDetective.ua,KS TV | Detective,КС ТБ | Детектив,,Kyivstar,UA,,Kyiv,c/UA,ukr,entertainment,FALSE,,,,https://tv.kyivstar.ua/en/live-channels/60f57a58d0348f888597bae9-ks-tv-detective-hd,https://i.imgur.com/yNrx31O.png KSTVDoctorshearts.ua,KS TV | Doctors' hearts,КС ТБ | Лікарські серця,,Kyivstar,UA,,Kyiv,c/UA,ukr,,FALSE,,,,https://tv.kyivstar.ua/en/live-channels/646df4f5e4b0f13e55a40d2f-ks-tv-doctors-hearts,https://i.imgur.com/2lqkEeS.png @@ -19749,7 +19749,7 @@ Mobcrush.us,Mobcrush,,,,US,US-CA,Santa Monica,c/US,eng,outdoor,FALSE,,,,,https:/ MOBTV.us,MOB TV,,,,US,,,c/US,eng,,FALSE,,,,https://watch.plex.tv/live-tv/channel/mob-tv,https://i.imgur.com/FyMNyWI.png MocaVisionCanal48.do,Moca Vision Canal 48,Moca Visión Canal 48,,Televiaducto S.A.,DO,,Moca,c/DO,spa,general,FALSE,,,,https://www.televiaducto.com.do/,https://i.imgur.com/vclDXV7.jpeg Moconomy.pl,Moconomy,Moconomy - Gospodarka i Finanse,,,PL,,,c/PL;r/EU,pol,,FALSE,,,,https://www.rakuten.tv,https://images-0.rakuten.tv/storage/global-live-channel/translation/artwork/9da0ec4d-85ea-45f4-b3f9-ae917d1714f9-width200-quality90.jpeg -MoconomyEconomyFinanceInfotainment.us,Moconomy - Economy & Finance Infotainment,,,,US,US-NY,New York City,c/US,eng,business;documentary,FALSE,,,,https://watch.plex.tv/live-tv/channel/moconomy-economy-and-finance-infotainment,https://i.imgur.com/GvqbLZB.png +MoconomyEconomyFinanceInfotainment.us,Moconomy Economy & Finance Infotainment,,,,US,US-NY,New York City,c/US,eng,business;documentary,FALSE,,,,https://watch.plex.tv/live-tv/channel/moconomy-economy-and-finance-infotainment,https://i.imgur.com/GvqbLZB.png ModaHuancayoTV.pe,Moda Huancayo TV,,,,PE,PE-JUN,Huancayo,c/PE,spa,,FALSE,,,,https://www.modahuancayotv.com/,https://i.imgur.com/Bb9U3Xy.png ModernEconomy.ir,Modern Economy,,,,IR,,Istanbul,c/IR,fas,business,FALSE,,,,https://gemonline.tv/,https://i.imgur.com/IFWN8fs.png ModernEducationChannel.cn,Modern Education Channel,现代教育频道,,Guangdong Radio and Television,CN,,Guangzhou,c/CN,zho,education,FALSE,,,,https://www.gdtv.cn/tvChannelDetail/43,https://image.qcc.com/product/66d8b7f2-9aac-4323-962b-cd746731a17b.jpg?x-oss-process=style/logo_200 From 2206f3c1f7bf4a7ab2cb5150ef5c0d775ff5a666 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 29 Jan 2025 05:43:17 +0300 Subject: [PATCH 3/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7196aca..77dac552 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,24 +10,24 @@ ### channels -| Field | Description | Required | Example | -| -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------------------------------ | -| id | Unique channel ID derived from the `name` and `country` separated by dot. May only contain Latin letters, numbers and dot. | Required | `AnhuiTV.cn` | -| name | Official channel name in English or call sign. May include: `a-z`, `0-9`, `space`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, \|, `¡`, `–`. | Required | `Anhui TV` | -| alt_names | List of alternative channel names separated by `;`. May contain any characters except `,` and `"`. | Optional | `安徽卫视;AHTV` | -| network | Network of which this channel is a part. May contain any characters except `,` and `"`. | Optional | `Anhui` | -| owners | List of channel owners separated by `;`. May contain any characters except `,` and `"`. | Optional | `China Central Television` | -| country | Country code from which the channel is transmitted. A list of all supported countries and their codes can be found in [data/countries.csv](data/countries.csv) | Required | `CN` | -| subdivision | Code of the subdivision (e.g., provinces or states) from which the broadcast is transmitted. A list of all supported subdivisions and their codes can be found in [data/subdivisions.csv](data/subdivisions.csv). | Optional | `CN-AH` | -| city | The name of the city in English from which the channel is broadcast. May contain any characters except `,` and `"`. | Optional | `Hefei` | -| broadcast_area | List of codes describing the broadcasting area of the channel separated by `;`. Any combination of `r/`, `c/`, `s/`. | Required | `c/CN;r/ASIA` | -| languages | List of languages in which the channel is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](data/languages.csv). | Required | `zho;eng` | -| categories | List of categories to which this channel belongs separated by `;`. A list of all supported categories can be found in [data/categories.csv](data/categories.csv). | Optional | `animation;kids` | -| is_nsfw | Indicates whether the channel broadcasts adult content (`TRUE` or `FALSE`). | Required | `FALSE` | -| launched | Launch date of the channel (`YYYY-MM-DD`). | Optional | `2016-07-28` | -| closed | Date on which the channel closed (`YYYY-MM-DD`). | Optional | `2020-05-31` | -| replaced_by | The ID of the channel that this channel was replaced by. | Optional | `CCTV1.cn` | -| website | Official website URL. | Optional | `http://www.ahtv.cn/` | +| Field | Description | Required | Example | +| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------------------------------ | +| id | Unique channel ID derived from the `name` and `country` separated by dot. May only contain Latin letters, numbers and dot. | Required | `AnhuiTV.cn` | +| name | Official channel name in English or call sign. May include: `a-z`, `0-9`, `space`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, \|, `¡`. | Required | `Anhui TV` | +| alt_names | List of alternative channel names separated by `;`. May contain any characters except `,` and `"`. | Optional | `安徽卫视;AHTV` | +| network | Network of which this channel is a part. May contain any characters except `,` and `"`. | Optional | `Anhui` | +| owners | List of channel owners separated by `;`. May contain any characters except `,` and `"`. | Optional | `China Central Television` | +| country | Country code from which the channel is transmitted. A list of all supported countries and their codes can be found in [data/countries.csv](data/countries.csv) | Required | `CN` | +| subdivision | Code of the subdivision (e.g., provinces or states) from which the broadcast is transmitted. A list of all supported subdivisions and their codes can be found in [data/subdivisions.csv](data/subdivisions.csv). | Optional | `CN-AH` | +| city | The name of the city in English from which the channel is broadcast. May contain any characters except `,` and `"`. | Optional | `Hefei` | +| broadcast_area | List of codes describing the broadcasting area of the channel separated by `;`. Any combination of `r/`, `c/`, `s/`. | Required | `c/CN;r/ASIA` | +| languages | List of languages in which the channel is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](data/languages.csv). | Required | `zho;eng` | +| categories | List of categories to which this channel belongs separated by `;`. A list of all supported categories can be found in [data/categories.csv](data/categories.csv). | Optional | `animation;kids` | +| is_nsfw | Indicates whether the channel broadcasts adult content (`TRUE` or `FALSE`). | Required | `FALSE` | +| launched | Launch date of the channel (`YYYY-MM-DD`). | Optional | `2016-07-28` | +| closed | Date on which the channel closed (`YYYY-MM-DD`). | Optional | `2020-05-31` | +| replaced_by | The ID of the channel that this channel was replaced by. | Optional | `CCTV1.cn` | +| website | Official website URL. | Optional | `http://www.ahtv.cn/` | | logo | Logo URL. Only URL with [HTTPS](https://ru.wikipedia.org/wiki/HTTPS) protocol are allowed. Supported image types: `PNG`, `JPEG`. Max size: 512x512 pixels. The link should not be [geo-blocked](https://en.wikipedia.org/wiki/Geo-blocking). May contain any characters except `,` and `"`. | Required | `https://example.com/logo.png` | ### categories From 0b10a31a3cc0121b0f02fa4cf25429cb11892adf Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 29 Jan 2025 05:45:34 +0300 Subject: [PATCH 4/5] Upgrade eslint package --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- yarn.lock | 18 +++++++++--------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1a2e9abf..5a03aa22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "chalk": "^4.1.2", "commander": "^9.0.0", "csvtojson": "^2.0.10", - "eslint": "^9.18.0", + "eslint": "^9.19.0", "eslint-config-prettier": "^9.0.0", "fs-extra": "^11.2.0", "globals": "^15.13.0", @@ -1135,9 +1135,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz", - "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==", + "version": "9.19.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz", + "integrity": "sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } @@ -3085,16 +3085,16 @@ } }, "node_modules/eslint": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz", - "integrity": "sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA==", + "version": "9.19.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.19.0.tgz", + "integrity": "sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA==", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.19.0", "@eslint/core": "^0.10.0", "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.18.0", + "@eslint/js": "9.19.0", "@eslint/plugin-kit": "^0.2.5", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -6831,9 +6831,9 @@ } }, "@eslint/js": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz", - "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==" + "version": "9.19.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz", + "integrity": "sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==" }, "@eslint/object-schema": { "version": "2.1.5", @@ -8265,16 +8265,16 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz", - "integrity": "sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA==", + "version": "9.19.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.19.0.tgz", + "integrity": "sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA==", "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.19.0", "@eslint/core": "^0.10.0", "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.18.0", + "@eslint/js": "9.19.0", "@eslint/plugin-kit": "^0.2.5", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", diff --git a/package.json b/package.json index 2e284597..593ea260 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "chalk": "^4.1.2", "commander": "^9.0.0", "csvtojson": "^2.0.10", - "eslint": "^9.18.0", + "eslint": "^9.19.0", "eslint-config-prettier": "^9.0.0", "fs-extra": "^11.2.0", "globals": "^15.13.0", diff --git a/yarn.lock b/yarn.lock index b05cc960..4d2c1598 100644 --- a/yarn.lock +++ b/yarn.lock @@ -357,10 +357,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@^9.16.0", "@eslint/js@9.18.0": - version "9.18.0" - resolved "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz" - integrity sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA== +"@eslint/js@^9.16.0", "@eslint/js@9.19.0": + version "9.19.0" + resolved "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz" + integrity sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ== "@eslint/object-schema@^2.1.5": version "2.1.5" @@ -1649,17 +1649,17 @@ eslint-visitor-keys@^4.2.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz" integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw== -"eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^8.57.0 || ^9.0.0", eslint@^9.18.0, eslint@>=7.0.0: - version "9.18.0" - resolved "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz" - integrity sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA== +"eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^8.57.0 || ^9.0.0", eslint@^9.19.0, eslint@>=7.0.0: + version "9.19.0" + resolved "https://registry.npmjs.org/eslint/-/eslint-9.19.0.tgz" + integrity sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.12.1" "@eslint/config-array" "^0.19.0" "@eslint/core" "^0.10.0" "@eslint/eslintrc" "^3.2.0" - "@eslint/js" "9.18.0" + "@eslint/js" "9.19.0" "@eslint/plugin-kit" "^0.2.5" "@humanfs/node" "^0.16.6" "@humanwhocodes/module-importer" "^1.0.1" From 63a82c4472239cfe966467e9a54c1d4537869c64 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 29 Jan 2025 05:46:05 +0300 Subject: [PATCH 5/5] Update tests/__data__ --- tests/__data__/expected/api/blocklist.json | 2 +- tests/__data__/expected/api/channels.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/__data__/expected/api/blocklist.json b/tests/__data__/expected/api/blocklist.json index 8a66ad1a..a65c17ce 100644 --- a/tests/__data__/expected/api/blocklist.json +++ b/tests/__data__/expected/api/blocklist.json @@ -1 +1 @@ -[{"channel":"AnimalPlanetAfrica.za","ref":"https://github.com/iptv-org/iptv/issues/1831"}] \ No newline at end of file +[{"channel":"AnimalPlanetAfrica.za","ref":"https://github.com/iptv-org/iptv/issues/1831"},{"channel":"BeijingSatelliteTV.cn","ref":"https://github.com/iptv-org/iptv/issues/1831"}] \ No newline at end of file diff --git a/tests/__data__/expected/api/channels.json b/tests/__data__/expected/api/channels.json index cfad2a47..0b513021 100644 --- a/tests/__data__/expected/api/channels.json +++ b/tests/__data__/expected/api/channels.json @@ -1 +1 @@ -[{"id":"002RadioTV.do","name":"002 Radio TV","alt_names":[],"network":null,"owners":[],"country":"DO","subdivision":null,"city":null,"broadcast_area":["c/DO"],"languages":["spa"],"categories":["general"],"is_nsfw":false,"launched":null,"closed":null,"replaced_by":null,"website":"https://www.002radio.com/","logo":"https://i.imgur.com/7oNe8xj.png"},{"id":"BeijingSatelliteTV.cn","name":"Beijing Satellite TV","alt_names":["北京卫视"],"network":null,"owners":[],"country":"CN","subdivision":null,"city":"Beijing","broadcast_area":["c/CN"],"languages":["zho"],"categories":["general"],"is_nsfw":false,"launched":"1979-05-16","closed":null,"replaced_by":null,"website":"https://www.brtn.cn/btv/","logo":"https://i.imgur.com/vsktAez.png"},{"id":"M5.hu","name":"M5","alt_names":[],"network":null,"owners":[],"country":"HU","subdivision":null,"city":null,"broadcast_area":["c/HU"],"languages":["hun"],"categories":["auto"],"is_nsfw":true,"launched":null,"closed":"2001-01-01","replaced_by":null,"website":"https://www.mediaklikk.hu/m5/","logo":"https://i.imgur.com/y21wFd0.png"}] \ No newline at end of file +[{"id":"002RadioTV.do","name":"002 Radio TV","alt_names":[],"network":null,"owners":[],"country":"DO","subdivision":null,"city":null,"broadcast_area":["c/DO"],"languages":["spa"],"categories":["general"],"is_nsfw":false,"launched":null,"closed":null,"replaced_by":null,"website":"https://www.002radio.com/","logo":"https://i.imgur.com/7oNe8xj.png"},{"id":"BeijingSatelliteTV.cn","name":"Beijing Satellite TV","alt_names":["北京卫视"],"network":null,"owners":[],"country":"CN","subdivision":null,"city":"Beijing","broadcast_area":["c/CN"],"languages":["zho"],"categories":["general"],"is_nsfw":false,"launched":"1979-05-16","closed":null,"replaced_by":null,"website":"https://www.brtn.cn/btv/","logo":"https://i.imgur.com/vsktAez.png"},{"id":"M5.hu","name":"M5","alt_names":[],"network":null,"owners":[],"country":"HU","subdivision":null,"city":null,"broadcast_area":["c/HU"],"languages":["hun"],"categories":["auto"],"is_nsfw":true,"launched":null,"closed":"2001-01-01","replaced_by":"BeijingSatelliteTV.cn","website":"https://www.mediaklikk.hu/m5/","logo":"https://i.imgur.com/y21wFd0.png"}] \ No newline at end of file