plugins.stream: Attempt to eval parameters as Python values.

src/livestreamer/plugins/stream.py

@@ -4,6 +4,7 @@ from livestreamer.plugin import Plugin
 from livestreamer.stream import (AkamaiHDStream, HDSStream, HLSStream,
                                  HTTPStream, RTMPStream)
 
+import ast
 import re
 
 class StreamURL(Plugin):
@@ -36,13 +37,8 @@ class StreamURL(Plugin):
                 rval[key] = strval
             else:
                 try:
-                    val = float(val)
-                except ValueError:
-                    pass
-
-                try:
-                    val = int(val)
-                except ValueError:
+                    val = ast.literal_eval(val)
+                except:
                     pass
 
                 rval[key] = val

tests/test_plugin_stream.py

@@ -44,6 +44,17 @@ class TestPluginStream(unittest.TestCase):
         self.assertEqual(stream.params["rtmp"], url)
         self.assertDictHas(params, stream.params)
 
+    def _test_http(self, surl, url, params):
+        channel = self.session.resolve_url(surl)
+        streams = channel.get_streams()
+
+        self.assertTrue("live" in streams)
+
+        stream = streams["live"]
+        self.assertTrue(isinstance(stream, HTTPStream))
+        self.assertEqual(stream.url, url)
+        self.assertDictHas(params, stream.args)
+
     def test_plugin(self):
         self._test_rtmp("rtmp://hostname.se/stream",
                          "rtmp://hostname.se/stream", dict())
@@ -60,5 +71,10 @@ class TestPluginStream(unittest.TestCase):
         self._test_akamaihd("akamaihd://http://hostname.se/stream",
                             "http://hostname.se/stream")
 
+        self._test_http("httpstream://http://hostname.se/auth.php auth=('test','test2')",
+                        "http://hostname.se/auth.php", dict(auth=("test", "test2")))
+
+
+
 if __name__ == "__main__":
     unittest.main()