add key proxy

stream.py

@@ -6,6 +6,7 @@ import requests
 import json
 import os
 import urllib.parse
+import re
 
 providers = {}
 providers["nrk"] = "https://tv.nrk.no"
@@ -48,6 +49,16 @@ if icecast_server is not None and stream_server is not None:
                 playlist += f'#EXTINF:0 radio="false", {name}\n'
                 playlist += stream_server + key + "\n"
 
+def get_proxy_url(proxy, current, path):
+    data = {}
+    data["upstream"] = urllib.parse.urljoin(current, path)
+    data["proxy"] = proxy
+    ret = None
+    if proxy is None or proxy_server is None:
+        return data["upstream"]
+    presp = requests.post(proxy_server, json=data)
+    return presp.text
+
 def rewrite(current, provider):
     proxy_req = proxies_req.get(provider)
     proxy = proxies_raw.get(provider)
@@ -64,17 +75,15 @@ def rewrite(current, provider):
     if resp.text is not None:
         ndata = ""
         for line in resp.text.splitlines():
-            if line.startswith("#"):
+            if line.startswith("#EXT-X-KEY:METHOD="):
+                matches = re.findall(r'(?<=URI=").+(?=")', line)
+                if len(matches) == 1:
+                    new_url = get_proxy_url(proxy, current, matches[0])
+                    ndata += re.sub(r'URI=".+"', f'URI="{new_url}"', line)
+            elif line.startswith("#"):
                 ndata += line
             else:
-                data = {}
+                ndata += get_proxy_url(proxy, current, line)
-                data["upstream"] = urllib.parse.urljoin(current, line)
-                data["proxy"] = proxy
-                if proxy is None or proxy_server is None:
-                    ndata += data["upstream"]
-                else:
-                    presp = requests.post(proxy_server, json=data)
-                    ndata += presp.text
             ndata += "\n"
     return ndata