Merge branch 'master' into update-tvprofil.com

.github/workflows/check.yml

@@ -3,6 +3,8 @@ on:
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, edited]
+    branches:
+      - master
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -16,7 +18,6 @@ jobs:
       - uses: tj-actions/changed-files@v45
         id: files
         with:
-          since_last_remote_commit: true
           files_yaml: |
             js:
               - tests/**/*.{js,ts}

.husky/check_channels.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+channels_changed="$(git diff --staged --name-only --diff-filter=ACMR -- 'sites/**/*.channels.xml' | sed 's| |\\ |g')"
+
+if [ ! -z "$channels_changed" ]; then
+    echo "npx eslint $channels_changed"
+    npm run channels:lint -- $channels_changed
+fi

.husky/check_scripts.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+scripts_changed="$(git diff --staged --name-only --diff-filter=ACMR -- 'tests/**/*.ts' 'tests/**/*.js' 'scripts/**/*.ts' 'scripts/**/*.mts' 'scripts/**/*.js' 'sites/**/*.js' 'sites/**/*.ts' | sed 's| |\\ |g')"
+
+if [ ! -z "$scripts_changed" ]; then
+    echo "npx eslint $scripts_changed"
+    npx eslint $scripts_changed
+fi

.husky/pre-commit

@@ -1,2 +1,2 @@
-npm run lint
-npm run channels:lint
+.husky/check_scripts.sh
+.husky/check_channels.sh

SITES.md

@@ -14,6 +14,9 @@
     <tr><td><a href="sites/allente.se">allente.se</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/andorradifusio.ad">andorradifusio.ad</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/anteltv.com.uy">anteltv.com.uy</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/antennaeurope.gr">antennaeurope.gr</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/antennapacific.gr">antennapacific.gr</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/antennasatellite.gr">antennasatellite.gr</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/arianaafgtv.com">arianaafgtv.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/arianatelevision.com">arianatelevision.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/arirang.com">arirang.com</a></td><td>🟢</td><td></td></tr>
@@ -25,7 +28,7 @@
     <tr><td><a href="sites/cablego.com.pe">cablego.com.pe</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/cableplus.com.uy">cableplus.com.uy</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/canalplus-haiti.com">canalplus-haiti.com</a></td><td>🔴</td><td>https://github.com/iptv-org/epg/issues/2237</td></tr>
-    <tr><td><a href="sites/canalplus.com">canalplus.com</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/canalplus.com">canalplus.com</a></td><td>🟡</td><td>https://github.com/iptv-org/epg/issues/2629</td></tr>
     <tr><td><a href="sites/cgates.lt">cgates.lt</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/chada.ma">chada.ma</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/chaines-tv.orange.fr">chaines-tv.orange.fr</a></td><td>🟢</td><td></td></tr>
@@ -35,6 +38,7 @@
     <tr><td><a href="sites/cubmu.com">cubmu.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/cyta.com.cy">cyta.com.cy</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/dens.tv">dens.tv</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/digea.gr">digea.gr</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/digiturk.com.tr">digiturk.com.tr</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/directv.com">directv.com</a></td><td>🔴</td><td>https://github.com/iptv-org/epg/issues/2284</td></tr>
     <tr><td><a href="sites/directv.com.ar">directv.com.ar</a></td><td>🔴</td><td>https://github.com/iptv-org/epg/issues/2339</td></tr>
@@ -59,6 +63,7 @@
     <tr><td><a href="sites/gatotv.com">gatotv.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/getafteritmedia.com">getafteritmedia.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/gigatv.3bbtv.co.th">gigatv.3bbtv.co.th</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/guiadetv.com">guiadetv.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/guida.tv">guida.tv</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/guidatv.sky.it">guidatv.sky.it</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/horizon.tv">horizon.tv</a></td><td>🟢</td><td></td></tr>
@@ -69,6 +74,7 @@
     <tr><td><a href="sites/indihometv.com">indihometv.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/ionplustv.com">ionplustv.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/ipko.tv">ipko.tv</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/jiotv.com">jiotv.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/kan.org.il">kan.org.il</a></td><td>🔴</td><td>https://github.com/iptv-org/epg/issues/2273</td></tr>
     <tr><td><a href="sites/knr.gl">knr.gl</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/kplus.vn">kplus.vn</a></td><td>🔴</td><td>https://github.com/iptv-org/epg/issues/2240</td></tr>
@@ -108,6 +114,7 @@
     <tr><td><a href="sites/nuevosiglo.com.uy">nuevosiglo.com.uy</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/nzxmltv.com">nzxmltv.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/ontvtonight.com">ontvtonight.com</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/opto.sic.pt">opto.sic.pt</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/orangetv.orange.es">orangetv.orange.es</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/osn.com">osn.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/pbsguam.org">pbsguam.org</a></td><td>🟢</td><td></td></tr>
@@ -157,6 +164,7 @@
     <tr><td><a href="sites/teliatv.ee">teliatv.ee</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/telkussa.fi">telkussa.fi</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/telsu.fi">telsu.fi</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/thesportplus.com">thesportplus.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tivie.id">tivie.id</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tivu.tv">tivu.tv</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/toonamiaftermath.com">toonamiaftermath.com</a></td><td>🟢</td><td></td></tr>
@@ -190,19 +198,21 @@
     <tr><td><a href="sites/tvhebdo.com">tvhebdo.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tvheute.at">tvheute.at</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tvim.tv">tvim.tv</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/tvinsider.com">tvinsider.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tvireland.ie">tvireland.ie</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tvmi.mt">tvmi.mt</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tvmusor.hu">tvmusor.hu</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tvmustra.hu">tvmustra.hu</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tvpassport.com">tvpassport.com</a></td><td>🟡</td><td>https://github.com/iptv-org/epg/issues/2272</td></tr>
     <tr><td><a href="sites/tvplus.com.tr">tvplus.com.tr</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/tvprofil.com">tvprofil.com</a></td><td>🟡</td><td>https://github.com/iptv-org/epg/issues/2399</td></tr>
-    <tr><td><a href="sites/tvtv.us">tvtv.us</a></td><td>🟡</td><td>https://github.com/iptv-org/epg/issues/2176</td></tr>
+    <tr><td><a href="sites/tvtv.us">tvtv.us</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/v3.myafn.dodmedia.osd.mil">v3.myafn.dodmedia.osd.mil</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/vidio.com">vidio.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/virginmediatelevision.ie">virginmediatelevision.ie</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/virgintvgo.virginmedia.com">virgintvgo.virginmedia.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/visionplus.id">visionplus.id</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/vivoplay.com.br">vivoplay.com.br</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/vtm.be">vtm.be</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/walesi.com.fj">walesi.com.fj</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/watch.sportsnet.ca">watch.sportsnet.ca</a></td><td>🟢</td><td></td></tr>
@@ -213,6 +223,7 @@
     <tr><td><a href="sites/winplay.co">winplay.co</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/worldfishingnetwork.com">worldfishingnetwork.com</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/www3.nhk.or.jp">www3.nhk.or.jp</a></td><td>🟢</td><td></td></tr>
+    <tr><td><a href="sites/xem.kplus.vn">xem.kplus.vn</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/xumo.tv">xumo.tv</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/zap.co.ao">zap.co.ao</a></td><td>🟢</td><td></td></tr>
     <tr><td><a href="sites/ziggogo.tv">ziggogo.tv</a></td><td>🟢</td><td></td></tr>

scripts/commands/channels/lint.mts

@@ -14,13 +14,34 @@ const xsd = `<?xml version="1.0" encoding="UTF-8"?>
   </xs:element>
   <xs:element name="channel">
     <xs:complexType mixed="true">
-      <xs:attribute name="site" use="required" type="xs:string"/>
-      <xs:attribute name="lang" use="required" type="xs:string"/>
-      <xs:attribute name="site_id" use="required" type="xs:string"/>
+      <xs:attribute use="required" ref="site"/>
+      <xs:attribute use="required" ref="lang"/>
+      <xs:attribute use="required" ref="site_id"/>
       <xs:attribute name="xmltv_id" use="required" type="xs:string"/>
       <xs:attribute name="logo" type="xs:string"/>
     </xs:complexType>
   </xs:element>
+  <xs:attribute name="site">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="site_id">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="lang">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:minLength value="1"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
 </xs:schema>`
 
 program.argument('[filepath]', 'Path to *.channels.xml files to check').parse(process.argv)

sites/artonline.tv/artonline.tv.channels.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="artonline.tv" lang="ar" xmltv_id="ARTAflam1.sa" site_id="">افلام 1</channel>
-  <channel site="artonline.tv" lang="ar" xmltv_id="ARTAflam2.sa" site_id="Aflam2">افلام 2</channel>
-  <channel site="artonline.tv" lang="ar" xmltv_id="ARTCinema.sa" site_id="Cinema">سينما</channel>
-  <channel site="artonline.tv" lang="ar" xmltv_id="ARTHekayat.sa" site_id="Hekayat">حكايات</channel>
-  <channel site="artonline.tv" lang="ar" xmltv_id="ARTHekayat2.sa" site_id="Hekayat2">حكايات 2</channel>
+  <channel site="artonline.tv" lang="ar" xmltv_id="ARTAflam1.sa" site_id="#">افلام 1</channel>
+  <channel site="artonline.tv" lang="ar" xmltv_id="ARTAflam2.sa" site_id="#Aflam2">افلام 2</channel>
+  <channel site="artonline.tv" lang="ar" xmltv_id="ARTCinema.sa" site_id="#Cinema">سينما</channel>
+  <channel site="artonline.tv" lang="ar" xmltv_id="ARTHekayat.sa" site_id="#Hekayat">حكايات</channel>
+  <channel site="artonline.tv" lang="ar" xmltv_id="ARTHekayat2.sa" site_id="#Hekayat2">حكايات 2</channel>
 </channels>

sites/artonline.tv/artonline.tv.config.js

@@ -13,7 +13,9 @@ module.exports = {
   site: 'artonline.tv',
   days: 2,
   url: function ({ channel }) {
-    return `https://www.artonline.tv/Home/Tvlist${channel.site_id}`
+    const [, site_id] = channel.site_id.split('#')
+
+    return `https://www.artonline.tv/Home/Tvlist${site_id}`
   },
   request: {
     method: 'POST',

sites/artonline.tv/artonline.tv.test.js

@@ -6,7 +6,7 @@ dayjs.extend(customParseFormat)
 dayjs.extend(utc)
 
 const channel = {
-  site_id: 'Aflam2',
+  site_id: '#Aflam2',
   xmltv_id: 'ARTAflam2.sa'
 }
 

sites/berrymedia.co.kr/berrymedia.co.kr.channels.xml

@@ -3,7 +3,6 @@
   <channel site="berrymedia.co.kr" lang="ko" xmltv_id="BallTV.kr" site_id="6">BallTV</channel>
   <channel site="berrymedia.co.kr" lang="ko" xmltv_id="CookTV.kr" site_id="2">CookTV</channel>
   <channel site="berrymedia.co.kr" lang="ko" xmltv_id="GMTV.kr" site_id="4">GMTV</channel>
-  <channel site="berrymedia.co.kr" lang="ko" xmltv_id="GTV.kr" site_id="">GTV</channel>
   <channel site="berrymedia.co.kr" lang="ko" xmltv_id="LifeSportsTV.kr" site_id="3">생활체육TV</channel>
   <channel site="berrymedia.co.kr" lang="ko" xmltv_id="UHDDreamTV.kr" site_id="5">UHDDreamTV</channel>
 </channels>

sites/canalplus.com/canalplus.com.config.js

@@ -70,6 +70,7 @@ module.exports = {
       gn: 'cpafr/gn',
       gp: 'cpafr/gp',
       gw: 'cpafr/gw',
+      ht: 'cpant/ht',
       mf: 'cpant/mf',
       mg: 'cpafr/mg',
       ml: 'cpafr/ml',