Proposed fixes 1.13

src/livestreamer/plugin/plugin.py

@@ -37,7 +37,7 @@ def stream_weight(stream):
         if stream in weights:
             return weights[stream], group
 
-    match = re.match("^(\d+)([k]|[p])?([\+])?$", stream)
+    match = re.match("^(\d+)([k]|[p])?(\d*)([\+])?$", stream)
 
     if match:
         if match.group(2) == "k":
@@ -53,7 +53,10 @@ def stream_weight(stream):
         elif match.group(2) == "p":
             weight = int(match.group(1))
 
-            if match.group(3) == "+":
+            if match.group(3):
+                weight += int(match.group(3))
+
+            if match.group(4) == "+":
                 weight += 1
 
             return weight, "pixels"

src/livestreamer/plugins/afreeca.py

@@ -4,7 +4,7 @@
 from livestreamer.plugin.api import http, validate
 from livestreamer.stream import RTMPStream, HLSStream
 
-CHANNEL_INFO_URL = "http://live.afreeca.com:8057/api/get_broad_state_list.php"
+CHANNEL_INFO_URL = "http://live.afreecatv.com:8057/api/get_broad_state_list.php"
 KEEP_ALIVE_URL = "{server}/stream_keepalive.html"
 STREAM_INFO_URLS = {
     "rtmp": "http://sessionmanager01.afreeca.tv:6060/broad_stream_assign.html",
@@ -16,7 +16,7 @@
 CHANNEL_RESULT_OK = 1
 
 
-_url_re = re.compile("http(s)?://(\w+\.)?afreeca.com/(?P<username>\w+)")
+_url_re = re.compile("http(s)?://(\w+\.)?afreeca(tv)?.com/(?P<username>\w+)/\d+")
 
 _channel_schema = validate.Schema(
     {
@@ -49,10 +49,10 @@ def _get_channel_info(self, username):
         headers = {
             "Referer": self.url
         }
-        data = {
+        params = {
             "uid": username
         }
-        res = http.post(CHANNEL_INFO_URL, data=data, headers=headers)
+        res = http.get(CHANNEL_INFO_URL, params=params, headers=headers)
 
         return http.json(res, schema=_channel_schema)
 

src/livestreamer/plugins/douyutv.py

@@ -1,47 +1,82 @@
 import hashlib
 import re
 import time
+import uuid
+
+from requests.adapters import HTTPAdapter
 
 from livestreamer.plugin import Plugin
 from livestreamer.plugin.api import http, validate
-from livestreamer.stream import (
-    HTTPStream, HLSStream
-)
+from livestreamer.stream import HTTPStream
 
-API_URL = "http://www.douyutv.com/api/v1/room/{0}?aid=android&client_sys=android&time={1}&auth={2}"
+USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36"
+MAPI_URL = "https://m.douyu.com/html5/live?roomId={0}"
+LAPI_URL = "https://www.douyu.com/lapi/live/getPlay/{0}"
+LAPI_SECRET = "A12Svb&%1UUmf@hC"
 SHOW_STATUS_ONLINE = 1
 SHOW_STATUS_OFFLINE = 2
 STREAM_WEIGHTS = {
-    "middle": 540,
+    "low": 540,
+    "middle": 720,
     "source": 1080
 }
 
 _url_re = re.compile("""
-    http(s)?://(www\.)?douyutv.com
+    http(s)?://(www\.)?douyu.com
     /(?P<channel>[^/]+)
 """, re.VERBOSE)
 
+_room_id_re = re.compile(r'"room_id"\s*:\s*(\d+),')
+_room_id_alt_re = re.compile(r'data-room_id="(\d+)"')
+
+_room_id_schema = validate.Schema(
+    validate.all(
+        validate.transform(_room_id_re.search),
+        validate.any(
+            None,
+            validate.all(
+                validate.get(1),
+                validate.transform(int)
+            )
+        )
+    )
+)
+
+_room_id_alt_schema = validate.Schema(
+    validate.all(
+        validate.transform(_room_id_alt_re.search),
+        validate.any(
+            None,
+            validate.all(
+                validate.get(1),
+                validate.transform(int)
+            )
+        )
+    )
+)
+
 _room_schema = validate.Schema(
     {
         "data": validate.any(None, {
             "show_status": validate.all(
                 validate.text,
                 validate.transform(int)
-            ),
-            "rtmp_url": validate.text,
-            "rtmp_live": validate.text,
-            "hls_url": validate.text,
-            "rtmp_multi_bitrate": validate.all(
-                validate.any([], {
-                    validate.text: validate.text
-                }),
-                validate.transform(dict)
             )
         })
     },
     validate.get("data")
 )
 
+_lapi_schema = validate.Schema(
+    {
+        "data": validate.any(None, {
+            "rtmp_url": validate.text,
+            "rtmp_live": validate.text
+        })
+    },
+    validate.get("data")
+)
+
 
 class Douyutv(Plugin):
     @classmethod
@@ -59,28 +94,73 @@ def _get_streams(self):
         match = _url_re.match(self.url)
         channel = match.group("channel")
 
-        ts = int(time.time())
-        sign = hashlib.md5(("room/{0}?aid=android&client_sys=android&time={1}".format(channel, ts) + "1231").encode("ascii")).hexdigest()
+        http.headers.update({"User-Agent": USER_AGENT})
+        http.verify=False
+        http.mount('http://', HTTPAdapter(max_retries=99))
 
-        res = http.get(API_URL.format(channel, ts, sign))
+        #Thanks to @ximellon for providing method.
+        try:
+            channel = int(channel)
+        except ValueError:
+            channel = http.get(self.url, schema=_room_id_schema)
+            if channel == 0:
+                channel = http.get(self.url, schema=_room_id_alt_schema)
+
+        res = http.get(MAPI_URL.format(channel))
         room = http.json(res, schema=_room_schema)
         if not room:
             return
 
         if room["show_status"] != SHOW_STATUS_ONLINE:
             return
 
-        hls_url = "{room[hls_url]}?wsiphost=local".format(room=room)
-        hls_stream = HLSStream(self.session, hls_url)
-        yield "hls", hls_stream
+        ts = int(time.time() / 60)
+        did = uuid.uuid4().hex.upper()
+        sign = hashlib.md5(("{0}{1}{2}{3}".format(channel, did, LAPI_SECRET, ts)).encode("utf-8")).hexdigest()
+
+        data = {
+            "cdn": "ws",
+            "rate": "0",
+            "tt": ts,
+            "did": did,
+            "sign": sign
+        }
+
+        res = http.post(LAPI_URL.format(channel), data=data)
+        room = http.json(res, schema=_lapi_schema)
 
         url = "{room[rtmp_url]}/{room[rtmp_live]}".format(room=room)
         stream = HTTPStream(self.session, url)
         yield "source", stream
 
-        for name, url in room["rtmp_multi_bitrate"].items():
-            url = "{room[rtmp_url]}/{url}".format(room=room, url=url)
-            stream = HTTPStream(self.session, url)
-            yield name, stream
+        data = {
+            "cdn": "ws",
+            "rate": "2",
+            "tt": ts,
+            "did": did,
+            "sign": sign
+        }
+
+        res = http.post(LAPI_URL.format(channel), data=data)
+        room = http.json(res, schema=_lapi_schema)
+
+        url = "{room[rtmp_url]}/{room[rtmp_live]}".format(room=room)
+        stream = HTTPStream(self.session, url)
+        yield "middle", stream
+
+        data = {
+            "cdn": "ws",
+            "rate": "1",
+            "tt": ts,
+            "did": did,
+            "sign": sign
+        }
+
+        res = http.post(LAPI_URL.format(channel), data=data)
+        room = http.json(res, schema=_lapi_schema)
+
+        url = "{room[rtmp_url]}/{room[rtmp_live]}".format(room=room)
+        stream = HTTPStream(self.session, url)
+        yield "low", stream
 
 __plugin__ = Douyutv

src/livestreamer/plugins/goodgame.py

@@ -14,7 +14,7 @@
 
 _url_re = re.compile("http://(?:www\.)?goodgame.ru/channel/(?P<user>\w+)")
 _stream_re = re.compile(
-    "iframe frameborder=\"0\" width=\"100%\" height=\"100%\" src=\"http://goodgame.ru/player(\d)?\?(\w+)\""
+    "meta property=\"og:video:iframe\" content=\"http://goodgame.ru/player/html\?(\w+)\""
 )
 _ddos_re = re.compile(
     "document.cookie=\"(__DDOS_[^;]+)"
@@ -45,7 +45,7 @@ def _get_streams(self):
         if not match:
             return
 
-        stream_id = match.group(2)
+        stream_id = match.group(1)
         streams = {}
         for name, url_suffix in QUALITIES.items():
             url = HLS_URL_FORMAT.format(stream_id, url_suffix)

src/livestreamer/plugins/livecodingtv.py

@@ -1,12 +1,12 @@
 import re
-
 from livestreamer.plugin import Plugin
-from livestreamer.stream import RTMPStream
+from livestreamer.stream import RTMPStream, HTTPStream
 from livestreamer.plugin.api import http
 
 
+_vod_re = re.compile('\"(http(s)?://.*\.mp4\?t=.*)\"')
 _rtmp_re = re.compile('rtmp://[^"]+/(?P<channel>\w+)+[^/"]+')
-_url_re = re.compile("http(s)?://(?:\w+.)?\livecoding\.tv")
+_url_re = re.compile('http(s)?://(?:\w+.)?\livecoding\.tv')
 
 
 class LivecodingTV(Plugin):
@@ -16,19 +16,18 @@ def can_handle_url(cls, url):
 
     def _get_streams(self):
         res = http.get(self.url)
-        match = _rtmp_re.search(res.text)
-        rtmp_url = match.group(0)
-
-        if not match:
+        match = _rtmp_re.search(res.content)
+        if match:
+            params = {
+                "rtmp": match.group(0),
+                "pageUrl": self.url,
+                "live": True,
+            }
+            yield 'live', RTMPStream(self.session, params)
             return
 
-        stream = RTMPStream(self.session, {
-            "rtmp": rtmp_url,
-            "pageUrl": self.url,
-            "live": True,
-        })
-
-        return dict(live=stream)
-
+        match = _vod_re.search(res.content)
+        if match:
+            yield 'vod', HTTPStream(self.session, match.group(1))
 
 __plugin__ = LivecodingTV

src/livestreamer/plugins/livestream.py

@@ -22,8 +22,7 @@
             ),
         }, None)
     },
-    validate.optional("viewerPlusSwfUrl"): validate.url(scheme="http"),
-    validate.optional("hdPlayerSwfUrl"): validate.text
+    validate.optional("playerUri"): validate.text
 })
 _smil_schema = validate.Schema(validate.union({
     "http_base": validate.all(
@@ -94,12 +93,13 @@ def _get_streams(self):
 
         play_url = stream_info.get("play_url")
         if play_url:
-            swf_url = info.get("viewerPlusSwfUrl") or info.get("hdPlayerSwfUrl")
-            if not swf_url.startswith("http"):
-                swf_url = "http://" + swf_url
+            swf_url = info.get("playerUri")
+            if swf_url:
+                if not swf_url.startswith("http"):
+                    swf_url = "http://" + swf_url
 
-            # Work around broken SSL.
-            swf_url = swf_url.replace("https://", "http://")
+                # Work around broken SSL.
+                swf_url = swf_url.replace("https://", "http://")
 
             qualities = stream_info["qualities"]
             for bitrate, stream in self._parse_smil(play_url, swf_url):

src/livestreamer/plugins/nrk.py

@@ -1,5 +1,6 @@
 import re
 
+from livestreamer.compat import urljoin
 from livestreamer.plugin import Plugin
 from livestreamer.plugin.api import http, validate
 from livestreamer.stream import HLSStream
@@ -10,26 +11,30 @@
     "preferred-player-live=hlslink"
 )
 
+_id_re = re.compile("/(?:program|direkte|serie/[^/]+)/([^/]+)")
 _url_re = re.compile("https?://(tv|radio).nrk.no/")
-_media_url_re = re.compile("""
-    <div[^>]*?id="playerelement"[^>]+
-    data-media="(?P<url>[^"]+)"
-""", re.VERBOSE)
+_api_baseurl_re = re.compile('apiBaseUrl:\s*"(?P<baseurl>[^"]+)"')
 
 _schema = validate.Schema(
-    validate.transform(_media_url_re.search),
+    validate.transform(_api_baseurl_re.search),
     validate.any(
         None,
         validate.all(
-            validate.get("url"),
+            validate.get("baseurl"),
             validate.url(
-                scheme="http",
-                path=validate.endswith(".m3u8")
+                scheme="http"
             )
         )
     )
 )
 
+_mediaelement_schema = validate.Schema({
+    "mediaUrl": validate.url(
+        scheme="http",
+        path=validate.endswith(".m3u8")
+    )
+})
+
 
 class NRK(Plugin):
     @classmethod
@@ -42,10 +47,17 @@ def _get_streams(self):
         cookie = {
             "NRK_PLAYER_SETTINGS_{0}".format(stream_type): COOKIE_PARAMS
         }
-        playlist_url = http.get(self.url, cookies=cookie, schema=_schema)
-        if not playlist_url:
-            return
 
-        return HLSStream.parse_variant_playlist(self.session, playlist_url)
+        # Construct API URL for this program.
+        baseurl = http.get(self.url, cookies=cookie, schema=_schema)
+        program_id = _id_re.search(self.url).group(1)
+
+        # Extract media URL.
+        json_url = urljoin(baseurl, "mediaelement/{}".format(program_id))
+        res = http.get(json_url, cookies=cookie)
+        media_element = http.json(res, schema=_mediaelement_schema)
+        media_url = media_element["mediaUrl"]
+
+        return HLSStream.parse_variant_playlist(self.session, media_url)
 
 __plugin__ = NRK