Merge branch 'master' into LaneSh4d0w-clean

4 years ago · d275fecae3
parent 8db134545f 1c5d601dba
commit d275fecae3
15 changed files with 6440 additions and 512 deletions
--- a/.github/workflows/clean.yml
+++ b/.github/workflows/clean.yml
@ -17,8 +17,9 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          branch: 'bot/remove-broken-links'
-  test:
+  check:
    runs-on: ubuntu-latest
+    needs: create-branch
    continue-on-error: true
    strategy:
      fail-fast: false
@ -193,6 +194,8 @@ jobs:
        uses: actions/checkout@v2
        with:
          ref: bot/remove-broken-links
+      - name: Setup FFmpeg
+        uses: FedericoCarboni/setup-ffmpeg@v1
      - name: Install Dependencies
        run: npm install
      - name: Remove Broken Links
@ -204,7 +207,7 @@ jobs:
          path: channels/${{ matrix.country }}.m3u
  commit-changes:
    runs-on: ubuntu-latest
-    needs: test
+    needs: check
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@ -215,13 +218,14 @@ jobs:
      - name: Commit Changes
        uses: stefanzweifel/git-auto-commit-action@v4
        with:
-          commit_message: '[Bot] Update playlists'
+          commit_message: '[Bot] Remove broken links'
          commit_user_name: iptv-bot
          commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com
          commit_author: 'iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>'
          branch: bot/remove-broken-links
          file_pattern: channels/*
  pull-request:
+    if: ${{ github.ref == 'refs/heads/master' }}
    runs-on: ubuntu-latest
    needs: commit-changes
    steps:
@ -244,9 +248,9 @@ jobs:
          pr_body: |
            This pull request is created by [clean][1] workflow. 

-            The script checks each link and removes only those that return a HTTP 404 code (Not Found). Also, the script ignores links with labels `[Geo-blocked]` and `[Not 24/7]` in the title.
+            The script checks all links except those with labels `[Geo-blocked]`, `[Offline]` or `[Not 24/7]` in the title.

-            **IMPORTANT:** Before merging all links should be checked manually to make sure that the response from the server has not changed. Working links should be marked as `[Not 24/7]` so that next time the script will not delete them.
+            **IMPORTANT:** Before merging all links should be checked manually to make sure that the response from the server has not changed. If the link works for you but occasionally return an HTTP code 403 (Forbidden) then it should be marked as `[Geo-blocked]`. If the link does not work but has no alternative, you can mark it as `[Offline]` to save it in the playlist along with a description. Working links should be marked as `[Not 24/7]` so that the script will skip them next time.

            [1]: https://github.com/iptv-org/iptv/actions/runs/${{ github.run_id }}
          pr_draft: true
--- a/README.md
+++ b/README.md
@ -49,17 +49,17 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">Kids</td><td align="right">213</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/kids.m3u</code></td></tr>
 		<tr><td align="left">Legislative</td><td align="right">61</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/legislative.m3u</code></td></tr>
 		<tr><td align="left">Lifestyle</td><td align="right">94</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/lifestyle.m3u</code></td></tr>
-		<tr><td align="left">Local</td><td align="right">541</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/local.m3u</code></td></tr>
+		<tr><td align="left">Local</td><td align="right">543</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/local.m3u</code></td></tr>
 		<tr><td align="left">Movies</td><td align="right">277</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/movies.m3u</code></td></tr>
-		<tr><td align="left">Music</td><td align="right">408</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/music.m3u</code></td></tr>
+		<tr><td align="left">Music</td><td align="right">410</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/music.m3u</code></td></tr>
 		<tr><td align="left">News</td><td align="right">491</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/news.m3u</code></td></tr>
 		<tr><td align="left">Outdoor</td><td align="right">52</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/outdoor.m3u</code></td></tr>
 		<tr><td align="left">Relax</td><td align="right">19</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/relax.m3u</code></td></tr>
-		<tr><td align="left">Religious</td><td align="right">286</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/religious.m3u</code></td></tr>
+		<tr><td align="left">Religious</td><td align="right">287</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/religious.m3u</code></td></tr>
 		<tr><td align="left">Series</td><td align="right">233</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/series.m3u</code></td></tr>
 		<tr><td align="left">Science</td><td align="right">16</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/science.m3u</code></td></tr>
 		<tr><td align="left">Shop</td><td align="right">48</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/shop.m3u</code></td></tr>
-		<tr><td align="left">Sports</td><td align="right">285</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/sports.m3u</code></td></tr>
+		<tr><td align="left">Sports</td><td align="right">287</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/sports.m3u</code></td></tr>
 		<tr><td align="left">Travel</td><td align="right">28</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/travel.m3u</code></td></tr>
 		<tr><td align="left">Weather</td><td align="right">19</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/weather.m3u</code></td></tr>
 		<tr><td align="left">XXX</td><td align="right">59</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/xxx.m3u</code></td></tr>
@ -84,7 +84,7 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">Akan</td><td align="right">2</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/aka.m3u</code></td></tr>
 		<tr><td align="left">Albanian</td><td align="right">17</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/sqi.m3u</code></td></tr>
 		<tr><td align="left">Amharic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/amh.m3u</code></td></tr>
-		<tr><td align="left">Arabic</td><td align="right">405</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ara.m3u</code></td></tr>
+		<tr><td align="left">Arabic</td><td align="right">413</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ara.m3u</code></td></tr>
 		<tr><td align="left">Armenian</td><td align="right">28</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/hye.m3u</code></td></tr>
 		<tr><td align="left">Assyrian Neo-Aramaic</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/aii.m3u</code></td></tr>
 		<tr><td align="left">Azerbaijani</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/aze.m3u</code></td></tr>
@ -99,11 +99,11 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">Czech</td><td align="right">21</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ces.m3u</code></td></tr>
 		<tr><td align="left">Danish</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/dan.m3u</code></td></tr>
 		<tr><td align="left">Dutch</td><td align="right">60</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/nld.m3u</code></td></tr>
-		<tr><td align="left">English</td><td align="right">2437</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/eng.m3u</code></td></tr>
+		<tr><td align="left">English</td><td align="right">2439</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/eng.m3u</code></td></tr>
 		<tr><td align="left">Estonian</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/est.m3u</code></td></tr>
 		<tr><td align="left">Faroese</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fao.m3u</code></td></tr>
 		<tr><td align="left">Finnish</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fin.m3u</code></td></tr>
-		<tr><td align="left">French</td><td align="right">193</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fra.m3u</code></td></tr>
+		<tr><td align="left">French</td><td align="right">194</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fra.m3u</code></td></tr>
 		<tr><td align="left">Galician</td><td align="right">9</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/glg.m3u</code></td></tr>
 		<tr><td align="left">Georgian</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kat.m3u</code></td></tr>
 		<tr><td align="left">German</td><td align="right">206</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/deu.m3u</code></td></tr>
@ -114,7 +114,7 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">Indonesian</td><td align="right">85</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ind.m3u</code></td></tr>
 		<tr><td align="left">Inuktitut</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/iku.m3u</code></td></tr>
 		<tr><td align="left">Italian</td><td align="right">136</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ita.m3u</code></td></tr>
-		<tr><td align="left">Japanese</td><td align="right">27</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/jpn.m3u</code></td></tr>
+		<tr><td align="left">Japanese</td><td align="right">26</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/jpn.m3u</code></td></tr>
 		<tr><td align="left">Javanese</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/jav.m3u</code></td></tr>
 		<tr><td align="left">Kannada</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kan.m3u</code></td></tr>
 		<tr><td align="left">Kazakh</td><td align="right">13</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/kaz.m3u</code></td></tr>
@ -150,7 +150,7 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">Slovak</td><td align="right">26</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/slk.m3u</code></td></tr>
 		<tr><td align="left">Slovenian</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/slv.m3u</code></td></tr>
 		<tr><td align="left">Somali</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/som.m3u</code></td></tr>
-		<tr><td align="left">Spanish</td><td align="right">623</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/spa.m3u</code></td></tr>
+		<tr><td align="left">Spanish</td><td align="right">626</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/spa.m3u</code></td></tr>
 		<tr><td align="left">Sundanese</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/sun.m3u</code></td></tr>
 		<tr><td align="left">Swedish</td><td align="right">11</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/swe.m3u</code></td></tr>
 		<tr><td align="left">Tagalog</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/tgl.m3u</code></td></tr>
@ -162,10 +162,10 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">Ukrainian</td><td align="right">63</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/ukr.m3u</code></td></tr>
 		<tr><td align="left">Urdu</td><td align="right">17</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/urd.m3u</code></td></tr>
 		<tr><td align="left">Uzbek</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/uzb.m3u</code></td></tr>
-		<tr><td align="left">Vietnamese</td><td align="right">68</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/vie.m3u</code></td></tr>
+		<tr><td align="left">Vietnamese</td><td align="right">69</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/vie.m3u</code></td></tr>
 		<tr><td align="left">Western Frisian</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fry.m3u</code></td></tr>
 		<tr><td align="left">Yue Chinese</td><td align="right">10</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/yue.m3u</code></td></tr>
-		<tr><td align="left">Undefined</td><td align="right">2695</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code></td></tr>
+		<tr><td align="left">Undefined</td><td align="right">2688</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code></td></tr>
 	</tbody>
 </table>

@ -247,7 +247,7 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">🇫🇴&nbsp;Faroe Islands</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fo.m3u</code></td></tr>
 		<tr><td align="left">🇫🇯&nbsp;Fiji</td><td align="right">4</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fj.m3u</code></td></tr>
 		<tr><td align="left">🇫🇮&nbsp;Finland</td><td align="right">10</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fi.m3u</code></td></tr>
-		<tr><td align="left">🇫🇷&nbsp;France</td><td align="right">218</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fr.m3u</code></td></tr>
+		<tr><td align="left">🇫🇷&nbsp;France</td><td align="right">219</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/fr.m3u</code></td></tr>
 		<tr><td align="left">🇬🇫&nbsp;French Guiana</td><td align="right">23</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/gf.m3u</code></td></tr>
 		<tr><td align="left">🇵🇫&nbsp;French Polynesia</td><td align="right">4</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pf.m3u</code></td></tr>
 		<tr><td align="left">🇹🇫&nbsp;French Southern Territories</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tf.m3u</code></td></tr>
@ -276,13 +276,13 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">🇮🇱&nbsp;Israel</td><td align="right">22</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/il.m3u</code></td></tr>
 		<tr><td align="left">🇮🇹&nbsp;Italy</td><td align="right">309</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/it.m3u</code></td></tr>
 		<tr><td align="left">🇯🇲&nbsp;Jamaica</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/jm.m3u</code></td></tr>
-		<tr><td align="left">🇯🇵&nbsp;Japan</td><td align="right">42</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/jp.m3u</code></td></tr>
+		<tr><td align="left">🇯🇵&nbsp;Japan</td><td align="right">41</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/jp.m3u</code></td></tr>
 		<tr><td align="left">🇯🇴&nbsp;Jordan</td><td align="right">56</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/jo.m3u</code></td></tr>
 		<tr><td align="left">🇰🇿&nbsp;Kazakhstan</td><td align="right">31</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kz.m3u</code></td></tr>
 		<tr><td align="left">🇰🇪&nbsp;Kenya</td><td align="right">15</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ke.m3u</code></td></tr>
 		<tr><td align="left">🇰🇮&nbsp;Kiribati</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ki.m3u</code></td></tr>
 		<tr><td align="left">🇽🇰&nbsp;Kosovo</td><td align="right">14</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/xk.m3u</code></td></tr>
-		<tr><td align="left">🇰🇼&nbsp;Kuwait</td><td align="right">73</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kw.m3u</code></td></tr>
+		<tr><td align="left">🇰🇼&nbsp;Kuwait</td><td align="right">75</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kw.m3u</code></td></tr>
 		<tr><td align="left">🇰🇬&nbsp;Kyrgyzstan</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/kg.m3u</code></td></tr>
 		<tr><td align="left">🇱🇦&nbsp;Laos</td><td align="right">6</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/la.m3u</code></td></tr>
 		<tr><td align="left">🇱🇻&nbsp;Latvia</td><td align="right">9</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/lv.m3u</code></td></tr>
@ -336,7 +336,7 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">🇵🇦&nbsp;Panama</td><td align="right">35</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pa.m3u</code></td></tr>
 		<tr><td align="left">🇵🇬&nbsp;Papua New Guinea</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pg.m3u</code></td></tr>
 		<tr><td align="left">🇵🇾&nbsp;Paraguay</td><td align="right">33</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/py.m3u</code></td></tr>
-		<tr><td align="left">🇵🇪&nbsp;Peru</td><td align="right">104</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pe.m3u</code></td></tr>
+		<tr><td align="left">🇵🇪&nbsp;Peru</td><td align="right">107</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pe.m3u</code></td></tr>
 		<tr><td align="left">🇵🇭&nbsp;Philippines</td><td align="right">20</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ph.m3u</code></td></tr>
 		<tr><td align="left">🇵🇳&nbsp;Pitcairn Islands</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pn.m3u</code></td></tr>
 		<tr><td align="left">🇵🇱&nbsp;Poland</td><td align="right">45</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/pl.m3u</code></td></tr>
@ -349,7 +349,7 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">🇷🇪&nbsp;Réunion</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/re.m3u</code></td></tr>
 		<tr><td align="left">🇼🇸&nbsp;Samoa</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ws.m3u</code></td></tr>
 		<tr><td align="left">🇸🇲&nbsp;San Marino</td><td align="right">6</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sm.m3u</code></td></tr>
-		<tr><td align="left">🇸🇦&nbsp;Saudi Arabia</td><td align="right">103</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sa.m3u</code></td></tr>
+		<tr><td align="left">🇸🇦&nbsp;Saudi Arabia</td><td align="right">96</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sa.m3u</code></td></tr>
 		<tr><td align="left">🇸🇳&nbsp;Senegal</td><td align="right">5</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sn.m3u</code></td></tr>
 		<tr><td align="left">🇷🇸&nbsp;Serbia</td><td align="right">29</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/rs.m3u</code></td></tr>
 		<tr><td align="left">🇸🇨&nbsp;Seychelles</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/sc.m3u</code></td></tr>
@ -374,14 +374,14 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">🇸🇹&nbsp;São Tomé & Príncipe</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/st.m3u</code></td></tr>
 		<tr><td align="left">🇹🇼&nbsp;Taiwan</td><td align="right">77</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tw.m3u</code></td></tr>
 		<tr><td align="left">🇹🇯&nbsp;Tajikistan</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tj.m3u</code></td></tr>
-		<tr><td align="left">🇹🇿&nbsp;Tanzania</td><td align="right">5</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tz.m3u</code></td></tr>
+		<tr><td align="left">🇹🇿&nbsp;Tanzania</td><td align="right">7</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tz.m3u</code></td></tr>
 		<tr><td align="left">🇹🇭&nbsp;Thailand</td><td align="right">65</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/th.m3u</code></td></tr>
 		<tr><td align="left">🇹🇱&nbsp;Timor-Leste</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tl.m3u</code></td></tr>
 		<tr><td align="left">🇹🇬&nbsp;Togo</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tg.m3u</code></td></tr>
 		<tr><td align="left">🇹🇰&nbsp;Tokelau</td><td align="right">4</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tk.m3u</code></td></tr>
 		<tr><td align="left">🇹🇴&nbsp;Tonga</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/to.m3u</code></td></tr>
 		<tr><td align="left">🇹🇹&nbsp;Trinidad & Tobago</td><td align="right">1</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tt.m3u</code></td></tr>
-		<tr><td align="left">🇹🇳&nbsp;Tunisia</td><td align="right">50</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tn.m3u</code></td></tr>
+		<tr><td align="left">🇹🇳&nbsp;Tunisia</td><td align="right">54</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tn.m3u</code></td></tr>
 		<tr><td align="left">🇹🇷&nbsp;Turkey</td><td align="right">245</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tr.m3u</code></td></tr>
 		<tr><td align="left">🇹🇲&nbsp;Turkmenistan</td><td align="right">16</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tm.m3u</code></td></tr>
 		<tr><td align="left">🇹🇻&nbsp;Tuvalu</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tv.m3u</code></td></tr>
@ -389,8 +389,8 @@ Or select one of the playlists from the list below.
 		<tr><td align="left">🇺🇬&nbsp;Uganda</td><td align="right">6</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ug.m3u</code></td></tr>
 		<tr><td align="left">🇺🇦&nbsp;Ukraine</td><td align="right">116</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ua.m3u</code></td></tr>
 		<tr><td align="left">🇦🇪&nbsp;United Arab Emirates</td><td align="right">88</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/ae.m3u</code></td></tr>
-		<tr><td align="left">🇬🇧&nbsp;United Kingdom</td><td align="right">225</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/uk.m3u</code></td></tr>
-		<tr><td align="left">🇺🇸&nbsp;United States</td><td align="right">2267</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/us.m3u</code></td></tr>
+		<tr><td align="left">🇬🇧&nbsp;United Kingdom</td><td align="right">229</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/uk.m3u</code></td></tr>
+		<tr><td align="left">🇺🇸&nbsp;United States</td><td align="right">2266</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/us.m3u</code></td></tr>
 		<tr><td align="left">🇺🇾&nbsp;Uruguay</td><td align="right">27</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/uy.m3u</code></td></tr>
 		<tr><td align="left">🇺🇿&nbsp;Uzbekistan</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/uz.m3u</code></td></tr>
 		<tr><td align="left">🇻🇺&nbsp;Vanuatu</td><td align="right">3</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/vu.m3u</code></td></tr>
--- a/channels/fr.m3u
+++ b/channels/fr.m3u
@ -351,6 +351,8 @@ https://lci-hls-live-ssl.tf1.fr/lci/1/hls/live_2328.m3u8
 https://alchimie-luxe-1-fr.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="LuxeTV.fr" tvg-name="Luxe TV" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/8tWhfap.png" group-title="",Luxe TV (720p)
 https://alchimie-luxe-2-gb.samsung.wurl.com/manifest/playlist.m3u8
+#EXTINF:-1 tvg-id="M6.fr" tvg-name="M6" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="",M6 (720p)
+https://s6.tntendirect.com/france5/live/playlist.m3u8
 #EXTINF:-1 tvg-id="M6International.fr" tvg-name="M6 International" tvg-country="FR;AD;BE;LU;MC;CH" tvg-language="French" tvg-logo="https://static.epg.best/fr/M6.fr.png" group-title="",M6 International (1080p)
 https://shls-m6-int-prod-dub.shahid.net/out/v1/587631773e55495a8aa3dd4050318f6e/index.m3u8
 #EXTINF:-1 tvg-id="MagellanTV.fr" tvg-name="Magellan TV" tvg-country="FR" tvg-language="French" tvg-logo="https://i.imgur.com/6osyvwh.png" group-title="",Magellan TV (720p)
@ -501,5 +503,3 @@ https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.
 https://linkastream.co/headless?url=https://www.dailymotion.com/video/x63085w
 #EXTINF:-1 tvg-id="WéoNordPasdeCalais.fr" tvg-name="Wéo (Picardie)" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="Local",Wéo (Picardie)
 https://query-streamlink.lanesh4d0w.repl.co/iptv-query?streaming-ip=https://www.dailymotion.com/video/x63085w
-#EXTINF:-1 tvg-id="M6.fr" tvg-name="M6" tvg-country="FR" tvg-language="French" tvg-logo="" group-title="",M6 (720p)
-https://s6.tntendirect.com/france5/live/playlist.m3u8
--- a/channels/kw.m3u
+++ b/channels/kw.m3u
@ -31,16 +31,16 @@ https://stream02.fasttelco.net/live/alrai.stream/chunklist.m3u8
 https://stream02.fasttelco.net/live/alrai.stream/chunklist_w2023460738.m3u8
 #EXTINF:-1 tvg-id="AlRaiTV.kw" tvg-name="AlRai TV" tvg-country="KW" tvg-language="" tvg-logo="" group-title="",AlRai TV
 https://stream02.fasttelco.net/live/alrai.stream/chunklist_w498917617.m3u8?v=2957056943
+#EXTINF:-1 tvg-id="ATV.kw" tvg-name="ATV" tvg-country="KW" tvg-language="Arabic" tvg-logo="" group-title="",ATV (360p)
+https://gulfsat.cdn.easybroadcast.fr/live/Aladalah_abr/playlist.m3u8
 #EXTINF:-1 tvg-id="atv.kw" tvg-name="atv" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://www.atvkuwait.com/img/logo/atv_logo.png" group-title="",atv
 rtmp://168.187.49.14:1935/live//atv?v=
 #EXTINF:-1 tvg-id="Ch4Teen.kw" tvg-name="Ch4Teen" tvg-country="KW" tvg-language="" tvg-logo="" group-title="",Ch4Teen
 https://dcunilive93-lh.akamaihd.net/i/dclive_1@835787/index_150_av-p.m3u8
 #EXTINF:-1 tvg-id="Ch4Teen.kw" tvg-name="Ch4Teen" tvg-country="KW" tvg-language="Arabic" tvg-logo="https://i.imgur.com/JeG9K1y.png" group-title="",Ch4Teen (480p)
 https://dcunilive93-lh.akamaihd.net/i/dclive_1@835787/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="KW" tvg-language="Arabic" tvg-logo="" group-title="",Funoon
+#EXTINF:-1 tvg-id="Funoon.kw" tvg-name="Funoon" tvg-country="KW" tvg-language="Arabic" tvg-logo="" group-title="",Funoon (360p)
 https://gulfsat.cdn.easybroadcast.fr/live/FunoonHd_abr/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="KW" tvg-language="Arabic" tvg-logo="" group-title="",ATV
-https://gulfsat.cdn.easybroadcast.fr/live/Aladalah_abr/playlist.m3u8
 #EXTINF:-1 tvg-id="KTV 1 ARB" tvg-name="KTV 1 ARB" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://www.freeetv.com/images/03_logo/KTV1_Kuwait.jpg" group-title="",KTV 1 (1080p)
 https://hiplayer.hibridcdn.net/t/kwmedia-kwtv1.m3u8
 #EXTINF:-1 tvg-id="KTV 2 ARB" tvg-name="KTV 2 ARB" tvg-country="KW" tvg-language="Arabic" tvg-logo="http://www.freeetv.com/images/03_logo/ktv2_Kuwait.jpg" group-title="",KTV 2 (1080p)
--- a/channels/ml.m3u
+++ b/channels/ml.m3u
@ -1 +1,3 @@
 #EXTM3U
+#EXTINF:-1 tvg-id="ORTM1.ml" tvg-name="ORTM1" tvg-country="ML" tvg-language="" tvg-logo="" group-title="",ORTM1 (576p)
+http://51.210.1.13:18000/ortm/hls/playlist.m3u8
--- a/channels/pe.m3u
+++ b/channels/pe.m3u
@ -13,6 +13,12 @@ https://tv.siete.us/bestcablesports/bestcablesports/index.m3u8
 https://video1.getstreamhosting.com:1936/8106/8106/playlist.m3u8
 #EXTINF:-1 tvg-id="BHTV.pe" tvg-name="BHTV" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/7hP4nps.png" group-title="General",BHTV (720p)
 http://cdn1.ujjina.com:1935/iptvbhtv/livebhtvtv/playlist.m3u8
+#EXTINF:-1 tvg-id="CNBellezaAndina.pe" tvg-name="Cable Network Belleza Andina TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="" group-title="Music",Cable Network Belleza Andina TV (720p) [Not 24/7]
+https://tv.siete.us/bellezaandina/index.m3u8
+#EXTINF:-1 tvg-id="CNCumbia.pe" tvg-name="Cable Network Cumbia TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="" group-title="Music",Cable Network Cumbia TV (720p) [Not 24/7]
+https://tv.siete.us/cumbiatv/index.m3u8
+#EXTINF:-1 tvg-id="CNTV.pe" tvg-name="Cable Network TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="" group-title="Local",Cable Network TV (720p) [Not 24/7]
+https://tv.siete.us/cntv/index.m3u8
 #EXTINF:-1 tvg-id="CajamarcaTV.pe" tvg-name="Cajamarca TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/CajamarcaTV/picture?width=320&height=320" group-title="Local",Cajamarca TV (480p) [Not 24/7]
 https://tv.siete.us/cajamarcatv/cajamarcatv/index.m3u8
 #EXTINF:-1 tvg-id="CANALIPE.pe" tvg-name="CANAL IPE" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/2/28/Identidad_Peruana_ipe_2020.png/1200px-Identidad_Peruana_ipe_2020.png" group-title="Family",CANAL IPE [Not 24/7]
@ -21,12 +27,6 @@ https://cdnh8.iblups.com/hls/OVJNKV4pSr.m3u8
 https://5c3fb01839654.streamlock.net:1963/iptvcentraltv/livecentraltvtv/playlist.m3u8
 #EXTINF:-1 tvg-id="ChicosIPe.pe" tvg-name="Chicos IPe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/FI1Hd4E.png" group-title="Family",Chicos IPe [Not 24/7]
 http://cdnh4.iblups.com/hls/OVJNKV4pSr.m3u8
-#EXTINF:-1 tvg-id="CNTV.pe" tvg-name="Cable Network TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="" group-title="Local",Cable Network TV [Not 24/7]
-https://tv.siete.us/cntv/index.m3u8
-#EXTINF:-1 tvg-id="CNCumbia.pe" tvg-name="Cable Network Cumbia TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="" group-title="Music",Cable Network Cumbia TV [Not 24/7]
-https://tv.siete.us/cumbiatv/index.m3u8
-#EXTINF:-1 tvg-id="CNBellezaAndina.pe" tvg-name="Cable Network Belleza Andina TV" tvg-country="PE" tvg-language="Spanish" tvg-logo="" group-title="Music",Cable Network Belleza Andina TV [Not 24/7]
-https://tv.siete.us/bellezaandina/index.m3u8
 #EXTINF:-1 tvg-id="CRTelevisionMoyobamba.pe" tvg-name="CR Television (Moyobamba)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/crtvmoyobamba/picture?width=320&height=320" group-title="Local",CR Television (Moyobamba) (720p) [Not 24/7]
 https://live.obslivestream.com:1936/crtv/ngrp:crtv_all/playlist.m3u8
 #EXTINF:-1 tvg-id="Cultura24tv.pe" tvg-name="Cultura 24" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2mSwwpH.png" group-title="Culture",Cultura 24 (720p)
@ -51,7 +51,7 @@ https://dc1.webstream.eu/hls/hls/jnetvhdstreaming_high/index.m3u8
 https://cu.onliv3.com/livevd/user1.m3u8
 #EXTINF:-1 tvg-id="KaribenaTV.pe" tvg-name="Karibeña TV" tvg-country="PE" tvg-language="" tvg-logo="https://i.imgur.com/a8yMvcV.png" group-title="Music",Karibeña TV
 https://cu.onliv3.com/livevd/user1_hd720/index.m3u8
-#EXTINF:-1 tvg-id="Latina.pe" tvg-name="Latina" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/Latina.pe/picture?width=320&height=320" group-title="",Latina
+#EXTINF:-1 tvg-id="Latina.pe" tvg-name="Latina" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/Latina.pe/picture?width=320&height=320" group-title="",Latina (720p)
 https://mdstrm.com/live-stream-playlist/5ce7109c7398b977dc0744cd.m3u8
 #EXTINF:-1 tvg-id="MasterTVTarapoto.pe" tvg-name="Master TV (Tarapoto)" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/169404973238869/picture?width=320&height=320" group-title="Local",Master TV (Tarapoto) (480p) [Not 24/7]
 https://tv.oyotunstream.com/master/master/playlist.m3u8
--- a/channels/ps.m3u
+++ b/channels/ps.m3u
@ -37,7 +37,7 @@ https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/palestinian_satellite_ch
 https://live.paltoday.tv/paltv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="palestiniantv.ps" tvg-name="palestiniantv" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="",palestiniantv (720p)
 http://palestiniantv.origin.technostreaming.net:8081/palestiniantv_source/live/playlist.m3u8
-#EXTINF:-1 tvg-id="RadioAlbaladTV.ps" tvg-name="Radio Albalad TV" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="",Radio Albalad TV
+#EXTINF:-1 tvg-id="RadioAlbaladTV.ps" tvg-name="Radio Albalad TV" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="",Radio Albalad TV (1080p)
 http://streaming.zaytonatube.com:8080/radioalbalad/radioalbalad/playlist.m3u8
 #EXTINF:-1 tvg-id="RajeenTV.ps" tvg-name="Rajeen TV" tvg-country="PS" tvg-language="Arabic" tvg-logo="" group-title="",Rajeen TV (1080p)
 https://mn-nl.mncdn.com/palabroad/live/playlist.m3u8
--- a/channels/sa.m3u
+++ b/channels/sa.m3u
@ -11,12 +11,12 @@ https://mn-nl.mncdn.com/khalij/khalij/playlist.m3u8
 http://45.92.69.131:8001/play/a00f
 #EXTINF:-1 tvg-id="AlQuranAlKareemTV.sa" tvg-name="Al Quran Al Kareem TV" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/zmVCXIK.png" group-title="Religious",Al Quran Al Kareem TV (Mecca) (720p)
 http://m.live.net.sa:1935/live/quran/playlist.m3u8
+#EXTINF:-1 tvg-id="AlQuranAlKareemTV.sa" tvg-name="Al Quran Al Kareem TV" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/0aMNwQa.png" group-title="Religious",Al Quran Al Kareem TV (Mecca)
+https://5b18be6964c2f.streamlock.net:1935/live/_definst_/quran/playlist.m3u8
 #EXTINF:-1 tvg-id="AlQuranAlKareemTV.sa" tvg-name="Al Quran Al Kareem TV" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/zmVCXIK.png" group-title="Religious",Al Quran Al Kareem TV (Mecca) (360p)
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/saudi_quran/hls1/saudi_quran.m3u8
 #EXTINF:-1 tvg-id="AlQuranAlKareemTV.sa" tvg-name="Al Quran Al Kareem TV" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/0aMNwQa.png" group-title="Religious",Al Quran Al Kareem TV (Mecca) (1080p)
 https://iptv--iptv.repl.co/Arabic/Quran_TV/
-#EXTINF:-1 tvg-id="AlQuranAlKareemTV.sa" tvg-name="Al Quran Al Kareem TV" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/0aMNwQa.png" group-title="Religious",Al Quran Al Kareem TV (Mecca)
-https://5b18be6964c2f.streamlock.net:1935/live/_definst_/quran/playlist.m3u8
 #EXTINF:-1 tvg-id="AlSaudiya.sa" tvg-name="Al Saudiya" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/SMk1hAy.png" group-title="General",Al Saudiya (360p)
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/saudi_tv/hls1/saudi_tv.m3u8
 #EXTINF:-1 tvg-id="AlSaudiya.sa" tvg-name="Al Saudiya" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/MOiapKB.png" group-title="General",Al Saudiya (1080p)
@ -73,8 +73,6 @@ http://makkahtv.srfms.com:1935/makkahtv/livestream/chunklist_w1150651953.m3u8
 http://makkahtv.srfms.com:1935/makkahtv/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="MakkahTV.sa" tvg-name="Makkah TV" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/5p2yUBb.png" group-title="Religious",Makkah TV (480p)
 https://5ab29cc78f681.streamlock.net/makkahtv/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="MakkahTV.sa" tvg-name="Makkah TV" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://i.imgur.com/5p2yUBb.png" group-title="Religious",Makkah TV (480p)
-http://makkahtv.srfms.com:1935/makkahtv/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="PanoramaFM.sa" tvg-name="Panorama FM" tvg-country="SA" tvg-language="Arabic" tvg-logo="" group-title="Music",Panorama FM (1080p)
 https://shls-panoramafm-prod-dub.shahid.net/out/v1/66262e420d824475aaae794dc2d69f14/index.m3u8
 #EXTINF:-1 tvg-id="Rotana Cinema ARB" tvg-name="Rotana Cinema ARB" tvg-country="SA" tvg-language="Arabic" tvg-logo="https://rotana.net/assets/themes/TriTheme/images/channels/cinema.png" group-title="Movies",Rotana Cinema HD (1080p) [Geo-blocked]
--- a/channels/tn.m3u
+++ b/channels/tn.m3u
@ -1,8 +1,8 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="TN" tvg-language="Arabic" tvg-logo="" group-title="Arabic",El Hiwar El Tounsi (400p)
+#EXTINF:-1 tvg-id="ElHiwarElTounsi.tn" tvg-name="El Hiwar El Tounsi" tvg-country="TN" tvg-language="Arabic" tvg-logo="" group-title="",El Hiwar El Tounsi (400p)
 #EXTVLCOPT:http-user-agent=TNAgexpl212C
 http://217.182.137.206/elhiwar.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="TN" tvg-language="Arabic" tvg-logo="" group-title="Arabic",Hannibal (400p)
+#EXTINF:-1 tvg-id="Hannibal.tn" tvg-name="Hannibal" tvg-country="TN" tvg-language="Arabic" tvg-logo="" group-title="",Hannibal (400p)
 #EXTVLCOPT:http-user-agent=TNAgexpl212C
 http://217.182.137.206/hannibal.m3u8
 #EXTINF:-1 tvg-id="Nessma.tn" tvg-name="Nessma" tvg-country="TN" tvg-language="Arabic" tvg-logo="https://www.nessma.tv/images/logonessmamenu.png" group-title="",Nessma (720p)
@ -11,13 +11,13 @@ https://linkastream.co/headless?url=https://www.dailymotion.com/video/x7lmd4f
 http://142.44.214.231:1935/saheltv/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="TunisieImmobilierTV.tn" tvg-name="Tunisie Immobilier TV" tvg-country="TN" tvg-language="Arabic" tvg-logo="https://i.imgur.com/cZM2t0P.png" group-title="Travel",Tunisie Immobilier TV (720p)
 https://5ac31d8a4c9af.streamlock.net/tunimmob/myStream/playlist.m3u8
+#EXTINF:-1 tvg-id="Watania1.tn" tvg-name="Watania 1" tvg-country="TN" tvg-language="Arabic" tvg-logo="Arabic" group-title="",Watania 1 (400p)
+#EXTVLCOPT:http-user-agent=TNAgexpl212C
+http://217.182.137.206/tunisie1.m3u8
 #EXTINF:-1 tvg-id="Watania1.tn" tvg-name="Watania 1" tvg-country="TN" tvg-language="Arabic" tvg-logo="" group-title="",Watania 1 (1080p)
 https://linkastream.co/headless?url=https://www.youtube.com/channel/UCdvWVsmQBROkgcGzVep73oA/live
-#EXTINF:-1 tvg-id="Watania1.tn" tvg-name="Watania 1" tvg-country="TN" tvg-language="Arabic" tvg-logo="Arabic" group-title="Arabic",Watania 1 (400p)
+#EXTINF:-1 tvg-id="Watania2.tn" tvg-name="Watania 2" tvg-country="TN" tvg-language="Arabic" tvg-logo="Arabic" group-title="",Watania 2 (400p)
 #EXTVLCOPT:http-user-agent=TNAgexpl212C
-http://217.182.137.206/tunisie1.m3u8
+http://217.182.137.206/tunisie2.m3u8
 #EXTINF:-1 tvg-id="Watania2.tn" tvg-name="Watania 2" tvg-country="TN" tvg-language="Arabic" tvg-logo="" group-title="",Watania 2 (480p)
 https://linkastream.co/headless?url=https://www.youtube.com/channel/UCJW9gatYczI191TunQxMGbA/live
-#EXTINF:-1 tvg-id="Watania2.tn" tvg-name="Watania 2" tvg-country="TN" tvg-language="Arabic" tvg-logo="Arabic" group-title="Arabic",Watania 2 (400p)
-#EXTVLCOPT:http-user-agent=TNAgexpl212C
-http://217.182.137.206/tunisie2.m3u8
--- a/channels/uk.m3u
+++ b/channels/uk.m3u
@ -1,13 +1,13 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="4Music.uk" tvg-name="4Music" tvg-country="UK" tvg-language="English" tvg-logo="https://d126oek9ze5bb6.cloudfront.net/uploads/2018/07/4Music_primary.png" group-title="Music",4Music (576p) [not 24/7]
 http://csm-e.tm.yospace.com/csm/extlive/boxplus01,4music-desktop.m3u8?yo.up=http://boxtv-origin-elb.cds1.yospace.com/uploads/4music/
-#EXTINF:-1 tvg-id="AfrobeatsAFR.uk" tvg-name="Afrobeats (AFR)" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/Iaey8k5.jpg" group-title="Music",Afrobeats (AFR)
+#EXTINF:-1 tvg-id="AfrobeatsAFR.uk" tvg-name="Afrobeats (AFR)" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/Iaey8k5.jpg" group-title="Music",Afrobeats (AFR) (720p)
 https://stream.ecable.tv/afrobeats/index.m3u8
 #EXTINF:-1 tvg-id="AhlulbaytTV.uk" tvg-name="Ahlulbayt TV" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/qLqHPhK.png" group-title="Religious",Ahlulbayt TV (404p)
 http://109.123.126.14:1935/live/livestream1.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="AhlulbaytTV.uk" tvg-name="Ahlulbayt TV" tvg-country="UK" tvg-language="English" tvg-logo="https://i.imgur.com/qLqHPhK.png" group-title="Religious",Ahlulbayt TV (404p)
 https://5f3e23ac71915.streamlock.net:4434/live/livestream1.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="Arabic" tvg-logo="https://www.ahwazna.net/uploads/2018/04/AhwaznaLogo.png" group-title="",Ahwazna
+#EXTINF:-1 tvg-id="Ahwazna.uk" tvg-name="Ahwazna" tvg-country="UK" tvg-language="Arabic" tvg-logo="https://www.ahwazna.net/uploads/2018/04/AhwaznaLogo.png" group-title="",Ahwazna
 https://linkastream.co/headless?url=https://www.twitch.tv/ahwaznach
 #EXTINF:-1 tvg-id="AkaalChannel.uk" tvg-name="Akaal Channel" tvg-country="UK" tvg-language="Punjabi;English" tvg-logo="https://i.imgur.com/62IpVDn.png" group-title="Religious",Akaal Channel (396p)
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/akaal_tv/hls1_smart_akaal/akaal_tv.m3u8
@ -95,16 +95,6 @@ https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_one_so
 https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_one_south_east/mobile_wifi_main_sd_abr_v2_akamai_hls_live_http.m3u8
 #EXTINF:-1 tvg-id="BBCOneSouthWest.uk" tvg-name="BBC One South West" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC One South West (540p) [Geo-Blocked]
 https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_one_south_west/mobile_wifi_main_sd_abr_v2_akamai_hls_live_http.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 1 (2160p) [Geo-Blocked] [Not 24/7]
-https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_01.mpd
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 2 (2160p) [Geo-Blocked] [Not 24/7]
-https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_02.mpd
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 3 (2160p) [Geo-Blocked] [Not 24/7]
-https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_03.mpd
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 4 (2160p) [Geo-Blocked] [Not 24/7]
-https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_04.mpd
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 5 (2160p) [Geo-Blocked] [Not 24/7]
-https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_05.mpd
 #EXTINF:-1 tvg-id="BBCOneWales.uk" tvg-name="BBC One Wales" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC One Wales (540p) [Geo-Blocked]
 https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_one_wales_hd/mobile_wifi_main_sd_abr_v2_akamai_hls_live_http.m3u8
 #EXTINF:-1 tvg-id="BBCOneWalesHD.uk" tvg-name="BBC One Wales HD" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC One Wales HD (720p) [Geo-Blocked]
@ -197,6 +187,16 @@ https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_two_no
 https://vs-hls-pushb-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_two_northern_ireland_hd/t=3840/v=pv14/b=5070016/main.m3u8
 #EXTINF:-1 tvg-id="BBCTwoWales.uk" tvg-name="BBC Two Wales" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC Two Wales (540p) [Geo-Blocked]
 https://vs-hls-push-uk-live.akamaized.net/x=3/i=urn:bbc:pips:service:bbc_two_wales_digital/mobile_wifi_main_sd_abr_v2_akamai_hls_live_http.m3u8
+#EXTINF:-1 tvg-id="BBCUHDTrial1.uk" tvg-name="BBC UHD Trial 1" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 1 (2160p) [Geo-Blocked] [Not 24/7]
+https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_01.mpd
+#EXTINF:-1 tvg-id="BBCUHDTrial2.uk" tvg-name="BBC UHD Trial 2" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 2 (2160p) [Geo-Blocked] [Not 24/7]
+https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_02.mpd
+#EXTINF:-1 tvg-id="BBCUHDTrial3.uk" tvg-name="BBC UHD Trial 3" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 3 (2160p) [Geo-Blocked] [Not 24/7]
+https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_03.mpd
+#EXTINF:-1 tvg-id="BBCUHDTrial4.uk" tvg-name="BBC UHD Trial 4" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 4 (2160p) [Geo-Blocked] [Not 24/7]
+https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_04.mpd
+#EXTINF:-1 tvg-id="BBCUHDTrial5.uk" tvg-name="BBC UHD Trial 5" tvg-country="UK" tvg-language="English" tvg-logo="" group-title="",BBC UHD Trial 5 (2160p) [Geo-Blocked] [Not 24/7]
+https://a.files.bbci.co.uk/media/live/manifesto/audio_video/webcast/dash/uk/full/ak/uhd_stream_05.mpd
 #EXTINF:-1 tvg-id="BBCWorldNews.uk" tvg-name="BBC World News" tvg-country="INT" tvg-language="English" tvg-logo="https://i.imgur.com/Nx0BRdV.png" group-title="News",BBC World News (576p)
 http://103.199.161.254/Content/bbcworld/Live/Channel(BBCworld)/index.m3u8
 #EXTINF:-1 tvg-id="BBCWorldNews.uk" tvg-name="BBC World News" tvg-country="UK" tvg-language="" tvg-logo="https://i.imgur.com/Nx0BRdV.png" group-title="News",BBC World News (480p)
--- a/channels/us.m3u
+++ b/channels/us.m3u
@ -58,6 +58,8 @@ https://livevideo01.abc10.com/hls/live/2014547/newscasts/live.m3u8
 https://livevideo01.whas11.com/hls/live/2016284/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="WZZM.us" tvg-name="ABC 13 Grand Rapids MI (WZZM)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/eapvJpP.jpg" group-title="Local",ABC 13 Grand Rapids MI (WZZM) (1080p)
 https://livevideo01.wzzm13.com/hls/live/2016280/newscasts/live.m3u8
+#EXTINF:-1 tvg-id="KTNV.us" tvg-name="ABC 13 Las Vegas NV (KTNV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QbkW7zY.png" group-title="Local",ABC 13 Las Vegas NV (KTNV) (720p)
+https://content.uplynk.com/channel/39919d3f7a074eefa8bf579214e952f9.m3u8
 #EXTINF:-1 tvg-id="WVEC.us" tvg-name="ABC 13 Norfolk VA (WVEC)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/P5PtUcR.jpg" group-title="Local",ABC 13 Norfolk VA (WVEC) (1080p)
 https://livevideo01.13newsnow.com/hls/live/2014545/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="KNXVTV.us" tvg-name="ABC 15 Phoenix AZ (KNXV-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/9/99/KNXV_Logo.png" group-title="Local",ABC 15 Phoenix AZ (KNXV-TV) (720p)
@ -749,6 +751,8 @@ https://livevideo01.kens5.com/hls/live/2016281/newscasts/live.m3u8
 https://content.uplynk.com/channel/bba3e7da884a49bba96341ecf5128f0f.m3u8
 #EXTINF:-1 tvg-id="WHIO.us" tvg-name="CBS 7 Dayton OH (WHIO)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/n38ZKuE.png" group-title="Local",CBS 7 Dayton OH (WHIO)
 https://svc-lvanvato-cxtv-whio.cmgvideo.com/whio/2596k/index.m3u8
+#EXTINF:-1 tvg-id="KIROTV.us" tvg-name="CBS 7 Seattle WA (KIRO-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://mediaweb.kirotv.com/photo/2018/09/24/kiro7_header_logo_152x60_13118164_ver1.0.png" group-title="Local",CBS 7 Seattle WA (KIRO-TV)
+https://svc-lvanvato-cxtv-kiro.cmgvideo.com/kiro/1864k/index.m3u8
 #EXTINF:-1 tvg-id="KFMBTV.us" tvg-name="CBS 8 San Diego CA (KFMB-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QJyt4n4.jpg" group-title="Local",CBS 8 San Diego CA (KFMB-TV) (1080p)
 https://livevideo01.cbs8.com/hls/live/2014967/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="KCALTV.us" tvg-name="CBS 9 Los Angeles CA (KCAL-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/Q8IwOiL.jpg" group-title="Local",CBS 9 Los Angeles CA (KCAL-TV) (720p)
@ -799,8 +803,8 @@ http://156.142.85.152/live/WIFI-2096k-1080p/WIFI-2096k-1080p.m3u8
 https://playout4multirtmp.tulix.tv/live8/Stream1/playlist.m3u8
 #EXTINF:-1 tvg-id="CerritosTV3.us" tvg-name="Cerritos TV3" tvg-country="US" tvg-language="English" tvg-logo="https://live-tv-channels.org/pt-data/uploads/logo/us-cerritos-tv3.jpg" group-title="Local",Cerritos TV3 (360p)
 https://granicusliveus4-a.akamaihd.net/cerritos/G0010_002/playlist.m3u8
-#EXTINF:-1 tvg-id="CGTV.us" tvg-name="City of Champaign IL (CGTV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/hNdQFtK.jpg" group-title="Legislative",City of Champaign IL (CGTV)
-https://reflect-live-champaign.cablecast.tv/live/CELL-296k-234p/CELL-296k-234p.m3u8
+#EXTINF:-1 tvg-id="CVTV.us" tvg-name="Channel 23 Clark Vancouver TV (CVTV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/VFPid91.png" group-title="Local",Channel 23 Clark Vancouver TV (CVTV) (1080p)
+https://wowzaprod3-i.akamaihd.net/hls/live/252233/15b8d438/playlist.m3u8
 #EXTINF:-1 tvg-id="Channel5.us" tvg-name="Channel 5 (Adult Swim 24/7 Stream)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/sCRPkPk.jpg" group-title="Entertainment",Channel 5 (Adult Swim 24/7 Stream) (1080p) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/channel-5/stream.m3u8
 #EXTINF:-1 tvg-id="WFTV.us" tvg-name="Channel 9 Orlando FL (WFTV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/S3fqmWY.png" group-title="Local",Channel 9 Orlando FL (WFTV) (720p)
@ -914,6 +918,8 @@ https://circle-xumo.amagi.tv/playlist.m3u8
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxcircletv/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="Circle.us" tvg-name="Circle" tvg-country="US" tvg-language="English" tvg-logo="https://web.opendrive.com/api/v1/download/file.json/MF8yMjY2MjYwMTlf?inline=1" group-title="Entertainment",Circle (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-xumo-circle/CDN/master.m3u8
+#EXTINF:-1 tvg-id="CGTV.us" tvg-name="City of Champaign IL (CGTV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/hNdQFtK.jpg" group-title="Legislative",City of Champaign IL (CGTV)
+https://reflect-live-champaign.cablecast.tv/live/CELL-296k-234p/CELL-296k-234p.m3u8
 #EXTINF:-1 tvg-id="CivilizedBumblebee.us" tvg-name="Civilized (Bumblebee)" tvg-country="US" tvg-language="English" tvg-logo="https://media.unreel.me/prod/bumblebeetv/general/f260a87a-ab75-43f7-bafd-49f4143262b0" group-title="Lifestyle",Civilized (Bumblebee) (1080p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5c7e2531932c8368bdbfd87c/playlist.m3u8
 #EXTINF:-1 tvg-id="ClassicArtsShowcase" tvg-name="Classic Arts Showcase" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2LJzdu6.png" group-title="Classic",Classic Arts Showcase (720p)
@ -1094,12 +1100,10 @@ http://rtmp.ottdemo.rrsat.com/ctntv/ctntvmulti.smil/playlist.m3u8
 https://rrsatrtmp.tulix.tv/ctntv/ctntvmulti.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="WFGC.us" tvg-name="CTN 61 Riviera Beach FL (WFGC)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/UtaBUfH.png" group-title="Religious",CTN 61 Riviera Beach FL (WFGC) (720p)
 http://hls1.livestreamingcdn.com:1935/livecdn631/myStream.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="WNYEDT3.us" tvg-name="CUNYTV (WNYE-DT3)" tvg-country="US" tvg-language="English" tvg-logo="https://zap2it.tmsimg.com/sources/generic/generic_sources_h3.png" group-title="Local",CUNYTV (WNYE-DT3) (1080p)
+#EXTINF:-1 tvg-id="WNYEDT3.us" tvg-name="CUNY TV City University of New York NY (WNYE-DT3)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/6tCgsNc.jpg" group-title="Local",CUNY TV City University of New York NY (WNYE-DT3) (1080p)
 https://streams.the6tv.duckdns.org:2443/locals/NewYorkCity/wnye-dt3.m3u8
 #EXTINF:-1 tvg-id="CuteZoneBumblebee.us" tvg-name="Cute Zone (Bumblebee)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/unYHTWg.png" group-title="Kids",Cute Zone (Bumblebee) (720p)
 https://stitcheraws.unreel.me/wse-node02.powr.com/live/5bf22518d5eeee0f5a409486/playlist.m3u8
-#EXTINF:-1 tvg-id="CVTV.us" tvg-name="Channel 23 Clark Vancouver TV (CVTV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/VFPid91.png" group-title="Local",Channel 23 Clark Vancouver TV (CVTV) (1080p)
-https://wowzaprod3-i.akamaihd.net/hls/live/252233/15b8d438/playlist.m3u8
 #EXTINF:-1 tvg-id="CycleWorld.us" tvg-name="Cycle World" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/RZE3Pwf.png" group-title="Auto",Cycle World (720p)
 https://a.jsrdn.com/broadcast/3e5befe5dd/+0000/c.m3u8
 #EXTINF:-1 tvg-id="DallasCowboyCheerleaders.us" tvg-name="Dallas Cowboy Cheerleaders" tvg-country="US" tvg-language="English" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tv-plus/all-channels/08182020/Dallas%20Cowboys%20Cheer_190x190.png?raw=true" group-title="",Dallas Cowboy Cheerleaders
@ -1280,8 +1284,6 @@ http://k3.usastreams.com:1935/etvSD/etvSD/playlist.m3u8
 #EXTINF:-1 tvg-id="ESPN.us" tvg-name="ESPN" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GhhN8mW.png" group-title="Sports",ESPN (360p)
 http://stream.tvtap.live:8081/live/espnusahd.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="ESPN.us" tvg-name="ESPN" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GhhN8mW.png" group-title="Sports",ESPN (720p)
-http://stream2.grandma.fit/fs2.m3u8
-#EXTINF:-1 tvg-id="ESPN.us" tvg-name="ESPN" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/GhhN8mW.png" group-title="Sports",ESPN (720p)
 https://content.uplynk.com/channel/d0695f6fa2f143eb95c7a41d96d581c4.m3u8
 #EXTINF:-1 tvg-id="ESPN2.us" tvg-name="ESPN 2" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/CTgGetu.png" group-title="Sports",ESPN 2 (720p)
 http://164.68.124.111/espn2.m3u8
@ -1573,7 +1575,7 @@ https://bcsecurelivehls-i.akamaihd.net/hls/live/598043/4368278029001_1/onair/mas
 https://bozztv.com/teleyupp1/teleup-GgIpXe0CjT/playlist.m3u8
 #EXTINF:-1 tvg-id="KMSP.us" tvg-name="FOX 9 ST Paul Minneapolis MN (KMSP)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/WBgiaiB.jpg" group-title="News",FOX 9 ST Paul Minneapolis MN (KMSP) (720p)
 https://lnc-kmsp-fox-aws.tubi.video/index.m3u8
-#EXTINF:-1 tvg-id="FOXBusiness.us" tvg-name="FOX Business" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/61wD4dV.png" group-title="Business",FOX Business
+#EXTINF:-1 tvg-id="FOXBusiness.us" tvg-name="FOX Business" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/61wD4dV.png" group-title="Business",FOX Business [Offline]
 http://199.66.95.242:80/1/1172/index.m3u8?token=test
 #EXTINF:-1 tvg-id="FOXCrime.us" tvg-name="FOX Crime" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/LCDcM0F.png" group-title="",FOX Crime
 https://cdn1.mobiletv.bg/T10/fox_crime/fox_crime_794613_850k.m3u8
@ -2145,18 +2147,16 @@ https://usgeowall.sinclairstoryline.com/channel/1698bf57810a48c486b83d542bca298d
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=50
 #EXTINF:-1 tvg-id="KidzBop.us" tvg-name="Kidz Bop" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/19namZP.jpg" group-title="Kids",Kidz Bop (1080p)
 https://kidzbop-rokuus.amagi.tv/hls/amagi_hls_data_kidzbopAA-kidzbop-roku-us/CDN/playlist.m3u8
-#EXTINF:-1 tvg-id="KIROTV.us" tvg-name="CBS 7 Seattle WA (KIRO-TV)" tvg-country="US" tvg-language="English" tvg-logo="https://mediaweb.kirotv.com/photo/2018/09/24/kiro7_header_logo_152x60_13118164_ver1.0.png" group-title="Local",CBS 7 Seattle WA (KIRO-TV)
-https://svc-lvanvato-cxtv-kiro.cmgvideo.com/kiro/1864k/index.m3u8
 #EXTINF:-1 tvg-id="KitchenNightmaresSTIRR.us" tvg-name="Kitchen Nightmares (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://komonews.com/resources/media2/3x1/full/119/center/90/d3fa0a6c-3f76-46e0-b4d6-5039ee16f5a3-small3x1_stirr_1219_epg_kitchennightmares_1920x1080.png?cb=eccbc87e4b5ce2fe28308fd9f2a7baf3" group-title="Cooking",Kitchen Nightmares (STIRR) (720p)
 https://dai.google.com/linear/hls/event/23QIslh0TOqygKz-M9W29Q/master.m3u8
 #EXTINF:-1 tvg-id="KocowaClassic.us" tvg-name="Kocowa Classic" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/Px8a1JY.png" group-title="Classic",Kocowa Classic
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokukocowa/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="KOFYDT1.us" tvg-name="KOFY-DT1 San Francisco CA" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/20.1-KOFY.png" group-title="Local",KOFY-DT1 San Francisco CA (720p)
+https://streams.the6tv.duckdns.org:2443/locals/BayArea/kofy-dt1.m3u8
+#EXTINF:-1 tvg-id="KOFYDT1.us" tvg-name="KOFY-DT1 San Francisco CA" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/20.1-KOFY.png" group-title="Local",KOFY-DT1 San Francisco CA (720p)
 https://v-ca.mybtv.net/event/125/1280x720.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
 #EXTINF:-1 tvg-id="KOFYDT1.us" tvg-name="KOFY-DT1 San Francisco CA" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/20.1-KOFY.png" group-title="Local",KOFY-DT1 San Francisco CA (480i)
 https://v-ca.mybtv.net/event/125/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
-#EXTINF:-1 tvg-id="KOFYDT1.us" tvg-name="KOFY-DT1 San Francisco CA" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/20.1-KOFY.png" group-title="Local",KOFY-DT1 San Francisco CA (720p)
-https://streams.the6tv.duckdns.org:2443/locals/BayArea/kofy-dt1.m3u8
 #EXTINF:-1 tvg-id="KoolTV.us" tvg-name="Kool TV" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/aILvazd.jpg" group-title="Local",Kool TV (1080p)
 http://209.182.219.50:1935/roku/roku/playlist.m3u8
 #EXTINF:-1 tvg-id="KQSLDT1.us" tvg-name="KQSL 8 Fort Bragg-San Francisco CA (KQSL-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://media-usba.mybtv.net/logos/8.1.png" group-title="Local",KQSL 8 Fort Bragg-San Francisco CA (KQSL-DT1) (480i)
@ -2165,8 +2165,6 @@ https://v-ca.mybtv.net/event/740/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00
 https://bozztv.com/teleyupp1/teleup-N8qwnqgUq2/playlist.m3u8
 #EXTINF:-1 tvg-id="KTLA5.us" tvg-name="KTLA 5 Los Angeles CA" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/JH99Psi.jpg" group-title="Local",KTLA 5 Los Angeles CA (720p)
 https://content.uplynk.com/channel/6cbf2d32a5384dc1b787539b1102433c.m3u8
-#EXTINF:-1 tvg-id="KTVB.us" tvg-name="NBC 7 Boise ID (KTVB)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2sLPTiM.jpg" group-title="Local",NBC 7 Boise ID (KTVB) (1080p)
-https://livevideo01.ktvb.com/hls/live/2014542/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="KTVPLD.us" tvg-name="KTVP-LD 7 Phoenix AZ" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/U4bDHHt.png" group-title="Local",KTVP-LD 7 Phoenix AZ (480i)
 https://v-px.mybtv.net/event/726/768x432.m3u8?start_time=2021-05-16T23%3A45%3A00%2B00%3A00&end_time=2023-05-17T05%3A00%3A00%2B00%3A00&env=prd&uid=33630
 #EXTINF:-1 tvg-id="KUSIDT1.us" tvg-name="KUSI 51 San Diego CA (KUSI-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://yt3.ggpht.com/58o6dSeIv5j0byajnK95NeR_FPMY7G1QXXD1FBeV8z_pl4xJqgVz_YvEO0ZSJc1jdza4WJvNow" group-title="Local",KUSI 51 San Diego CA (KUSI-DT1) (720p)
@ -2187,8 +2185,6 @@ https://streams.the6tv.duckdns.org:2443/locals/Fresno/kmsg-43.9.m3u8
 https://granicusliveus3-a.akamaihd.net/lakehavasucity/G0643_002/playlist.m3u8
 #EXTINF:-1 tvg-id="LaoThaiUSTV.us" tvg-name="Lao-Thai US TV" tvg-country="VN" tvg-language="Vietnamese" tvg-logo="" group-title="",Lao-Thai US TV (720p)
 https://livefta.malimarcdn.com/ftaedge00/laothaius.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="KTNV.us" tvg-name="ABC 13 Las Vegas NV (KTNV)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QbkW7zY.png" group-title="Local",ABC 13 Las Vegas NV (KTNV) (720p)
-https://content.uplynk.com/channel/39919d3f7a074eefa8bf579214e952f9.m3u8
 #EXTINF:-1 tvg-id="LSOTL.us" tvg-name="Last Stream On The Left (Adult Swim 24/7 Stream)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/VsAKoN6.jpg" group-title="",Last Stream On The Left (Adult Swim 24/7 Stream) (1080p) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/lsotl/stream.m3u8
 #EXTINF:-1 tvg-id="LatidoMusic.us" tvg-name="Latido Music" tvg-country="US" tvg-language="Spanish" tvg-logo="https://i.imgur.com/p3n3CZP.jpg" group-title="Music",Latido Music (1080p)
@ -2748,6 +2744,8 @@ https://livevideo01.ksdk.com/hls/live/2014965/newscasts/live.m3u8
 https://livevideo01.kagstv.com/hls/live/2016283/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="KCEN.us" tvg-name="NBC 6 Waco TX (KCEN)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/l9T46o3.jpg" group-title="Local",NBC 6 Waco TX (KCEN) (1080p)
 https://livevideo01.kcentv.com/hls/live/2017155/newscasts/live.m3u8
+#EXTINF:-1 tvg-id="KTVB.us" tvg-name="NBC 7 Boise ID (KTVB)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2sLPTiM.jpg" group-title="Local",NBC 7 Boise ID (KTVB) (1080p)
+https://livevideo01.ktvb.com/hls/live/2014542/newscasts/live.m3u8
 #EXTINF:-1 tvg-id="KNSD.us" tvg-name="NBC 7 San Diego CA (KNSD-DT1)" tvg-country="US" tvg-language="English" tvg-logo="https://media.nbcsandiego.com/2021/04/San-Diego.png" group-title="Local",NBC 7 San Diego CA (KNSD-DT1) (1080p)
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/knsd-dt1.m3u8
 #EXTINF:-1 tvg-id="KGW.us" tvg-name="NBC 8 Portland OR (KGW)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/tekKgXi.jpg" group-title="Local",NBC 8 Portland OR (KGW) (1080p)
@ -6082,6 +6080,8 @@ http://147.174.13.196/live/WIFI-1296k-540p/WIFI-1296k-540p.m3u8
 https://a.jsrdn.com/broadcast/e6bdcb5ae9/+0000/c.m3u8
 #EXTINF:-1 tvg-id="TheVentureBros.us" tvg-name="The Venture Bros. (Adult Swim 24/7 Stream)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/QQc2rh8.jpg" group-title="Animation",The Venture Bros. (Adult Swim 24/7 Stream) (1080p) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/venture-bros/stream.m3u8
+#EXTINF:-1 tvg-id="WSJ.us" tvg-name="The Wall Street Journal (WSJ)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2IOP6LI.jpg" group-title="News",The Wall Street Journal (WSJ) (1080p)
+https://wsjlivehls-lh.akamaihd.net/i/events1_1@174990/master.m3u8
 #EXTINF:-1 tvg-id="TheWallStreetJournalLive.us" tvg-name="The Wall Street Journal Live" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ZzyXAKm.jpg" group-title="News",The Wall Street Journal Live (720p)
 https://d155hi8td9k2ns.cloudfront.net/out/wapo-medialive3-rtmp/live.m3u8
 #EXTINF:-1 tvg-id="TheWeatherChannel.us" tvg-name="The Weather Channel" tvg-country="US" tvg-language="English" tvg-logo="http://i.imgur.com/D4vJyy9.png" group-title="Weather",The Weather Channel (720p) [Geo-blocked]
@ -6388,10 +6388,10 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxvoyager/CDN/playlist.m3u8?p
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-rokuvoyagerdocumentaries/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="VSiN.us" tvg-name="VSiN" tvg-country="US" tvg-language="" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/VSiN_400x400.png?raw=true" group-title="",VSiN (720p)
 https://stream.rcncdn.com/live/vsinproxy.m3u8
-#EXTINF:-1 tvg-id="WABI.us" tvg-name="WABI 5 Bangor ME (WABI)" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/MsE05yj.jpg" group-title="Local",WABI 5 Bangor ME (WABI) (720p)
-https://ad-playlistserver.aws.syncbak.com/playlist/13613390/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkdyYXkyMDE2MDgyOSJ9.eyJtaWQiOjEzNjEzMzkwLCJtZDUiOiI2Y2M5MzczYjIxZWIwNzQ4ZDA0YTRlYzYyMjU2YjBhMiIsImlhdCI6MTQ5NzM4MTU5NywiaXNzIjoiU3luY2JhayIsInN1YiI6IkdyYXkifQ.qJPiMCbnGjAn9wgPrGjVl3M9Xfc4CVSyoZTZ5OH-1jo
 #EXTINF:-1 tvg-id="WABI5BangorMaineSTIRR.us" tvg-name="WABI 5 - Bangor - Maine (STIRR)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/D8uMAuV.png" group-title="Local",WABI 5 - Bangor - Maine (STIRR)
 https://ad-playlistserver.aws.syncbak.com/playlist/13613390/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkdyYXkyMDE2MDgyOSJ9.eyJtaWQiOjEzNjEzMzkwL (STIRR)CJtZDUiOiI2Y2M5MzczYjIxZWIwNzQ4ZDA0YTRlYzYyMjU2YjBhMiIsImlhdCI6MTQ5NzM4MTU5NywiaXNzIjoiU3luY2JhayIsInN1YiI6IkdyYXkifQ.qJPiMCbnGjAn9wgPrGjVl3M9Xfc4CVSyoZTZ5OH-1jo
+#EXTINF:-1 tvg-id="WABI.us" tvg-name="WABI 5 Bangor ME (WABI)" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/MsE05yj.jpg" group-title="Local",WABI 5 Bangor ME (WABI) (720p)
+https://ad-playlistserver.aws.syncbak.com/playlist/13613390/master.m3u8?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IkdyYXkyMDE2MDgyOSJ9.eyJtaWQiOjEzNjEzMzkwLCJtZDUiOiI2Y2M5MzczYjIxZWIwNzQ4ZDA0YTRlYzYyMjU2YjBhMiIsImlhdCI6MTQ5NzM4MTU5NywiaXNzIjoiU3luY2JhayIsInN1YiI6IkdyYXkifQ.qJPiMCbnGjAn9wgPrGjVl3M9Xfc4CVSyoZTZ5OH-1jo
 #EXTINF:-1 tvg-id="WarnerTV.us" tvg-name="Warner TV" tvg-country="US" tvg-language="English" tvg-logo="http://static.epg.best/fr/WarnerTV.fr.png" group-title="Movies",Warner TV
 http://203.154.243.89:11205/
 #EXTINF:-1 tvg-id="WarnerTV.us" tvg-name="Warner TV" tvg-country="US" tvg-language="English" tvg-logo="http://static.epg.best/fr/WarnerTV.fr.png" group-title="Movies",Warner TV
@ -6541,8 +6541,6 @@ https://world-poker-tour.samsung.wurl.com/manifest/playlist.m3u8
 http://cdn.elsalvadordigital.com:1935/wowtv/wowtv/playlist.m3u8
 #EXTINF:-1 tvg-id="wowkids.us" tvg-name="wow!! kids" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/AWXw9LW.jpg" group-title="Kids",wow!! kids (1080p)
 https://wownow-wownowkids-1.vizio.wurl.com/manifest/playlist.m3u8
-#EXTINF:-1 tvg-id="WSJ.us" tvg-name="The Wall Street Journal (WSJ)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2IOP6LI.jpg" group-title="News",The Wall Street Journal (WSJ) (1080p)
-https://wsjlivehls-lh.akamaihd.net/i/events1_1@174990/master.m3u8
 #EXTINF:-1 tvg-id="WuTangCollection.us" tvg-name="Wu Tang Collection" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/jbMmsjI.png" group-title="Music",Wu Tang Collection (720p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=73
 #EXTINF:-1 tvg-id="Xcorps.us" tvg-name="Xcorps" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SDKWWQu.png" group-title="Series",Xcorps (720p)
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -15,6 +15,7 @@
    "chalk": "^4.1.1",
    "commander": "^7.0.0",
    "escape-string-regexp": "^2.0.0",
+    "iptv-checker": "^0.20.2",
    "iptv-playlist-parser": "^0.5.4",
    "m3u-linter": "^0.1.3",
    "markdown-include": "^0.4.3",
--- a/scripts/clean.js
+++ b/scripts/clean.js
@ -1,93 +1,65 @@
+const IPTVChecker = require('iptv-checker')
 const { program } = require('commander')
 const ProgressBar = require('progress')
-const axios = require('axios')
-const https = require('https')
-const chalk = require('chalk')
 const parser = require('./helpers/parser')
 const utils = require('./helpers/utils')
 const log = require('./helpers/log')

 program
  .usage('[OPTIONS]...')
+  .option('-d, --debug', 'Enable debug mode')
  .option('-c, --country <country>', 'Comma-separated list of country codes', '')
  .option('-e, --exclude <exclude>', 'Comma-separated list of country codes to be excluded', '')
-  .option('--delay <delay>', 'Delay between parser requests', 1000)
  .option('--timeout <timeout>', 'Set timeout for each request', 5000)
  .parse(process.argv)

+let bar
 const config = program.opts()
-const offlineStatusCodes = [404, 410, 451, 500, 501]
 const ignoreStatus = ['Geo-blocked', 'Not 24/7', 'Offline']
-const instance = axios.create({
-  timeout: config.timeout,
-  maxContentLength: 200000,
-  httpsAgent: new https.Agent({
-    rejectUnauthorized: false
-  }),
-  validateStatus: function (status) {
-    return !offlineStatusCodes.includes(status)
-  }
+const checker = new IPTVChecker({
+  timeout: config.timeout
 })

-let broken = 0
-
 async function main() {
  log.start()

-  log.print(`Parsing 'index.m3u'...`)
+  if (config.debug) log.print(`Debug mode enabled\n`)
+
  let playlists = parser.parseIndex()
  playlists = utils.filterPlaylists(playlists, config.country, config.exclude)
  for (const playlist of playlists) {
    await parser
      .parsePlaylist(playlist.url)
-      .then(checkStatus)
+      .then(checkPlaylist)
      .then(p => p.save())
  }

  log.finish()
 }

-async function checkStatus(playlist) {
-  let bar = new ProgressBar(`Checking '${playlist.url}': [:bar] :current/:total (:percent) `, {
-    total: playlist.channels.length
-  })
+async function checkPlaylist(playlist) {
+  if (!config.debug) {
+    bar = new ProgressBar(`Checking '${playlist.url}': [:bar] :current/:total (:percent) `, {
+      total: playlist.channels.length
+    })
+  }
  const channels = []
  const total = playlist.channels.length
  for (const [index, channel] of playlist.channels.entries()) {
-    const current = index + 1
-    const counter = chalk.gray(`[${current}/${total}]`)
    const skipChannel =
      channel.status &&
      ignoreStatus.map(i => i.toLowerCase()).includes(channel.status.toLowerCase())
-    bar.tick()
-    if (
-      skipChannel ||
-      (!channel.url.startsWith('http://') && !channel.url.startsWith('https://'))
-    ) {
+    if (skipChannel) {
      channels.push(channel)
    } else {
-      const CancelToken = axios.CancelToken
-      const source = CancelToken.source()
-      const timeout = setTimeout(() => {
-        source.cancel()
-      }, config.timeout)
-
-      await instance
-        .get(channel.url, { cancelToken: source.token })
-        .then(() => {
-          clearTimeout(timeout)
-          channels.push(channel)
-        })
-        .then(utils.sleep(config.delay))
-        .catch(err => {
-          clearTimeout(timeout)
-          if (err.response && offlineStatusCodes.includes(err.response.status)) {
-            broken++
-          } else {
-            channels.push(channel)
-          }
-        })
+      const result = await checker.checkStream(channel.data)
+      if (result.status.ok || result.status.reason.includes('timed out')) {
+        channels.push(channel)
+      } else {
+        if (config.debug) log.print(`ERR: ${channel.url} (${result.status.reason})\n`)
+      }
    }
+    if (!config.debug) bar.tick()
  }

  if (playlist.channels.length !== channels.length) {
--- a/scripts/helpers/Channel.js
+++ b/scripts/helpers/Channel.js
@ -7,6 +7,7 @@ const nsfwCategories = categories.filter(c => c.nsfw).map(c => c.name)

 module.exports = class Channel {
  constructor(data) {
+    this.data = data
    this.raw = data.raw
    this.tvg = data.tvg
    this.http = data.http