Skip to content

Commit

Permalink
Merge pull request #15615 from iptv-org/patch-2025.01.2
Browse files Browse the repository at this point in the history 
Patch 2025.01.2
  • Loading branch information
@PopeyeTheSai10r
PopeyeTheSai10r authored Jan 30, 2025
2 parents 1fcf1ef + 63a82c4 commit 2a9bd56
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 46 deletions.
36 changes: 18 additions & 18 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, <code>\|</code>, `¡`, `–`. | 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/<region_code>`, `c/<country_code>`, `s/<subdivision_code>`. | 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`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, <code>\|</code>, `¡`. | 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/<region_code>`, `c/<country_code>`, `s/<subdivision_code>`. | 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
Expand Down
2 changes: 1 addition & 1 deletion data/channels.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16543,7 +16543,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
Expand Down
30 changes: 15 additions & 15 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions scripts/schemes/channels.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion tests/__data__/expected/api/blocklist.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"channel":"AnimalPlanetAfrica.za","ref":"https://github.com/iptv-org/iptv/issues/1831"}]
[{"channel":"AnimalPlanetAfrica.za","ref":"https://github.com/iptv-org/iptv/issues/1831"},{"channel":"BeijingSatelliteTV.cn","ref":"https://github.com/iptv-org/iptv/issues/1831"}]
Loading

0 comments on commit 2a9bd56

Please sign in to comment.