streams.dash: Support manifest strings in addition to manifest urls #2285
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Addresses streamlink#2179. Allows parse_manifest() to accept a string containing a properly-formatted XML manifest instead of a manifest url.
Codecov Report
@@ Coverage Diff @@
## master #2285 +/- ##
==========================================
- Coverage 52.61% 52.57% -0.05%
==========================================
Files 237 237
Lines 14758 14815 +57
==========================================
+ Hits 7765 7789 +24
- Misses 6993 7026 +33 |
back-to
approved these changes
Feb 1, 2019
There was a problem hiding this comment.
if url_or_manifest is used and there is drm protection in the string
streamlink/src/streamlink/stream/dash.py
Line 192 in 054fb23
there will be an NameError: name 'url' is not defined
maybe not that important as this is not supported anyways
beardypig
requested changes
Feb 9, 2019
tests/streams/test_dash.py
Outdated
| @@ -208,6 +208,26 @@ def test_parse_manifest_drm(self, mpdClass): | |||
| self.session, self.test_url) | |||
| mpdClass.assert_called_with(ANY, base_url="http://test.bar", url="http://test.bar/foo.mpd") | |||
|
|
|||
| @patch('streamlink.stream.dash.MPD') | |||
There was a problem hiding this comment.
I don't think this test is quite valid, it doesn't test that the correct thing is passed to the MPD class. I think parsing one of the included resources might be a better test.
def test_parse_manifest_string(self):
with text("dash/test_9.mpd") as mpd_txt:
test_manifest = mpd_txt.read()
streams = DASHStream.parse_manifest(self.session, test_manifest)
self.assertSequenceEqual(
sorted(list(streams.keys())),
sorted(["2500k"])
)
beardypig
approved these changes
Feb 11, 2019
|
Thanks @pmrowla, and thanks for the reviews @back-to and @beardypig! |
jackyzy823
pushed a commit
to jackyzy823/streamlink
that referenced
this pull request
Mar 20, 2019
…treamlink#2285) * stream.dash: Support manifest strings in addition to manifest urls Addresses streamlink#2179. Allows parse_manifest() to accept a string containing a properly-formatted XML manifest instead of a manifest url. * streams.dash: add unit test for manifest string * streams.dash: fix parse_manifest_string unit test
Billy2011
pushed a commit
to Billy2011/streamlink-27
that referenced
this pull request
May 14, 2020
…treamlink#2285) * stream.dash: Support manifest strings in addition to manifest urls Addresses streamlink#2179. Allows parse_manifest() to accept a string containing a properly-formatted XML manifest instead of a manifest url. * streams.dash: add unit test for manifest string * streams.dash: fix parse_manifest_string unit test
mkbloke
pushed a commit
to mkbloke/streamlink
that referenced
this pull request
Aug 18, 2020
…treamlink#2285) * stream.dash: Support manifest strings in addition to manifest urls Addresses streamlink#2179. Allows parse_manifest() to accept a string containing a properly-formatted XML manifest instead of a manifest url. * streams.dash: add unit test for manifest string * streams.dash: fix parse_manifest_string unit test
resiproxy
pushed a commit
to resiproxy/streamlink
that referenced
this pull request
Nov 5, 2020
…treamlink#2285) * stream.dash: Support manifest strings in addition to manifest urls Addresses streamlink#2179. Allows parse_manifest() to accept a string containing a properly-formatted XML manifest instead of a manifest url. * streams.dash: add unit test for manifest string * streams.dash: fix parse_manifest_string unit test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modifies
parse_manifest()to accept aurl_or_manifestparameter.See also: #2239
This does not include any of the changes for supporting DASH SegmentBase.