Add argument reading from ~/.livestreamerrc.

3 files changed, 19 insertions, 6 deletions

diff --git a/src/livestreamer/__init__.py b/src/livestreamer/__init__.py
index 0e399b9..e429e7e 100644
--- a/src/livestreamer/__init__.py
+++ b/src/livestreamer/__init__.py
@@ -1,5 +1,9 @@
 from livestreamer import plugins
 
+import os.path
+
+RCFILE = os.path.expanduser("~/.livestreamerrc")
+
 def resolve_url(url):
     for name, plugin in plugins.get_plugins().items():
         if plugin.can_handle_url(url):
diff --git a/src/livestreamer/cli.py b/src/livestreamer/cli.py
index b4b99e7..7bb57e2 100644
--- a/src/livestreamer/cli.py
+++ b/src/livestreamer/cli.py
@@ -1,17 +1,17 @@
 #!/usr/bin/env python3
 
-import argparse
 import sys, os
 
 import livestreamer
 
-parser = argparse.ArgumentParser(description="Util to play various livestreaming services in a custom player")
+parser = livestreamer.utils.ArgumentParser(description="Util to play various livestreaming services in a custom player",
+                                           fromfile_prefix_chars="@")
 parser.add_argument("url", help="URL to stream", nargs="?")
 parser.add_argument("stream", help="stream to play", nargs="?")
-parser.add_argument("player", help="commandline for player", nargs="?", default="vlc")
+parser.add_argument("-p", "--player", metavar="player", help="commandline for player", default="vlc")
 parser.add_argument("-o", "--output", metavar="filename", help="write stream to file instead of playing it")
 parser.add_argument("-c", "--cmdline", action="store_true", help="print commandline used internally to play stream")
-parser.add_argument("-p", "--plugins", action="store_true", help="print installed plugins")
+parser.add_argument("-l", "--plugins", action="store_true", help="print installed plugins")
 
 
 def exit(msg):
@@ -59,7 +59,12 @@ def print_plugins():
 
 
 def main():
-    args = parser.parse_args()
+    arglist = sys.argv[1:]
+
+    if os.path.exists(livestreamer.RCFILE):
+        arglist.insert(0, "@" + livestreamer.RCFILE)
+
+    args = parser.parse_args(arglist)
 
     if args.url:
         handle_url(args)
diff --git a/src/livestreamer/utils.py b/src/livestreamer/utils.py
index bfb59cc..7eaec95 100644
--- a/src/livestreamer/utils.py
+++ b/src/livestreamer/utils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 from livestreamer.compat import urllib, bytes
-import hmac, hashlib, zlib
+import hmac, hashlib, zlib, argparse
 
 SWF_KEY = b"Genuine Adobe Flash Player 001"
 
@@ -28,6 +28,10 @@ class CommandLine(object):
 
         return cmdline
 
+class ArgumentParser(argparse.ArgumentParser):
+    def convert_arg_line_to_args(self, line):
+        arg = line.split("=")
+        yield "--%s=%s" % (arg[0].strip(), arg[1].strip())
 
 def swfverify(url):
     fd = urllib.urlopen(url)