python-urlopen 0.0.1.3__tar.gz → 0.0.2__tar.gz

{python_urlopen-0.0.1.3 → python_urlopen-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-urlopen
-Version: 0.0.1.3
+Version: 0.0.2
 Summary: Python urlopen wrapper.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-urlopen
 License: MIT

{python_urlopen-0.0.1.3 → python_urlopen-0.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-urlopen"
-version = "0.0.1.3"
+version = "0.0.2"
 description = "Python urlopen wrapper."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"

{python_urlopen-0.0.1.3 → python_urlopen-0.0.2}/urlopen/__init__.py

@@ -2,7 +2,7 @@
 # coding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 1)
+__version__ = (0, 0, 2)
 __all__ = ["urlopen", "download"]
 
 import errno

{python_urlopen-0.0.1.3 → python_urlopen-0.0.2}/urlopen/__main__.py

@@ -2,29 +2,33 @@
 # coding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__doc__ = "python url downloader"
+__doc__ = "python urlopen"
 
 from argparse import ArgumentParser, RawTextHelpFormatter
-
-parser = ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter)
-parser.add_argument("url", nargs="?", help="URL to be downloaded")
-parser.add_argument("-o", "--output-file", help="file path to be downloaded, if omitted, print into stdout")
-parser.add_argument("-r", "--resume", action="store_true", help="skip downloaded data")
-parser.add_argument("-hs", "--headers", help="dictionary of HTTP Headers to send with")
-parser.add_argument("-v", "--version", action="store_true", help="print the current version")
-args = parser.parse_args()
-if args.version:
-    from urlopen import __version__
-    print(".".join(map(str, __version__)))
-    raise SystemExit(0)
-url = args.url
-if not url:
-    parser.parse_args(["-h"])
-
 from collections import deque
 from time import perf_counter
 
-from urlopen import download
+from . import download, __version__
+
+
+def parse_args():
+    parser = ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter)
+
+    parser.add_argument("url", nargs="?", help="URL to be downloaded")
+    parser.add_argument("-o", "--output-file", help="file path to be downloaded, if omitted, print into stdout")
+    parser.add_argument("-r", "--resume", action="store_true", help="skip downloaded data")
+    parser.add_argument("-hs", "--headers", help="dictionary of HTTP Headers to send with")
+    parser.add_argument("-v", "--version", action="store_true", help="print the current version")
+
+    args = parser.parse_args()
+
+    if args.version:
+        print(".".join(map(str, __version__)))
+        raise SystemExit(0)
+
+    if not args.url:
+        parser.parse_args(["-h"])
+
 
 def headers_str_to_dict(headers: str, /) -> dict[str, str]:
     return dict(
@@ -32,6 +36,7 @@ def headers_str_to_dict(headers: str, /) -> dict[str, str]:
         for header in headers.strip("\n").split("\n")
     )
 
+
 def progress(total=None):
     dq: deque[tuple[int, float]] = deque(maxlen=64)
     read_num = 0
@@ -47,7 +52,11 @@ def progress(total=None):
             print(f"\r\x1b[K{read_num} | {speed:.2f} MB/s", end="", flush=True)
         dq.append((read_num, cur_t))
 
+
 def main():
+    args = parse_args()
+    url = args.url
+
     headers = args.headers
     if headers is not None:
         headers = headers_str_to_dict(headers)
@@ -72,10 +81,11 @@ def main():
 
         download(
             url, 
-            stdout, 
+            stdout.buffer, 
             headers=headers, 
         )
 
+
 if __name__ == "__main__":
     main()