Merge pull request #822 from iptv-org/patch-2022.10.2

Patch 2022.10.2
This commit is contained in:
Aleksandr Statciuk 2022-10-19 00:35:05 +03:00 committed by GitHub
commit 832afc1d8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 1051 additions and 1050 deletions

View file

@ -12,15 +12,15 @@ body:
- type: input
attributes:
label: Channel Name
description: Official channel name in English
description: Official channel name in English or call sign. May include: `a-z`, `0-9`, `space`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, `(`, `)`
placeholder: 'Anhui TV'
validations:
required: true
- type: input
attributes:
label: Native Name (optional)
description: Channel name in the original language. Used when different from `name`. May contain any characters except `,` and `"`
label: Alternative Names (optional)
description: List of alternative channel names separated by `;`. May contain any characters except `,` and `"`
placeholder: '安徽卫视'
- type: input

View file

@ -20,13 +20,13 @@ body:
- type: input
attributes:
label: Channel Name
description: Official channel name in English
description: Official channel name in English or call sign. May include: `a-z`, `0-9`, `space`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, `(`, `)`
placeholder: 'Anhui TV'
- type: input
attributes:
label: Native Name
description: Channel name in the original language. Used when different from `name`. May contain any characters except `,` and `"`
label: Alternative Names (optional)
description: List of alternative channel names separated by `;`. May contain any characters except `,` and `"`
placeholder: '安徽卫视'
- type: input

Binary file not shown.

Before

Width:  |  Height:  |  Size: 280 KiB

After

Width:  |  Height:  |  Size: 494 KiB

View file

@ -22,8 +22,8 @@
| 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. May include: `a-z`, `à-ÿ`, `0-9`, `space`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`, `(`, `)`. | Required | `Anhui TV` |
| native_name | Channel name in the original language. Used when different from `name`. May contain any characters except `,` and `"`. | Optional | `安徽卫视` |
| 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 | `安徽卫视` |
| 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` |

File diff suppressed because it is too large Load diff

View file

@ -14,21 +14,21 @@ const csv2jsonOptions = {
delimiter: ',',
eol: '\r\n',
colParser: {
countries: listParser,
languages: listParser,
categories: listParser,
broadcast_area: listParser,
is_nsfw: boolParser,
logo: nullable,
subdivision: nullable,
city: nullable,
alt_names: listParser,
network: nullable,
owners: listParser,
subdivision: nullable,
city: nullable,
broadcast_area: listParser,
languages: listParser,
categories: listParser,
is_nsfw: boolParser,
launched: nullable,
closed: nullable,
replaced_by: nullable,
website: nullable,
native_name: nullable,
replaced_by: nullable
logo: nullable,
countries: listParser
}
}

View file

@ -6,12 +6,13 @@ module.exports = {
.regex(/^[A-Za-z0-9]+\.[a-z]{2}$/)
.required(),
name: Joi.string()
.regex(/^[\sa-z\u00C0-\u00FF0-9-čâộăšİ!:&.+'/»#%°$@?()¡]+$/i)
.regex(/^[a-z0-9-!:&.+'/»#%°$@?()\s]+$/i)
.required(),
native_name: Joi.string()
.regex(/^[^",]+$/)
.invalid(Joi.ref('name'))
.allow(null),
alt_names: Joi.array().items(
Joi.string()
.regex(/^[^",]+$/)
.invalid(Joi.ref('name'))
),
network: Joi.string()
.regex(/^[^",]+$/)
.allow(null),