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

plugins.crunchyroll: Use HLS variant playlist #1494

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

plugins.crunchyroll: Use HLS variant playlist #1494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 7 additions & 22 deletions src/livestreamer/plugins/crunchyroll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
API_VERSION = "2313.8"
API_ACCESS_TOKEN = "QWjz212GspMHH9h"
API_DEVICE_TYPE = "com.crunchyroll.iphone"
STREAM_WEIGHTS = {
"low": 240,
"mid": 420,
"high": 720,
"ultra": 1080,
}


def parse_timestamp(ts):
Expand Down Expand Up @@ -58,13 +52,16 @@ def parse_timestamp(ts):
{
"streams": validate.all(
[{
"quality": validate.text,
"quality": validate.any(
None,
validate.text
),
"url": validate.url(
scheme="http",
path=validate.endswith(".m3u8")
)
}],
validate.filter(lambda s: s["quality"] != "adaptive")
validate.filter(lambda s: s["quality"] == "adaptive")
)
}
)
Expand Down Expand Up @@ -205,14 +202,6 @@ class Crunchyroll(Plugin):
def can_handle_url(self, url):
return _url_re.match(url)

@classmethod
def stream_weight(cls, key):
weight = STREAM_WEIGHTS.get(key)
if weight:
return weight, "crunchyroll"

return Plugin.stream_weight(key)

def _get_streams(self):
api = self._create_api()
match = _url_re.match(self.url)
Expand All @@ -224,14 +213,10 @@ def _get_streams(self):
except CrunchyrollAPIError as err:
raise PluginError(u"Media lookup error: {0}".format(err.msg))

if not info:
if not info or len(info["streams"]) < 1:
return

# TODO: Use dict comprehension here after dropping Python 2.6 support.
return dict(
(stream["quality"], HLSStream(self.session, stream["url"]))
for stream in info["streams"]
)
return HLSStream.parse_variant_playlist(self.session, info["streams"][0]["url"])

def _get_device_id(self):
"""Returns the saved device id or creates a new one and saves it."""
Expand Down