loader: load from url and file, fixes #7, #8

.gitignore

@@ -1,2 +1,3 @@
 *.pyc
 *.egg-info
+tests/server.stdout

m3u8/__init__.py

@@ -1,3 +1,5 @@
+from urllib2 import urlopen
+
 from m3u8.model import M3U8
 from m3u8.parser import parse
 
@@ -15,4 +17,10 @@ def load(uri):
     Retrieves the content from a given URI and returns a M3U8 object.
     Raises ValueError if invalid content or IOError if request fails.
     '''
-    return M3U8()
+    if uri.startswith('http://') or uri.startswith('https://'):
+        content = urlopen(uri).read().strip()
+    else:
+        with open(uri) as fileobj:
+            content = fileobj.read().strip()
+
+    return M3U8(content)

runtests

@@ -1,7 +1,19 @@
 #!/bin/bash
 
+test_server_stdout=tests/server.stdout
+
 function install_deps {
-    pip install pytest
+    pip install pytest bottle
+}
+
+function start_server {
+    rm -f ${test_server_stdout}
+    python tests/m3u8server.py >${test_server_stdout} 2>&1 &
+}
+
+function stop_server {
+    ps ax | grep m3u8server.py | grep -v grep | cut -d ' ' -f 1 | xargs kill
+    echo "Test server stdout on ${test_server_stdout}"
 }
 
 function run {
@@ -10,7 +22,9 @@ function run {
 
 function main {
     install_deps
+    start_server
     run
+    stop_server
 }
 
 if [ -z "$1" ]; then

tests/m3u8server.py

@@ -0,0 +1,21 @@
+'''
+Test server to deliver stubed M3U8s
+'''
+from os.path import dirname, abspath, join
+
+from bottle import route, run, response
+import bottle
+
+playlists = abspath(join(dirname(__file__), 'playlists'))
+
+@route('/simple.m3u8')
+def simple():
+    response.set_header('Content-Type', 'application/vnd.apple.mpegurl')
+    return m3u8_file('simple-playlist.m3u8')
+
+def m3u8_file(filename):
+    with open(join(playlists, filename)) as fileobj:
+        return fileobj.read().strip()
+
+bottle.debug = True
+run(host='localhost', port=8112)

tests/playlists.py

@@ -1,3 +1,7 @@
+from os.path import dirname, abspath, join
+
+TEST_HOST = 'http://localhost:8112'
+
 SIMPLE_PLAYLIST = '''
 #EXTM3U
 #EXT-X-TARGETDURATION:5220
@@ -6,6 +10,10 @@
 #EXT-X-ENDLIST
 '''
 
+SIMPLE_PLAYLIST_FILENAME = abspath(join(dirname(__file__), 'playlists/simple-playlist.m3u8'))
+
+SIMPLE_PLAYLIST_URI = TEST_HOST + '/simple.m3u8'
+
 SLIDING_WINDOW_PLAYLIST = '''
 #EXTM3U
 #EXT-X-TARGETDURATION:8
@@ -74,3 +82,5 @@
 http://media.example.com/entire.ts
 #EXT-X-ENDLIST
 '''
+
+del abspath, dirname, join

tests/playlists/simple-playlist.m3u8

@@ -0,0 +1,5 @@
+#EXTM3U
+#EXT-X-TARGETDURATION:5220
+#EXTINF:5220,
+http://media.example.com/entire.ts
+#EXT-X-ENDLIST

tests/test_loader.py

@@ -1,6 +1,20 @@
 import m3u8
 from playlists import *
 
-def test_loads_should_create_m3u8_object_from_string():
-    m3u8_obj = m3u8.loads(SIMPLE_PLAYLIST)
-    assert 5220 == m3u8_obj.target_duration
+def test_loads_should_create_object_from_string():
+    obj = m3u8.loads(SIMPLE_PLAYLIST)
+    assert isinstance(obj, m3u8.M3U8)
+    assert 5220 == obj.target_duration
+    assert 'http://media.example.com/entire.ts' == obj.segments[0].uri
+
+def test_load_should_create_object_from_file():
+    obj = m3u8.load(SIMPLE_PLAYLIST_FILENAME)
+    assert isinstance(obj, m3u8.M3U8)
+    assert 5220 == obj.target_duration
+    assert 'http://media.example.com/entire.ts' == obj.segments[0].uri
+
+def test_load_should_create_object_from_uri():
+    obj = m3u8.load(SIMPLE_PLAYLIST_URI)
+    assert isinstance(obj, m3u8.M3U8)
+    assert 5220 == obj.target_duration
+    assert 'http://media.example.com/entire.ts' == obj.segments[0].uri