From 1d672d9122a91da59f4ea11991bec67c516ca0d1 Mon Sep 17 00:00:00 2001
From: Yuanle Song <sylecn@gmail.com>
Date: Sun, 3 Mar 2019 16:11:16 +0800
Subject: [PATCH] v0.3.0 add param handling for main.py

---
 Makefile                   |  4 +---
 m3u8downloader/__init__.py |  2 +-
 m3u8downloader/main.py     | 21 ++++++++++-----------
 setup.py                   |  7 +++----
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 33deb37..d355443 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,7 @@ version:
 debug:
 	env DEBUG=1 $(PYTHON) m3u8downloader/main.py
 run:
-	$(PYTHON) m3u8downloader/main.py $(OFILE) $(URL)
-t1:
-	$(PYTHON) m3u8downloader/t1.py
+	$(PYTHON) m3u8downloader/main.py -o $(OFILE) $(URL)
 uwsgi:
 	$(VENV)/bin/uwsgi --processes=2 --threads=4 --wsgi-file=m3u8downloader/main.py --env=PYTHONPATH=. --http=localhost:8082 --disable-logging
 shell:
diff --git a/m3u8downloader/__init__.py b/m3u8downloader/__init__.py
index d3ec452..493f741 100644
--- a/m3u8downloader/__init__.py
+++ b/m3u8downloader/__init__.py
@@ -1 +1 @@
-__version__ = "0.2.0"
+__version__ = "0.3.0"
diff --git a/m3u8downloader/main.py b/m3u8downloader/main.py
index 0c5b9f8..0f012c4 100644
--- a/m3u8downloader/main.py
+++ b/m3u8downloader/main.py
@@ -12,6 +12,7 @@ Features:
 
 from __future__ import print_function, unicode_literals
 
+import argparse
 import sys
 import os
 import os.path
@@ -277,18 +278,16 @@ class M3u8Downloader:
 
 
 def main():
-    try:
-        ofile = sys.argv[1]
-        url = sys.argv[2]
-        if len(sys.argv) > 3:
-            tempdir = sys.argv[3]
-        else:
-            tempdir = get_fullpath('~/.cache/m3u8downloader')
-    except IndexError:
-        logger.error("Usage: m3u8 OUTPUT_FILE URL")
-        sys.exit(1)
+    parser = argparse.ArgumentParser(description="download video at m3u8 url")
+    parser.add_argument('--output', '-o', help='target video filename')
+    parser.add_argument(
+        '--tempdir', default='~/.cache/m3u8downloader',
+        help='temp dir, used to store .ts files before combing them into mp4')
+    parser.add_argument('url', help='the m3u8 url')
+    args = parser.parse_args()
+
     SESSION.headers.update({'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36'})
-    downloader = M3u8Downloader(url, ofile, tempdir)
+    downloader = M3u8Downloader(args.url, args.output, args.tempdir)
     downloader.start()
 
 
diff --git a/setup.py b/setup.py
index 9aebeca..8317316 100644
--- a/setup.py
+++ b/setup.py
@@ -40,15 +40,14 @@ setup(
     author_email="sylecn@gmail.com",
     maintainer="Yuanle Song",
     maintainer_email="sylecn@gmail.com",
-    description="FIXME add description",
+    description="a cli program to download video at m3u8 url",
     long_description=open('README.rst').read(),
     license="GPLv2+",
     url="https://pypi.python.org/pypi/m3u8downloader",
     classifiers=[
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 4 - Beta',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
-        # 'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ]
 )
-- 
GitLab