Merge branch 'master' into LaneSh4d0w-patch-4

.github/workflows/auto-update.yml

@@ -13,17 +13,8 @@ jobs:
         with:
           node-version: '14'
           cache: 'npm'
-      - name: Download data from API
-        run: |
-          mkdir -p scripts/data
-          curl -L -o scripts/data/blocklist.json https://iptv-org.github.io/api/blocklist.json
-          curl -L -o scripts/data/categories.json https://iptv-org.github.io/api/categories.json
-          curl -L -o scripts/data/channels.json https://iptv-org.github.io/api/channels.json
-          curl -L -o scripts/data/countries.json https://iptv-org.github.io/api/countries.json
-          curl -L -o scripts/data/guides.json https://iptv-org.github.io/api/guides.json
-          curl -L -o scripts/data/languages.json https://iptv-org.github.io/api/languages.json
-          curl -L -o scripts/data/regions.json https://iptv-org.github.io/api/regions.json
-          curl -L -o scripts/data/subdivisions.json https://iptv-org.github.io/api/subdivisions.json
+      # - run: sudo chmod 755 'scripts/commands/api/load.sh'
+      - run: npm run api:load
       - uses: actions/upload-artifact@v2
         with:
           name: data

package.json

@@ -3,6 +3,7 @@
   "scripts": {
     "act:auto-update": "act workflow_dispatch -W .github/workflows/auto-update.yml --artifact-server-path=.artifacts",
     "act:check": "act pull_request -W .github/workflows/check.yml",
+    "api:load": "./scripts/commands/api/load.sh",
     "db:create": "node scripts/commands/database/create.js",
     "db:matrix": "node scripts/commands/database/matrix.js",
     "db:update": "node scripts/commands/database/update.js",

scripts/commands/api/load.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+mkdir -p scripts/data 
+curl -L -o scripts/data/blocklist.json https://iptv-org.github.io/api/blocklist.json 
+curl -L -o scripts/data/categories.json https://iptv-org.github.io/api/categories.json 
+curl -L -o scripts/data/channels.json https://iptv-org.github.io/api/channels.json 
+curl -L -o scripts/data/countries.json https://iptv-org.github.io/api/countries.json 
+curl -L -o scripts/data/guides.json https://iptv-org.github.io/api/guides.json 
+curl -L -o scripts/data/languages.json https://iptv-org.github.io/api/languages.json 
+curl -L -o scripts/data/regions.json https://iptv-org.github.io/api/regions.json 
+curl -L -o scripts/data/subdivisions.json https://iptv-org.github.io/api/subdivisions.json