python-download 0.0.1__tar.gz → 0.0.1.1__tar.gz

{python_download-0.0.1 → python_download-0.0.1.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: python-download
-Version: 0.0.1
-Summary: Python functions for download.
+Version: 0.0.1.1
+Summary: Python for download.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-download
 License: MIT
-Keywords: python-download,posixpath
+Keywords: download
 Author: ChenyangGao
 Author-email: wosiwujm@gmail.com
 Requires-Python: >=3.11,<4.0
@@ -32,7 +32,7 @@ Requires-Dist: requests_request
 Project-URL: Repository, https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-download
 Description-Content-Type: text/markdown
 
-# Python functions for download..
+# Python for download..
 
 ## Installation
 
@@ -44,7 +44,31 @@ pip install -U python-download
 
 ## Usage
 
+### Module
+
 ```python
 import download
 ```
 
+### Command
+
+```console
+$ python -m urlopen -h
+usage: python-download [-h] [-d SAVEDIR] [-r] [-hs HEADERS] [-rq] [-v] [url]
+
+python url downloader
+
+positional arguments:
+  url                   URL(s) to be downloaded (one URL per line), if omitted, read from stdin
+
+options:
+  -h, --help            show this help message and exit
+  -d SAVEDIR, --savedir SAVEDIR
+                        path to the downloaded file
+  -r, --resume          skip downloaded data
+  -hs HEADERS, --headers HEADERS
+                        dictionary of HTTP Headers to send with
+  -rq, --use-requests   use `requests` module
+  -v, --version         print the current version
+```
+

{python_download-0.0.1 → python_download-0.0.1.1}/download/__init__.py

@@ -26,7 +26,7 @@ from os import fsdecode, fstat, makedirs, PathLike
 from os.path import abspath, dirname, isdir, join as joinpath
 from shutil import COPY_BUFSIZE # type: ignore
 from threading import Event
-from typing import cast, Any, NamedTuple, Optional, Self
+from typing import cast, Any, NamedTuple, Self
 
 from aiohttp_client_request import request as aiohttp_request
 from asynctools import ensure_async, as_thread
@@ -72,6 +72,7 @@ class DownloadProgress(NamedTuple):
         return self.completed >= self.total
 
 
+# TODO 设计一个 AsyncDownloadTask
 class DownloadTask:
 
     def __init__(self, /, gen, submit=run_as_thread):
@@ -83,7 +84,12 @@ class DownloadTask:
         self._done_event = Event()
 
     def __repr__(self, /) -> str:
-        return f"<{type(self).__qualname__} :: state={self.state!r} progress={self.progress!r}>"
+        match state := self.state:
+            case "FINISHED":
+                return f"<{type(self).__qualname__} :: state={state!r} result={self.result} progress={self.progress!r}>"
+            case "FAILED":
+                return f"<{type(self).__qualname__} :: state={state!r} reason={self.result} progress={self.progress!r}>"
+        return f"<{type(self).__qualname__} :: state={state!r} progress={self.progress!r}>"
 
     @classmethod
     def create_task(
@@ -100,7 +106,7 @@ class DownloadTask:
         return self._state in ("CANCELED", "FAILED", "FINISHED")
 
     @property
-    def progress(self, /) -> Optional[DownloadProgress]:
+    def progress(self, /) -> None | DownloadProgress:
         return self.__dict__.get("_progress")
 
     @property

{python_download-0.0.1 → python_download-0.0.1.1}/download/__main__.py

@@ -15,7 +15,7 @@ from . import download, requests_download, __version__
 
 def parse_args():
     parser = ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter)
-    parser.add_argument("urls", metavar="url", nargs="?", help="URL(s) to be downloaded (one URL per line), if omitted, read from stdin")
+    parser.add_argument("urls", metavar="url", nargs="*", help="URL(s) to be downloaded, if omitted, read from stdin (one URL per line)")
     parser.add_argument("-d", "--savedir", default="", help="path to the downloaded file")
     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")
@@ -55,7 +55,7 @@ def main():
     args = parse_args()
 
     if args.urls:
-        urls = args.urls.splitlines()
+        urls = args.urls
     else:
         from sys import stdin
         urls = (l.removesuffix("\n") for l in stdin)
@@ -85,7 +85,7 @@ def main():
                     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:
+            except Exception 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

{python_download-0.0.1 → python_download-0.0.1.1}/pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "python-download"
-version = "0.0.1"
-description = "Python functions for download."
+version = "0.0.1.1"
+description = "Python for download."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
 readme = "readme.md"
 homepage = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-download"
 repository = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-download"
-keywords = ["python-download", "posixpath"]
+keywords = ["download"]
 classifiers = [
     "License :: OSI Approved :: MIT License",
     "Development Status :: 5 - Production/Stable",

python_download-0.0.1.1/readme.md

@@ -0,0 +1,39 @@
+# Python for download..
+
+## Installation
+
+You can install from [pypi](https://pypi.org/project/python-download/)
+
+```console
+pip install -U python-download
+```
+
+## Usage
+
+### Module
+
+```python
+import download
+```
+
+### Command
+
+```console
+$ python -m urlopen -h
+usage: python-download [-h] [-d SAVEDIR] [-r] [-hs HEADERS] [-rq] [-v] [url]
+
+python url downloader
+
+positional arguments:
+  url                   URL(s) to be downloaded (one URL per line), if omitted, read from stdin
+
+options:
+  -h, --help            show this help message and exit
+  -d SAVEDIR, --savedir SAVEDIR
+                        path to the downloaded file
+  -r, --resume          skip downloaded data
+  -hs HEADERS, --headers HEADERS
+                        dictionary of HTTP Headers to send with
+  -rq, --use-requests   use `requests` module
+  -v, --version         print the current version
+```

python_download-0.0.1/readme.md

@@ -1,15 +0,0 @@
-# Python functions for download..
-
-## Installation
-
-You can install from [pypi](https://pypi.org/project/python-download/)
-
-```console
-pip install -U python-download
-```
-
-## Usage
-
-```python
-import download
-```