andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stream: Abort unwrap if visiting same URI twice

Browse Source
This commit is contained in:
Stein Magnus Jodal 2015-09-14 10:12:31 +02:00
parent e217bd6737
commit 6e126ee850
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mopidy/stream/actor.py
View File

@ -97,9 +97,18 @@ def _unwrap_stream(uri, timeout, scanner, requests_session):
"""
original_uri = uri
seen_uris = set()
deadline = time.time() + timeout
while time.time() < deadline:
if uri in seen_uris:
logger.info(
'Unwrapping stream from URI (%s) failed: '
'playlist referenced itself', uri)
return None
else:
seen_uris.add(uri)
logger.debug('Unwrapping stream from URI: %s', uri)
try:
@ -107,8 +116,7 @@ def _unwrap_stream(uri, timeout, scanner, requests_session):
if scan_timeout < 0:
logger.info(
'Unwrapping stream from URI (%s) failed: '
'timed out in %sms',
uri, timeout)
'timed out in %sms', uri, timeout)
return None
scan_result = scanner.scan(uri, timeout=scan_timeout)
except exceptions.ScannerError as exc:

19
tests/stream/test_playback.py
View File

@ -166,3 +166,22 @@ class TestTranslateURI(object):
result = provider.translate_uri(PLAYLIST_URI)
assert result is None
@responses.activate
def test_playlist_references_itself(self, scanner, provider, caplog):
scanner.scan.return_value.mime = 'text/foo'
responses.add(
responses.GET, PLAYLIST_URI,
body=BODY.replace(STREAM_URI, PLAYLIST_URI),
content_type='audio/x-mpegurl')
result = provider.translate_uri(PLAYLIST_URI)
assert 'Unwrapping stream from URI: %s' % PLAYLIST_URI in caplog.text()
assert (
'Parsed playlist (%s) and found new URI: %s'
% (PLAYLIST_URI, PLAYLIST_URI)) in caplog.text()
assert (
'Unwrapping stream from URI (%s) failed: '
'playlist referenced itself' % PLAYLIST_URI) in caplog.text()
assert result is None