Merge pull request #129 from colde/master

Add the ability to set URI's when loading from a string

m3u8/__init__.py

@@ -24,12 +24,18 @@
            'Segment', 'loads', 'load', 'parse', 'ParseError')
 
 
-def loads(content):
+def loads(content, uri=None):
     '''
     Given a string with a m3u8 content, returns a M3U8 object.
+    Optionally parses a uri to set a correct base_uri on the M3U8 object.
     Raises ValueError if invalid content
     '''
-    return M3U8(content)
+
+    if uri is None:
+        return M3U8(content)
+    else:
+        base_uri = _parsed_url(uri)
+        return M3U8(content, base_uri=base_uri)
 
 
 def load(uri, timeout=None, headers={}):

tests/test_loader.py

@@ -111,6 +111,13 @@ def test_absolute_uri_should_handle_empty_base_uri_path():
     assert 'http://example.com/key.bin' == key.absolute_uri
 
 
+def test_presence_of_base_uri_if_provided_when_loading_from_string():
+    with open(playlists.RELATIVE_PLAYLIST_FILENAME) as f:
+        content = f.read()
+    obj = m3u8.loads(content, uri='http://media.example.com/path/playlist.m3u8')
+    assert obj.base_uri == 'http://media.example.com/path/'
+
+
 def test_raise_timeout_exception_if_timeout_happens_when_loading_from_uri():
     try:
         obj = m3u8.load(playlists.TIMEOUT_SIMPLE_PLAYLIST_URI, timeout=1)