From fcab19a40ae7a033457e4e521d58b6c4978769c8 Mon Sep 17 00:00:00 2001 From: eggplants Date: Sat, 5 Feb 2022 05:55:04 +0900 Subject: [PATCH 1/2] fix: cli print error message to stderr and specify defaults of url --- waybackpy/cli.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/waybackpy/cli.py b/waybackpy/cli.py index c6b4dc2..5840389 100644 --- a/waybackpy/cli.py +++ b/waybackpy/cli.py @@ -218,7 +218,6 @@ def save_urls_on_file(url_gen: Generator[str, None, None]) -> None: + "will be printed.", ) def main( # pylint: disable=no-value-for-parameter - url: Optional[str], user_agent: str, version: bool, show_license: bool, @@ -226,25 +225,26 @@ def main( # pylint: disable=no-value-for-parameter oldest: bool, json: bool, near: bool, - year: Optional[int], - month: Optional[int], - day: Optional[int], - hour: Optional[int], - minute: Optional[int], save: bool, headers: bool, known_urls: bool, subdomain: bool, file: bool, cdx: bool, - start_timestamp: Optional[str], - end_timestamp: Optional[str], cdx_filter: List[str], - match_type: Optional[str], - gzip: Optional[str], collapse: List[str], - limit: Optional[str], cdx_print: List[str], + url: Optional[str] = None, + year: Optional[int] = None, + month: Optional[int] = None, + day: Optional[int] = None, + hour: Optional[int] = None, + minute: Optional[int] = None, + start_timestamp: Optional[str] = None, + end_timestamp: Optional[str] = None, + match_type: Optional[str] = None, + gzip: Optional[str] = None, + limit: Optional[str] = None, ) -> None: """\b _ _ @@ -276,7 +276,7 @@ def main( # pylint: disable=no-value-for-parameter ).text ) elif url is None: - click.echo("No URL detected. Please provide an URL.") + click.echo("No URL detected. Please provide an URL.", err=True) elif ( not version and not oldest @@ -288,7 +288,8 @@ def main( # pylint: disable=no-value-for-parameter ): click.echo( "Only URL passed, but did not specify what to do with the URL. " - "Use --help flag for help using waybackpy." + "Use --help flag for help using waybackpy.", + err=True, ) elif oldest: availability_api = WaybackMachineAvailabilityAPI(url, user_agent=user_agent) @@ -383,4 +384,4 @@ def main( # pylint: disable=no-value-for-parameter if __name__ == "__main__": - main() + main() # pylint: disable=no-value-for-parameter From d2a3946425ba550a79ad22bae96954024dd8fd2a Mon Sep 17 00:00:00 2001 From: eggplants Date: Sat, 5 Feb 2022 10:12:27 +0900 Subject: [PATCH 2/2] fix: escape banner --- waybackpy/cli.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/waybackpy/cli.py b/waybackpy/cli.py index 5840389..d4ca1b2 100644 --- a/waybackpy/cli.py +++ b/waybackpy/cli.py @@ -250,9 +250,9 @@ def main( # pylint: disable=no-value-for-parameter _ _ | | | | __ ____ _ _ _| |__ __ _ ___| | ___ __ _ _ - \ \ /\ / / _` | | | | '_ \ / _` |/ __| |/ / '_ \| | | | - \ V V / (_| | |_| | |_) | (_| | (__| <| |_) | |_| | - \_/\_/ \__,_|\__, |_.__/ \__,_|\___|_|\_\ .__/ \__, | + \\ \\ /\\ / / _` | | | | '_ \\ / _` |/ __| |/ / '_ \\| | | | + \\ V V / (_| | |_| | |_) | (_| | (__| <| |_) | |_| | + \\_/\\_/ \\__,_|\\__, |_.__/ \\__,_|\\___|_|\\_\\ .__/ \\__, | __/ | | | __/ | |___/ |_| |___/