ok

.travis.yml

@@ -1,19 +1,25 @@
 language: python
 sudo: false
 python:
-- 2.6
-- 2.7
-- 3.3
+  - 2.6
+  - 2.7
+  - 3.3
 script: python setup.py test
+
+addons:
+  apt:
+    packages:
+      - nsis
+
 install:
-- travis_retry pip install requests argparse --use-mirrors
-- travis_retry gem install --version 0.8.9 faraday
-- travis_retry gem install travis-artifacts
+  - travis_retry pip install requests argparse --use-mirrors
+  - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/master/install | bash
+
 after_success:
-- sh .travis/build-win32.sh
+  - bash .travis/build-win32.sh
+
 env:
   global:
-  - ARTIFACTS_AWS_REGION=us-east-1
-  - ARTIFACTS_S3_BUCKET=livestreamer-builds
-  - secure: hCNU8Oaw944R+pbHiPFputtgXgC6B02m2UM+7flIatoTnUYTZbwGSkVCxF12s5vSuI4Zg01/54qSuCe4sNxloPmqQ50oxKaxFkq8LlidOjbGw6hq7u+qDvD5+E2PfRwcfDNnso9NbuRSP8TMk9/WRXeBD/SrbgnbZ/1o/LQEKBQ=
-  - secure: YUltQXSDTBIP0iDbU9NiLv8FP3Xr/TT/JYuuyw8JfRzOcjM0PP+qKXyR9bc/gDpSj2uoLDaKfTQvPGFCYdrd+UuTZmlvV56VYQ2/tG0XXifvINJOyESWBLvQfhySuvC/IDpMhz0yEKI8btKHurlvIdvv/9HKlxVL/EIU3C2apiQ=
+    - ARTIFACTS_S3_REGION=eu-west-1
+    - ARTIFACTS_S3_BUCKET=livestreamer-builds
+

.travis/build-win32.sh

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then
+	exit 0
+fi
+
 if [ $TRAVIS_PYTHON_VERSION != "2.7" ]; then
 	exit 0
 fi
@@ -10,8 +14,12 @@ git fetch --unshallow
 
 sh win32/build-with-bootstrap.sh
 cd dist/
-cp *zip livestreamer-latest-win32.zip
 
-for zip in *zip; do
-	travis-artifacts upload --path "$zip" --target-path ""
+if [ $TRAVIS_BRANCH = "develop" ]; then
+	cp *zip livestreamer-latest-win32.zip
+	cp *exe livestreamer-latest-win32-setup.exe
+fi
+
+for file in ./{*.exe,*.zip}; do
+	~/bin/artifacts upload --target-paths "/" "$file"
 done

docs/issues.rst

@@ -11,9 +11,9 @@ Streams are buffering/lagging
 Enable caching in your player
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-By default most players do not cache the data they receieve from Livestreamer.
+By default most players do not cache the data they receive from Livestreamer.
 Caching can reduce the amount of buffering you run into because the player will 
-have some breathing room between receving the data and playing it.
+have some breathing room between receiving the data and playing it.
 
 ============= ======================== ======================================
 Player        Parameter                Note

docs/players.rst

@@ -48,7 +48,7 @@ Name                                                  Stdin Pipe Named Pipe HTTP
 .. [3] Some versions of VLC might be unable to use the stdin pipe and
        prints the error message::
 
-            VLC is unable to open the MRL 'fd://0'
+       VLC is unable to open the MRL 'fd://0'
 
        Use one of the other transport methods instead to work around this.
 

docs/plugin_matrix.rst

@@ -16,12 +16,15 @@ afreeca             afreecatv.com        Yes   No
 afreecatv           afreeca.tv           Yes   No
 aftonbladet         aftonbladet.se       Yes   Yes
 alieztv             aliez.tv             Yes   Yes
+antenna             antenna.gr           --    Yes
 ard_live            live.daserste.de     Yes   --    Streams may be geo-restricted to Germany.
 ard_mediathek       ardmediathek.de      Yes   Yes   Streams may be geo-restricted to Germany.
 artetv              arte.tv              Yes   Yes
 azubutv             azubu.tv             Yes   No
+beam                beam.pro             Yes   No
 beattv              be-at.tv             Yes   Yes   Playlist not implemented yet.
 bambuser            bambuser.com         Yes   Yes
+bliptv              blip.tv              --    Yes
 chaturbate          chaturbate.com       Yes   No
 connectcast         connectcast.tv       Yes   Yes
 crunchyroll         crunchyroll.com      --    Yes
@@ -34,6 +37,7 @@ douyutv             douyutv.com          Yes   --
 dmcloud             api.dmcloud.net      Yes   --
 drdk                dr.dk                Yes   Yes   Streams may be geo-restricted to Denmark.
 euronews            euronews.com         Yes   No
+expressen           expressen.se         Yes   Yes
 filmon              filmon.com           Yes   Yes   Only SD quality streams.
 filmon_us           filmon.us            Yes   Yes
 furstream           furstre.am           Yes   No
@@ -45,8 +49,10 @@ itvplayer           itv.com/itvplayer    Yes   Yes   Streams may be geo-restrict
 letontv             leton.tv             Yes   --
 livestation         livestation.com      Yes   --
 livestream          new.livestream.com   Yes   --
-media_ccc_de        - media.ccc.de       Yes   Yes   Only mp4 and HLS ar are supported.
+livecoding          livecoding.tv        Yes   --
+media_ccc_de        - media.ccc.de       Yes   Yes   Only mp4 and HLS are supported.
                     - streaming... [4]_
+meerkat             meerkatapp.co        Yes   --
 mips                mips.tv              Yes   --    Requires rtmpdump with K-S-V patches.
 mlgtv               mlg.tv               Yes   --
 nhkworld            nhk.or.jp/nhkworld   Yes   No
@@ -55,9 +61,10 @@ npo                 npo.nl               Yes   Yes   Streams may be geo-restrict
 nrk                 - tv.nrk.no          Yes   Yes   Streams may be geo-restricted to Norway.
                     - radio.nrk.no
 oldlivestream       original.liv... [3]_ Yes   No    Only mobile streams are supported.
-periscope           periscope.tv         Yes   --
+periscope           periscope.tv         Yes   Yes   Replay/VOD is supported.
 picarto             picarto.tv           Yes   --
 rtve                rtve.es              Yes   No
+ruv                 ruv.is               Yes   Yes   Streams may be geo-restricted to Iceland.
 sbsdiscovery        - kanal5play.se      --    Yes
                     - kanal9play.se
                     - kanal11play.se
@@ -67,6 +74,7 @@ ssh101              ssh101.com           Yes   No
 streamingvi... [1]_ streamingvid... [2]_ Yes   --    RTMP streams requires rtmpdump with
                                                      K-S-V patches.
 streamlive          streamlive.to        Yes   --
+streamupcom         streamup.com         Yes   --
 svtplay             - svtplay.se         Yes   Yes   Streams may be geo-restricted to Sweden.
                     - svtflow.se
                     - oppetarkiv.se

src/livestreamer/plugins/afreeca.py

@@ -10,6 +10,7 @@
     "rtmp": "http://sessionmanager01.afreeca.tv:6060/broad_stream_assign.html",
     "hls": "http://resourcemanager.afreeca.tv:9090/broad_stream_assign.html"
 }
+HLS_KEY_URL = "http://api.m.afreeca.com/broad/a/watch"
 
 CHANNEL_RESULT_ERROR = 0
 CHANNEL_RESULT_OK = 1
@@ -55,18 +56,37 @@ def _get_channel_info(self, username):
 
         return http.json(res, schema=_channel_schema)
 
+    def _get_hls_key(self, broadcast, username):
+        headers = {
+            "Referer": self.url
+        }
+        data = {
+            "bj_id": username,
+            "broad_no": broadcast
+        }
+        res = http.post(HLS_KEY_URL, data=data, headers=headers)
+
+        return http.json(res)
+
     def _get_stream_info(self, broadcast, type):
         params = {
             "return_type": "gs_cdn",
+            "use_cors": "true",
+            "cors_origin_url": "m.afreeca.com",
+            "broad_no": "{broadcast}-mobile-hd-{type}".format(**locals()),
             "broad_key": "{broadcast}-flash-hd-{type}".format(**locals())
         }
         res = http.get(STREAM_INFO_URLS[type], params=params)
         return http.json(res, schema=_stream_schema)
 
-    def _get_hls_stream(self, broadcast):
+    def _get_hls_stream(self, broadcast, username):
+        keyjson = self._get_hls_key(broadcast, username)
+        if keyjson["result"] != CHANNEL_RESULT_OK:
+            return
+        key = keyjson["data"]["hls_authentication_key"]
         info = self._get_stream_info(broadcast, "hls")
         if "view_url" in info:
-            return HLSStream(self.session, info["view_url"])
+            return HLSStream(self.session, info["view_url"], params=dict(aid=key))
 
     def _get_rtmp_stream(self, broadcast):
         info = self._get_stream_info(broadcast, "rtmp")
@@ -90,7 +110,7 @@ def _get_streams(self):
         if flash_stream:
             yield "live", flash_stream
 
-        mobile_stream = self._get_hls_stream(broadcast)
+        mobile_stream = self._get_hls_stream(broadcast, username)
         if mobile_stream:
             yield "live", mobile_stream
 

src/livestreamer/plugins/afreecatv.py

@@ -7,8 +7,10 @@
 
 
 VIEW_LIVE_API_URL = "http://api.afreeca.tv/live/view_live.php"
+VIEW_LIVE_API_URL_TW = "http://api.afreecatv.com.tw/live/view_live.php"
 
-_url_re = re.compile("http(s)?://(\w+\.)?afreeca.tv/(?P<channel>[\w\-_]+)")
+_url_re = re.compile("http(s)?://(\w+\.)?(afreecatv.com.tw|afreeca.tv)/(?P<channel>[\w\-_]+)")
+_url_re_tw = re.compile("http(s)?://(\w+\.)?(afreecatv.com.tw)/(?P<channel>[\w\-_]+)")
 _flashvars_re = re.compile('<param name="flashvars" value="([^"]+)" />')
 
 _flashvars_schema = validate.Schema(
@@ -27,7 +29,6 @@
     {
         "channel": {
             "strm": [{
-                "brt": validate.text,
                 "bps": validate.text,
                 "purl": validate.url(scheme="rtmp")
             }]
@@ -57,7 +58,12 @@ def _get_streams(self):
             "adok": "",
             "bno": ""
         }
-        res = http.get(VIEW_LIVE_API_URL, params=params)
+
+        if re.search(_url_re_tw, self.url):
+            res = http.get(VIEW_LIVE_API_URL_TW, params=params)
+        else:
+            res = http.get(VIEW_LIVE_API_URL, params=params)
+
         streams = http.json(res, schema=_view_live_schema)
 
         for stream in streams:

src/livestreamer/plugins/antenna.py

@@ -0,0 +1,49 @@
+import re
+import json
+
+from livestreamer.plugin import Plugin
+from livestreamer.plugin.api import http, validate
+from livestreamer.stream import HDSStream
+
+_url_re = re.compile("(http(s)?://(\w+\.)?antenna.gr)/webtv/watch\?cid=.+")
+_playlist_re = re.compile("playlist:\s*\"(/templates/data/jplayer\?cid=[^\"]+)")
+_manifest_re = re.compile("jwplayer:source\s+file=\"([^\"]+)\"")
+_swf_re = re.compile("<jwplayer:provider>(http[^<]+)</jwplayer:provider>")
+
+class Antenna(Plugin):
+    @classmethod
+    def can_handle_url(self, url):
+        return _url_re.match(url)
+
+    def _get_streams(self):
+
+        # Discover root
+        match = _url_re.search(self.url)
+        root = match.group(1)
+
+        # Download main URL
+        res = http.get(self.url)
+
+        # Find playlist
+        match = _playlist_re.search(res.text)
+        playlist_url = root + match.group(1) + "d"
+
+        # Download playlist
+        res = http.get(playlist_url)
+
+        # Find manifest
+        match = _manifest_re.search(res.text)
+        manifest_url = match.group(1)
+
+        # Find SWF
+        match = _swf_re.search(res.text)
+        swf_url = match.group(1);
+
+        streams = {}
+        streams.update(
+            HDSStream.parse_manifest(self.session, manifest_url, pvswf=swf_url)
+        )
+
+        return streams
+
+__plugin__ = Antenna

src/livestreamer/plugins/artetv.py

@@ -12,14 +12,14 @@
 SWF_URL = "http://www.arte.tv/player/v2/jwplayer6/mediaplayer.6.6.swf"
 
 _url_re = re.compile("http(s)?://(\w+\.)?arte.tv/")
-_json_re = re.compile("arte_vp_(?:live-)?url='([^']+)'")
+_json_re = re.compile("arte_vp_(?:live-)?url=(['\"])(.+?)\\1")
 
 _schema = validate.Schema(
     validate.transform(_json_re.search),
     validate.any(
         None,
         validate.all(
-            validate.get(1),
+            validate.get(2),
             validate.url(scheme="http")
         )
     )

src/livestreamer/plugins/azubutv.py

@@ -18,7 +18,8 @@
                    "(KHTML, like Gecko) Chrome/36.0.1944.9 Safari/537.36")
 }
 
-_url_re = re.compile("http(s)?://(\w+\.)?azubu.tv/[^/]+")
+_url_re = re.compile("http(s)?://(\w+\.)?azubu.tv/(?P<domain>\w+)")
+CHANNEL_INFO_URL = "http://api.azubu.tv/public/channel/%s/player"
 
 _viewerexp_schema = validate.Schema(
     validate.attr({
@@ -122,50 +123,32 @@ def _send_amf_request(self, req, key):
         return AMFPacket.deserialize(BytesIO(res.content))
 
     def _get_player_params(self, retries=5):
+        match = _url_re.match(self.url);
+        domain = match.group('domain');
         try:
-            res = http.get(self.url, headers=HTTP_HEADERS)
+            res = http.get(CHANNEL_INFO_URL % str(domain))
         except PluginError as err:
             # The server sometimes gives us 404 for no reason
             if "404" in str(err) and retries:
                 sleep(1)
                 return self._get_player_params(retries - 1)
             else:
                 raise
+        channel_info = http.json(res)
+        channel_info = channel_info['data']
 
-        match = re.search("<param name=\"playerKey\" value=\"(.+)\" />", res.text)
-        if not match:
-            # The HTML returned sometimes doesn't contain the parameters
-            if not retries:
-                raise PluginError("Missing key 'playerKey' in player params")
-            else:
-                sleep(1)
-                return self._get_player_params(retries - 1)
+        key = channel_info['player_key'];
 
-        key = match.group(1)
-        match = re.search("AZUBU.setVar\(\"firstVideoRefId\", \"(.+)\"\);", res.text)
-        if not match:
-            # The HTML returned sometimes doesn't contain the parameters
-            if not retries:
-                raise PluginError("Unable to find video reference")
-            else:
-                sleep(1)
-                return self._get_player_params(retries - 1)
+        is_live = channel_info['is_live'];
 
-        video_player = "ref:" + match.group(1)
-        match = re.search("<param name=\"playerID\" value=\"(\d+)\" />", res.text)
-        if not match:
-            # The HTML returned sometimes doesn't contain the parameters
-            if not retries:
-                raise PluginError("Missing key 'playerID' in player params")
-            else:
-                sleep(1)
-                return self._get_player_params(retries - 1)
+        stream_video = channel_info['stream_video']
+        if stream_video:
+            video_player = "ref:" + stream_video['reference_id']
+        else:
+            is_live = False
+            video_player = None
 
-        player_id = match.group(1)
-        match = re.search("<!-- live on -->", res.text)
-        if not match:
-            match = re.search("<div id=\"channel_live\">", res.text)
-        is_live = not not match
+        player_id = channel_info['player_id']
 
         return key, video_player, player_id, is_live