From 195c6c5ebb65f3483349dac0a9a94099465b268b Mon Sep 17 00:00:00 2001 From: "iptv-bot[bot]" <84861620+iptv-bot[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 00:55:58 +0000 Subject: [PATCH 1/4] [Bot] Update SITES.md Committed by [iptv-bot](https://github.com/apps/iptv-bot) via [update](https://github.com/iptv-org/epg/actions/runs/12898888371) workflow. --- SITES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SITES.md b/SITES.md index 619235de..25429c7a 100644 --- a/SITES.md +++ b/SITES.md @@ -82,7 +82,6 @@ m.tving.com🟢 magticom.ge🟢 mako.co.il🟢 - maxtv.hrvatskitelekom.hr🔴https://github.com/iptv-org/epg/issues/2509 maxtvgo.mk🟢 mediagenie.co.kr🟢 mediaklikk.hu🟢 @@ -94,10 +93,11 @@ mi.tv🟢 mncvision.id🟢 moji.id🟢 + mojmaxtv.hrvatskitelekom.hr🟢 mon-programme-tv.be🟢 movistarplus.es🟢 mtel.ba🟢 - mts.rs🔴https://github.com/iptv-org/epg/issues/2637 + mts.rs🟢 mujtvprogram.cz🟢 musor.tv🟢 mysky.com.ph🟢 From 7f39511ed069ebf4338f7b60f1a4e4816511b516 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:25:13 +0300 Subject: [PATCH 2/4] Update tests/__data__ --- tests/__data__/expected/custom_guide.xml | 17 +++++++++++++++++ tests/__data__/expected/guide.xml | 4 ++-- tests/__data__/expected/guide.xml.gz | Bin 311 -> 385 bytes tests/__data__/expected/guide2.xml | 2 +- .../expected/guides/en/example.com.xml | 2 +- .../input/epg-grab/custom.channels.xml | 4 ++-- .../sites/example.com/example.com.channels.xml | 2 +- tests/__data__/input/temp/data/channels.json | 4 +++- 8 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 tests/__data__/expected/custom_guide.xml diff --git a/tests/__data__/expected/custom_guide.xml b/tests/__data__/expected/custom_guide.xml new file mode 100644 index 00000000..41efdac8 --- /dev/null +++ b/tests/__data__/expected/custom_guide.xml @@ -0,0 +1,17 @@ + +Custom Channel 1https://example.com +Channel 1https://example2.com +Custom Channel 2https://example.com +Channel 3https://example2.com +Channel 4https://example2.com +Program1 (example.com) +Programme1 (example.com) +Programme1 (example2.com) +Program1 (example.com) +Programme1 (example.com) +Programme1 (example2.com) +Program1 (example2.com) +Program1 (example2.com) +Program1 (example2.com) +Program1 (example2.com) + \ No newline at end of file diff --git a/tests/__data__/expected/guide.xml b/tests/__data__/expected/guide.xml index 242bc2ff..3de58428 100644 --- a/tests/__data__/expected/guide.xml +++ b/tests/__data__/expected/guide.xml @@ -1,8 +1,8 @@ Channel 1https://example.com Channel 1https://example2.com -Channel 2https://example.com -Channel 3https://example2.com +Channel 2https://example.com +Channel 3https://example2.com Channel 4https://example2.com Program1 (example.com) Programme1 (example.com) diff --git a/tests/__data__/expected/guide.xml.gz b/tests/__data__/expected/guide.xml.gz index 036c0841e8c552c9547db0f7f30aca24dd6fa9ad..e634dcdf7b1f693a63ccb139fc729a853a952c6f 100644 GIT binary patch literal 385 zcmV-{0e=1;iwFP!000006U~!fOT#b}#oqg_&rO;IdA0KXd=MW5Y8pfbx zfoG6lLSjrX%nuJ}F=ASC2}GH}tFLn$)gI=w6y8eq-qTF+eA)srMc?je?PNX*!TL*t z_=G7dc~lrhQPZGkI(|n=WPK^pB1M*^L}4`WuE^j_P((siwQKaytGd_M_%^b-f~cbd zNefo;GgfV-VP*6tUWDSMV3BbZYAV}Qs4z+y?NJ}~Q`A2q1MawfA~-&4f&Yc6X$yVY zAwTO(<(N_&_`qD4t!#XO(*$D-PBF$90w0WB=ndk9-gMgXss#}w2a+{kgKL=IeJRD@ zcp4lW+fXml*V+s5%GxU=l>kG+!+lT>Ab3J4oQL`khZ8wW!E`;e|uRxK(OR2G@ukg z=8$4a38onG>nm1lgtbxwRp#({zbDDoL(WR&Yb`z&Rv5{92@r;UoU^Udd=o`tGda=It>}mqjryr{#3_yYscgh5n_yMDYVCwE68Ioo_^u3j#94|l z26ye!w# Channel 1https://example.com -Channel 2https://example.com +Channel 2https://example.com Program1 (example.com) Programme1 (example.com) Program1 (example.com) diff --git a/tests/__data__/expected/guides/en/example.com.xml b/tests/__data__/expected/guides/en/example.com.xml index 2d958ef6..f3550b8c 100644 --- a/tests/__data__/expected/guides/en/example.com.xml +++ b/tests/__data__/expected/guides/en/example.com.xml @@ -1,6 +1,6 @@ Channel 1https://example.com -Channel 2https://example.com +Channel 2https://example.com Program1 (example.com) Program1 (example.com) \ No newline at end of file diff --git a/tests/__data__/input/epg-grab/custom.channels.xml b/tests/__data__/input/epg-grab/custom.channels.xml index f32419c6..9b78a7ae 100644 --- a/tests/__data__/input/epg-grab/custom.channels.xml +++ b/tests/__data__/input/epg-grab/custom.channels.xml @@ -1,7 +1,7 @@ - Channel 1 - Channel 2 + Custom Channel 1 + Custom Channel 2 Channel 1 Channel 3 Channel 4 diff --git a/tests/__data__/input/epg-grab/sites/example.com/example.com.channels.xml b/tests/__data__/input/epg-grab/sites/example.com/example.com.channels.xml index 7f81064b..1b037f02 100644 --- a/tests/__data__/input/epg-grab/sites/example.com/example.com.channels.xml +++ b/tests/__data__/input/epg-grab/sites/example.com/example.com.channels.xml @@ -1,6 +1,6 @@ Channel 1 - Channel 2 + Channel 2 Channel 1 \ No newline at end of file diff --git a/tests/__data__/input/temp/data/channels.json b/tests/__data__/input/temp/data/channels.json index 28255c4a..4ff2f615 100644 --- a/tests/__data__/input/temp/data/channels.json +++ b/tests/__data__/input/temp/data/channels.json @@ -70,5 +70,7 @@ "categories": [], "is_nsfw": false, "logo": "https://www.directv.com/images/logos/channels/dark/large/579.png" - } + }, + {"id":"Channel2.us","name":"Channel 2 [API]","alt_names":[],"network":null,"owners":[],"country":"UK","subdivision":null,"city":null,"broadcast_area":["c/US"],"languages":["eng"],"categories":[],"is_nsfw":false,"launched":null,"closed":null,"replaced_by":null,"website":"","logo":"https://i.imgur.com/rPzH88J.png"}, + {"id":"Channel3.us","name":"Channel 3 [API]","alt_names":[],"network":null,"owners":[],"country":"UK","subdivision":null,"city":null,"broadcast_area":["c/US"],"languages":["eng"],"categories":[],"is_nsfw":false,"launched":null,"closed":null,"replaced_by":null,"website":"","logo":"https://upload.wikimedia.org/wikipedia/commons/6/64/6%27eren_2015.png"} ] \ No newline at end of file From de2d1600124d383ad271cd320acb759f903a44e4 Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:25:38 +0300 Subject: [PATCH 3/4] Update grab.test.ts --- tests/commands/epg/grab.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/commands/epg/grab.test.ts b/tests/commands/epg/grab.test.ts index d580f265..8d40f16f 100644 --- a/tests/commands/epg/grab.test.ts +++ b/tests/commands/epg/grab.test.ts @@ -86,7 +86,7 @@ describe('epg:grab', () => { if (process.env.DEBUG === 'true') console.log(cmd, stdout) expect(content('tests/__data__/output/guide.xml')).toEqual( - content('tests/__data__/expected/guide.xml') + content('tests/__data__/expected/custom_guide.xml') ) }) From 384f64e37b1c4bcfac8715ee3b94e35d787aca4b Mon Sep 17 00:00:00 2001 From: freearhey <7253922+freearhey@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:26:06 +0300 Subject: [PATCH 4/4] Update queueCreator.ts --- scripts/core/queueCreator.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/core/queueCreator.ts b/scripts/core/queueCreator.ts index 2816f57f..1a906f9d 100644 --- a/scripts/core/queueCreator.ts +++ b/scripts/core/queueCreator.ts @@ -43,12 +43,14 @@ export class QueueCreator { const config: SiteConfig = await this.configLoader.load(configPath) if (channel.xmltv_id) { - const found: ApiChannel = channels.first( - (_channel: ApiChannel) => _channel.id === channel.xmltv_id - ) - if (found) { - channel.icon = found.logo - channel.name = found.name + if (!channel.icon) { + const found: ApiChannel = channels.first( + (_channel: ApiChannel) => _channel.id === channel.xmltv_id + ) + + if (found) { + channel.icon = found.logo + } } } else { channel.xmltv_id = channel.site_id