Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

plugins.livestream: Update for API changes #1277

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

plugins.livestream: Update for API changes #1277

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c56fb2
plugins.livestream: Prefer standard SWF players
intact Apr 9, 2016
62e5413
plugins.livestream: Tolerate missing swf player URL
intact Sep 2, 2016
c653539
plugins.livestream: Fix player URL
intact Sep 6, 2016
42cc7b1
plugins.livestream: Support old player urls
intact Nov 20, 2016
3231fa4
plugins.livestream: Fix protocol relative swf_url
intact Mar 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/livestreamer/plugins/livestream.py
View file
Open in desktop
Expand Up @@ -22,7 +22,9 @@
),
}, None)
},
validate.optional("playerUri"): validate.text,
validate.optional("viewerPlusSwfUrl"): validate.url(scheme="http"),
validate.optional("lsPlayerSwfUrl"): validate.text,
validate.optional("hdPlayerSwfUrl"): validate.text
})
_smil_schema = validate.Schema(validate.union({
Expand Down Expand Up @@ -94,12 +96,12 @@ 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") or info.get("hdPlayerSwfUrl") or info.get("lsPlayerSwfUrl") or info.get("viewerPlusSwfUrl")
if swf_url:
swf_url = urljoin(self.url, 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):
Expand Down