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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-urlopen
-Version: 0.0.1.2
+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.2 → python_urlopen-0.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-urlopen"
-version = "0.0.1.2"
+version = "0.0.2"
 description = "Python urlopen wrapper."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -30,6 +30,10 @@ python = "^3.10"
 http_response = "*"
 python-filewrap = "*"
 
+[tool.poetry.scripts]
+python-urlopen = "urlopen.__main__:main"
+urlopen = "urlopen.__main__:main"
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

{python_urlopen-0.0.1.2 → 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.2/urlopen/__main__.py

@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+# coding: utf-8
+
+__author__ = "ChenyangGao <https://chenyanggao.github.io>"
+__doc__ = "python urlopen"
+
+from argparse import ArgumentParser, RawTextHelpFormatter
+from collections import deque
+from time import perf_counter
+
+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(
+        header.split(": ", 1) 
+        for header in headers.strip("\n").split("\n")
+    )
+
+
+def progress(total=None):
+    dq: deque[tuple[int, float]] = deque(maxlen=64)
+    read_num = 0
+    dq.append((read_num, perf_counter()))
+    while True:
+        read_num += yield
+        cur_t = perf_counter()
+        speed = (read_num - dq[0][0]) / 1024 / 1024 / (cur_t - dq[0][1])
+        if total:
+            percentage = read_num / total * 100
+            print(f"\r\x1b[K{read_num} / {total} | {speed:.2f} MB/s | {percentage:.2f} %", end="", flush=True)
+        else:
+            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)
+
+    output_file = args.output_file
+    if output_file:
+        from os.path import dirname
+        dir_ = dirname(output_file)
+        if dir_:
+            from os import makedirs
+            makedirs(dir_, exist_ok=True)
+
+        download(
+            url, 
+            output_file, 
+            resume=args.resume, 
+            make_reporthook=progress, 
+            headers=headers, 
+        )
+    else: 
+        from sys import stdout
+
+        download(
+            url, 
+            stdout.buffer, 
+            headers=headers, 
+        )
+
+
+if __name__ == "__main__":
+    main()
+

python_urlopen-0.0.1.2/urlopen/__main__.py

@@ -1,79 +0,0 @@
-#!/usr/bin/env python3
-# coding: utf-8
-
-__author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__doc__ = "python url downloader"
-
-from argparse import ArgumentParser, RawTextHelpFormatter
-
-parser = ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter)
-parser.add_argument("urls", nargs="*", metavar="url", help="URL(s) to be downloaded (one URL per line), if omitted, read from stdin")
-parser.add_argument("-d", "--savedir", default="", help="directory to the downloading files")
-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)
-
-from collections import deque
-from os import makedirs
-from time import perf_counter
-
-from urlopen import download
-
-def headers_str_to_dict(headers: str, /) -> dict[str, str]:
-    return dict(
-        header.split(": ", 1) 
-        for header in headers.strip("\n").split("\n")
-    )
-
-def progress(total=None):
-    dq: deque[tuple[int, float]] = deque(maxlen=64)
-    read_num = 0
-    dq.append((read_num, perf_counter()))
-    while True:
-        read_num += yield
-        cur_t = perf_counter()
-        speed = (read_num - dq[0][0]) / 1024 / 1024 / (cur_t - dq[0][1])
-        if total:
-            percentage = read_num / total * 100
-            print(f"\r\x1b[K{read_num} / {total} | {speed:.2f} MB/s | {percentage:.2f} %", end="", flush=True)
-        else:
-            print(f"\r\x1b[K{read_num} | {speed:.2f} MB/s", end="", flush=True)
-        dq.append((read_num, cur_t))
-
-urls = args.urls
-if not urls:
-    from sys import stdin
-    urls = (l.removesuffix("\n") for l in stdin)
-savedir = args.savedir
-if savedir:
-    makedirs(savedir, exist_ok=True)
-
-try:
-    headers = args.headers
-    if headers is not None:
-        headers = headers_str_to_dict(headers)
-    for url in urls:
-        if not url:
-            continue
-        try:
-            file = download(
-                url, 
-                savedir, 
-                resume=args.resume, 
-                make_reporthook=progress, 
-                headers=headers, 
-            )
-            print(f"\r\x1b[K\x1b[1;32mDOWNLOADED\x1b[0m \x1b[4;34m{url!r}\x1b[0m\n |_ ⏬ \x1b[4;34m{file!r}\x1b[0m")
-        except BaseException as e:
-            print(f"\r\x1b[K\x1b[1;31mERROR\x1b[0m \x1b[4;34m{url!r}\x1b[0m\n  |_ 🙅 \x1b[1;31m{type(e).__qualname__}\x1b[0m: {e}")
-except (EOFError, KeyboardInterrupt):
-    pass
-except BrokenPipeError:
-    from sys import stderr
-    stderr.close()
-