pywaybackup 4.1.6__tar.gz → 4.2.0__tar.gz

{pywaybackup-4.1.6/pywaybackup.egg-info → pywaybackup-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pywaybackup
-Version: 4.1.6
+Version: 4.2.0
 Summary: Query and download archive.org as simple as possible.
 Author-email: bitdruid <bitdruid@outlook.com>
 License: MIT License
@@ -26,11 +26,11 @@ License: MIT License
         SOFTWARE.
         
 Project-URL: homepage, https://github.com/bitdruid/python-wayback-machine-downloader
-Requires-Python: <3.14,>=3.8
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ruff
-Requires-Dist: SQLAlchemy==2.0.43
+Requires-Dist: SQLAlchemy==2.0.51
 Requires-Dist: requests==2.32.3
 Requires-Dist: tqdm==4.67.1
 Requires-Dist: python-magic-standalone==0.4.28
@@ -39,7 +39,7 @@ Requires-Dist: python-magic-standalone==0.4.28
 
 [![PyPI](https://img.shields.io/pypi/v/pywaybackup)](https://pypi.org/project/pywaybackup/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/pywaybackup)](https://pypi.org/project/pywaybackup/)
-![Python Version](https://img.shields.io/badge/Python-3.8-blue)
+![Python Version](https://img.shields.io/badge/Python-3.8%2B-blue)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 Downloading archived web pages from the [Wayback Machine](https://archive.org/web/).
@@ -68,6 +68,13 @@ This tool allows you to download content from the Wayback Machine (archive.org).
 2. Run the tool <br>
    `waybackup -h`
 
+### Standalone binary
+
+Prebuilt executables for Windows, Linux and macOS are attached to each [release](https://github.com/bitdruid/python-wayback-machine-downloader/releases). No Python required.
+
+- Run from a terminal with arguments like the pip version: `waybackup -h`
+- Or start it without arguments (e.g. double-click on Windows) to enter **interactive mode** — the tool will prompt you for URL, mode and optional settings.
+
 ### Manual
 
 1. Clone the repository <br>
@@ -155,8 +162,9 @@ output:
 
 ## cli
 
-- `-h`, `--help`: Show the help message and exit.
-- `-v`, `--version`: Show information about the tool and exit.
+- `-h`, `--help`: Show the help message and exit. Version info is shown in the help header.
+
+> **Interactive mode:** running `waybackup` without any arguments in a terminal starts a guided prompt for URL, mode and optional settings. Without a terminal (scripts/cron), the help is printed instead.
 
 #### Required
 
@@ -171,6 +179,8 @@ output:
   Last Version. Gives one folder containing the last version of each file of specified `--range`.
 - **`-f`**, **`--first`**:<br>
   First Version. Gives one folder containing the first version of each file of specified `--range`.
+- **`-s`**, **`--save`**:<br>
+  Save a page to the wayback machine (no download).
 
 #### Optional query parameters
 
@@ -219,7 +229,7 @@ Parameters will change the download behavior for snapshots.
   Set verbosity level. Available levels:
   - `low` (or `quiet`, `minimal`, `min`): Essential output only (same as no flag)
   - `default` (or `normal`, `verbose`): Standard verbose output (default when flag is set)
-  - `high` (or `debug`, `detailed`, `max`): Detailed verbose output
+  - `high` (or `detailed`, `max`): Detailed verbose output
   
   Examples: `--verbose`, `--verbose default`, `--verbose high`, `-v high`
 

{pywaybackup-4.1.6 → pywaybackup-4.2.0}/README.md

@@ -2,7 +2,7 @@
 
 [![PyPI](https://img.shields.io/pypi/v/pywaybackup)](https://pypi.org/project/pywaybackup/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/pywaybackup)](https://pypi.org/project/pywaybackup/)
-![Python Version](https://img.shields.io/badge/Python-3.8-blue)
+![Python Version](https://img.shields.io/badge/Python-3.8%2B-blue)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 Downloading archived web pages from the [Wayback Machine](https://archive.org/web/).
@@ -31,6 +31,13 @@ This tool allows you to download content from the Wayback Machine (archive.org).
 2. Run the tool <br>
    `waybackup -h`
 
+### Standalone binary
+
+Prebuilt executables for Windows, Linux and macOS are attached to each [release](https://github.com/bitdruid/python-wayback-machine-downloader/releases). No Python required.
+
+- Run from a terminal with arguments like the pip version: `waybackup -h`
+- Or start it without arguments (e.g. double-click on Windows) to enter **interactive mode** — the tool will prompt you for URL, mode and optional settings.
+
 ### Manual
 
 1. Clone the repository <br>
@@ -118,8 +125,9 @@ output:
 
 ## cli
 
-- `-h`, `--help`: Show the help message and exit.
-- `-v`, `--version`: Show information about the tool and exit.
+- `-h`, `--help`: Show the help message and exit. Version info is shown in the help header.
+
+> **Interactive mode:** running `waybackup` without any arguments in a terminal starts a guided prompt for URL, mode and optional settings. Without a terminal (scripts/cron), the help is printed instead.
 
 #### Required
 
@@ -134,6 +142,8 @@ output:
   Last Version. Gives one folder containing the last version of each file of specified `--range`.
 - **`-f`**, **`--first`**:<br>
   First Version. Gives one folder containing the first version of each file of specified `--range`.
+- **`-s`**, **`--save`**:<br>
+  Save a page to the wayback machine (no download).
 
 #### Optional query parameters
 
@@ -182,7 +192,7 @@ Parameters will change the download behavior for snapshots.
   Set verbosity level. Available levels:
   - `low` (or `quiet`, `minimal`, `min`): Essential output only (same as no flag)
   - `default` (or `normal`, `verbose`): Standard verbose output (default when flag is set)
-  - `high` (or `debug`, `detailed`, `max`): Detailed verbose output
+  - `high` (or `detailed`, `max`): Detailed verbose output
   
   Examples: `--verbose`, `--verbose default`, `--verbose high`, `-v high`
 

{pywaybackup-4.1.6 → pywaybackup-4.2.0}/pyproject.toml

@@ -10,18 +10,18 @@ packages = ["pywaybackup"]
 [project]
 dependencies = [
     "ruff",
-    "SQLAlchemy==2.0.43",
+    "SQLAlchemy==2.0.51",
     "requests==2.32.3",
     "tqdm==4.67.1",
     "python-magic-standalone==0.4.28",
 ]
 name = "pywaybackup"
-version = "4.1.6"
+version = "4.2.0"
 description = "Query and download archive.org as simple as possible."
 authors = [{ name = "bitdruid", email = "bitdruid@outlook.com" }]
 license = { file = "LICENSE" }
 readme = "README.md"
-requires-python = ">=3.8,<3.14"
+requires-python = ">=3.8"
 
 
 [project.scripts]

{pywaybackup-4.1.6 → pywaybackup-4.2.0}/pywaybackup/PyWayBackup.py

@@ -510,6 +510,7 @@ class PyWayBackup:
         collection = SnapshotCollection()
         collection.close()
         self._csvfile.store_result()
+        db.close_engine()
         self._f_keep()
         vb.fini()
         signal.signal(signal.SIGINT, signal.SIG_IGN)

{pywaybackup-4.1.6 → pywaybackup-4.2.0}/pywaybackup/SnapshotCollection.py

@@ -1,6 +1,6 @@
 import json
 
-from pywaybackup.db import Database, Index, and_, delete, func, or_, select, tuple_, update, waybackup_snapshots
+from pywaybackup.db import Database, and_, delete, func, or_, select, text, tuple_, update, waybackup_snapshots
 from pywaybackup.files import CDXfile, CSVfile
 from pywaybackup.Verbosity import Progressbar
 from pywaybackup.Verbosity import Verbosity as vb
@@ -217,30 +217,35 @@ class SnapshotCollection:
     def _index_snapshots(self):
         """
         Create indexes for the snapshot table.
+
+        Raw DDL instead of sqlalchemy Index objects: Index(...) attaches to the
+        module-global table metadata, which accumulates duplicates when the
+        package is reused in-process (library usage) and breaks create_all().
         """
         # index for filtering last snapshots
         if self._mode_last:
-            idx1 = Index(
-                "idx_waybackup_snapshots_url_origin_timestamp_desc",
-                waybackup_snapshots.url_origin,
-                waybackup_snapshots.timestamp.desc(),
+            self.db.session.execute(
+                text(
+                    "CREATE INDEX IF NOT EXISTS idx_waybackup_snapshots_url_origin_timestamp_desc "
+                    "ON waybackup_snapshots (url_origin, timestamp DESC)"
+                )
             )
-            idx1.create(self.db.session.bind, checkfirst=True)
         # index for filtering first snapshots
         if self._mode_first:
-            idx2 = Index(
-                "idx_waybackup_snapshots_url_origin_timestamp_asc",
-                waybackup_snapshots.url_origin,
-                waybackup_snapshots.timestamp.asc(),
+            self.db.session.execute(
+                text(
+                    "CREATE INDEX IF NOT EXISTS idx_waybackup_snapshots_url_origin_timestamp_asc "
+                    "ON waybackup_snapshots (url_origin, timestamp ASC)"
+                )
             )
-            idx2.create(self.db.session.bind, checkfirst=True)
         # index for skippable snapshots
-        idx3 = Index(
-            "idx_waybackup_snapshots_timestamp_url_origin_response",
-            waybackup_snapshots.timestamp,
-            waybackup_snapshots.url_origin,
+        self.db.session.execute(
+            text(
+                "CREATE INDEX IF NOT EXISTS idx_waybackup_snapshots_timestamp_url_origin_response "
+                "ON waybackup_snapshots (timestamp, url_origin)"
+            )
         )
-        idx3.create(self.db.session.bind, checkfirst=True)
+        self.db.session.commit()
 
     def _filter_snapshots(self):
         """

pywaybackup-4.2.0/pywaybackup/arg_parser.py

@@ -0,0 +1,55 @@
+import argparse
+import sys
+from argparse import RawTextHelpFormatter
+from importlib.metadata import version
+
+from pywaybackup.arg_specs import ARG_GROUPS, ARG_SPECS, EXCLUSIVE_GROUPS
+
+
+class Arguments:
+    def __init__(self):
+        parser = argparse.ArgumentParser(
+            description=f"<<< python-wayback-machine-downloader v{version('pywaybackup')} >>>\nby @bitdruid -> https://github.com/bitdruid",
+            formatter_class=RawTextHelpFormatter,
+        )
+
+        groups = {name: parser.add_argument_group(name) for name in ARG_GROUPS}
+
+        exclusive = {
+            ex_name: groups[ex_meta["parent_group"]].add_mutually_exclusive_group(required=ex_meta["required"])
+            for ex_name, ex_meta in EXCLUSIVE_GROUPS.items()
+        }
+
+        for spec in ARG_SPECS:
+            target = exclusive[spec.exclusive_group] if spec.exclusive_group else groups[spec.group]
+            target.add_argument(*spec.flags, **_argparse_kwargs(spec))
+
+        args = parser.parse_args(args=None if sys.argv[1:] else ["--help"])  # if no arguments are given, print help
+
+        args.silent = False
+        args.debug = True
+
+        self.args = args
+
+    def get_args(self) -> dict:
+        """Returns the parsed arguments as a dictionary."""
+        return vars(self.args)
+
+
+def _argparse_kwargs(spec) -> dict:
+    """Translate an ArgSpec into kwargs for argparse.add_argument()."""
+    kwargs = {"help": spec.help}
+    if spec.action == "store_true":
+        kwargs["action"] = "store_true"
+        kwargs["default"] = bool(spec.default)
+    elif spec.action == "optional_value":
+        kwargs["type"] = spec.type
+        kwargs["nargs"] = "?"
+        kwargs["const"] = spec.const
+        kwargs["metavar"] = spec.metavar
+        kwargs["default"] = spec.default
+    else:
+        kwargs["type"] = spec.type
+        kwargs["metavar"] = spec.metavar
+        kwargs["default"] = spec.default
+    return kwargs

pywaybackup-4.2.0/pywaybackup/arg_specs.py

@@ -0,0 +1,257 @@
+"""
+Single source of truth for waybackup CLI arguments.
+
+Both Arguments (argparse) and Interactive (input prompts) consume this list,
+so a new flag only needs to be added in one place. PyWayBackup.__init__ keeps
+its explicit signature (vscode autocomplete).
+"""
+
+from dataclasses import dataclass
+from typing import Any, List, Optional
+
+
+@dataclass
+class ArgSpec:
+    name: str  # internal key (matches PyWayBackup.__init__ kwarg)
+    flags: List[str]  # CLI flags, e.g. ["-u", "--url"]
+    group: str  # argparse group label
+    help: str  # CLI help text
+    prompt: Optional[str] = None  # interactive prompt label (None = skip in interactive)
+    type: Optional[type] = None  # str / int / None for store_true
+    default: Any = None
+    action: str = "store"  # "store" | "store_true" | "optional_value"
+    const: Any = None  # used when action="optional_value"
+    metavar: str = ""  # argparse metavar; ignored for store_true
+    exclusive_group: Optional[str] = None  # name of a mutex group below
+    advanced: bool = False  # show in interactive only when advanced opts enabled
+
+
+# Mutually exclusive groups, keyed by name. Specs join them via exclusive_group=...
+EXCLUSIVE_GROUPS = {
+    "mode": {"required": True, "parent_group": "required (one exclusive)"},
+}
+
+# argparse groups in display order
+ARG_GROUPS = [
+    "required (one exclusive)",
+    "optional query parameters",
+    "manipulate behavior",
+    "special",
+]
+
+
+ARG_SPECS: List[ArgSpec] = [
+    # required
+    ArgSpec(
+        name="url",
+        flags=["-u", "--url"],
+        group="required (one exclusive)",
+        help="url (with subdir/subdomain) to download",
+        prompt="URL to download (with subdir/subdomain)",
+        type=str,
+    ),
+    ArgSpec(
+        name="all",
+        flags=["-a", "--all"],
+        group="required (one exclusive)",
+        help="download snapshots of all timestamps",
+        action="store_true",
+        default=False,
+        exclusive_group="mode",
+    ),
+    ArgSpec(
+        name="last",
+        flags=["-l", "--last"],
+        group="required (one exclusive)",
+        help="download the last version of each file snapshot",
+        action="store_true",
+        default=False,
+        exclusive_group="mode",
+    ),
+    ArgSpec(
+        name="first",
+        flags=["-f", "--first"],
+        group="required (one exclusive)",
+        help="download the first version of each file snapshot",
+        action="store_true",
+        default=False,
+        exclusive_group="mode",
+    ),
+    ArgSpec(
+        name="save",
+        flags=["-s", "--save"],
+        group="required (one exclusive)",
+        help="save a page to the wayback machine",
+        action="store_true",
+        default=False,
+        exclusive_group="mode",
+    ),
+    # -------------------- optional query --------------------
+    ArgSpec(
+        name="explicit",
+        flags=["-e", "--explicit"],
+        group="optional query parameters",
+        help="search only for the explicit given url",
+        action="store_true",
+        default=False,
+    ),
+    ArgSpec(
+        name="range",
+        flags=["-r", "--range"],
+        group="optional query parameters",
+        help="range in years to search",
+        prompt="Range in years to search",
+        type=int,
+        advanced=True,
+    ),
+    ArgSpec(
+        name="start",
+        flags=["--start"],
+        group="optional query parameters",
+        help="start timestamp format: YYYYMMDDHHMMSS",
+        type=int,
+    ),
+    ArgSpec(
+        name="end",
+        flags=["--end"],
+        group="optional query parameters",
+        help="end timestamp format: YYYYMMDDHHMMSS",
+        type=int,
+    ),
+    ArgSpec(
+        name="limit",
+        flags=["--limit"],
+        group="optional query parameters",
+        help="limit the number of snapshots to download",
+        prompt="Limit number of snapshots",
+        type=int,
+        action="optional_value",
+        const=True,
+        metavar="int",
+        advanced=True,
+    ),
+    ArgSpec(
+        name="filetype",
+        flags=["--filetype"],
+        group="optional query parameters",
+        help="filetypes to download comma separated (js,css,...)",
+        type=str,
+    ),
+    ArgSpec(
+        name="statuscode",
+        flags=["--statuscode"],
+        group="optional query parameters",
+        help="statuscodes to download comma separated (200,404,...)",
+        type=str,
+    ),
+    # behavior
+    ArgSpec(
+        name="output",
+        flags=["-o", "--output"],
+        group="manipulate behavior",
+        help="output for all files - defaults to current directory",
+        prompt="Output directory",
+        type=str,
+        advanced=True,
+    ),
+    ArgSpec(
+        name="metadata",
+        flags=["-m", "--metadata"],
+        group="manipulate behavior",
+        help="change directory for db/cdx/csv/log files",
+        type=str,
+    ),
+    ArgSpec(
+        name="verbose",
+        flags=["-v", "--verbose"],
+        group="manipulate behavior",
+        help="verbosity level: low, default, high (default if flag set without value)",
+        type=str,
+        action="optional_value",
+        const="default",
+    ),
+    ArgSpec(
+        name="log",
+        flags=["--log"],
+        group="manipulate behavior",
+        help="save a log file into the output folder",
+        prompt="Save log file?",
+        action="store_true",
+        default=False,
+        advanced=True,
+    ),
+    ArgSpec(
+        name="progress",
+        flags=["--progress"],
+        group="manipulate behavior",
+        help="show a progress bar",
+        prompt="Show progress bar?",
+        action="store_true",
+        default=False,
+        advanced=True,
+    ),
+    ArgSpec(
+        name="no_redirect",
+        flags=["--no-redirect"],
+        group="manipulate behavior",
+        help="do not follow redirects by archive.org",
+        action="store_true",
+        default=False,
+    ),
+    ArgSpec(
+        name="retry",
+        flags=["--retry"],
+        group="manipulate behavior",
+        help="retry failed downloads (opt tries as int, else infinite)",
+        type=int,
+        default=0,
+    ),
+    ArgSpec(
+        name="workers",
+        flags=["--workers"],
+        group="manipulate behavior",
+        help="number of workers (simultaneous downloads)",
+        prompt="Workers (parallel downloads)",
+        type=int,
+        default=1,
+        advanced=True,
+    ),
+    ArgSpec(
+        name="delay",
+        flags=["--delay"],
+        group="manipulate behavior",
+        help="delay between each download in seconds",
+        type=int,
+        default=0,
+    ),
+    ArgSpec(
+        name="wait",
+        flags=["--wait"],
+        group="manipulate behavior",
+        help="seconds to wait before renewing connection after HTTP errors or snapshot download errors (default: 15)",
+        type=int,
+        default=15,
+    ),
+    # special
+    ArgSpec(
+        name="reset",
+        flags=["--reset"],
+        group="special",
+        help="reset the job and ignore existing cdx/db/csv files",
+        action="store_true",
+        default=False,
+    ),
+    ArgSpec(
+        name="keep",
+        flags=["--keep"],
+        group="special",
+        help="keep all files after the job finished",
+        action="store_true",
+        default=False,
+    ),
+]
+
+
+def default_args() -> dict:
+    """Return a dict of {name: default} for every spec — the canonical empty arg payload."""
+    return {spec.name: spec.default for spec in ARG_SPECS}

{pywaybackup-4.1.6 → pywaybackup-4.2.0}/pywaybackup/db.py

@@ -15,8 +15,7 @@ from sqlalchemy import (  # noqa: F401
     tuple_,
     update,
 )
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import declarative_base, sessionmaker
 from typing import Optional  # python 3.8
 from pywaybackup.Verbosity import Verbosity as vb
 
@@ -95,6 +94,7 @@ class Database:
     dbfile = None
     query_identifier = None
     query_exist = False
+    engine = None
     sessman = sessionmaker()
     query_progress = "0 / 0"
 
@@ -109,9 +109,9 @@ class Database:
         """
         cls.dbfile = dbfile
         cls.query_identifier = query_identifier
-        engine = create_engine(f"sqlite:///{dbfile}")
-        cls.sessman = sessionmaker(bind=engine)
-        Base.metadata.create_all(engine)
+        cls.engine = create_engine(f"sqlite:///{dbfile}")
+        cls.sessman = sessionmaker(bind=cls.engine)
+        Base.metadata.create_all(cls.engine)
 
         db = Database()
         if db.session.execute(
@@ -123,6 +123,19 @@ class Database:
             db.session.execute(insert(waybackup_job).values(query_identifier=query_identifier))
         db.close()
 
+    @classmethod
+    def close_engine(cls):
+        """
+        Dispose of the SQLAlchemy engine and release SQLite file handles.
+
+        Required on Windows before the .db file can be deleted, since the OS
+        holds an exclusive lock on open files. No-op on platforms where this
+        isn't required, and idempotent if called more than once.
+        """
+        if cls.engine is not None:
+            cls.engine.dispose()
+            cls.engine = None
+
     def __init__(self):
         """
         Create a new session.

pywaybackup-4.2.0/pywaybackup/interactive.py

@@ -0,0 +1,144 @@
+"""
+Interactive mode: prompt the user for arguments instead of parsing sys.argv.
+
+Used when waybackup is launched without CLI arguments (e.g. double-clicking
+the Windows .exe). Produces the same dict shape as Arguments.get_args() so
+PyWayBackup(**args) works either way. Argument metadata is read from
+arg_specs.ARG_SPECS so flags only have to be declared in one place.
+"""
+
+from importlib.metadata import version
+
+from pywaybackup.arg_specs import ARG_SPECS, EXCLUSIVE_GROUPS, default_args
+
+
+class Interactive:
+    def __init__(self):
+        print(f"<<< python-wayback-machine-downloader v{version('pywaybackup')} >>>")
+        print("Interactive mode - press Ctrl+C to abort.\n")
+
+        args = default_args()
+
+        # 1. Required URL
+        url_spec = _spec_by_name("url")
+        args["url"] = self._prompt_required(url_spec.prompt or url_spec.help)
+
+        # 2. Required exclusive group(s) — pick exactly one member
+        for ex_name in EXCLUSIVE_GROUPS:
+            members = [s for s in ARG_SPECS if s.exclusive_group == ex_name]
+            choice = self._prompt_choice(
+                ex_name.capitalize(),
+                [(s.name, s.help) for s in members],
+            )
+            for s in members:
+                args[s.name] = s.name == choice
+
+        # 3. Advanced options
+        if self._prompt_yes_no("Configure advanced options?", default=False):
+            for spec in ARG_SPECS:
+                if not spec.advanced:
+                    continue
+                args[spec.name] = self._prompt_for(spec, args[spec.name])
+
+        # internal flags (parity with Arguments.py)
+        args["silent"] = False
+        args["debug"] = True
+
+        self.args = args
+        print()
+
+    def get_args(self) -> dict:
+        return self.args
+
+    def _prompt_for(self, spec, current):
+        label = spec.prompt or spec.help
+        if spec.action == "store_true":
+            return self._prompt_yes_no(f"{label}", default=bool(current))
+        if spec.type is int:
+            if current is None:
+                return self._prompt_optional_int(label)
+            return self._prompt_int(label, default=current)
+        if current is None:
+            return self._prompt_optional_str(label)
+        return self._prompt_str(label, default=current)
+
+    @staticmethod
+    def _prompt_required(label):
+        while True:
+            value = input(f"{label}: ").strip()
+            if value:
+                return value
+            print("  (required, please enter a value)")
+
+    @staticmethod
+    def _prompt_optional_str(label):
+        value = input(f"{label} (blank to skip): ").strip()
+        return value or None
+
+    @staticmethod
+    def _prompt_str(label, default):
+        value = input(f"{label} [{default}]: ").strip()
+        return value if value else default
+
+    @staticmethod
+    def _prompt_optional_int(label):
+        while True:
+            value = input(f"{label} (blank to skip): ").strip()
+            if not value:
+                return None
+            try:
+                return int(value)
+            except ValueError:
+                print("  (please enter an integer or leave blank)")
+
+    @staticmethod
+    def _prompt_int(label, default):
+        while True:
+            value = input(f"{label} [{default}]: ").strip()
+            if not value:
+                return default
+            try:
+                return int(value)
+            except ValueError:
+                print("  (please enter an integer)")
+
+    @staticmethod
+    def _prompt_yes_no(label, default):
+        suffix = "[Y/n]" if default else "[y/N]"
+        while True:
+            value = input(f"{label} {suffix}: ").strip().lower()
+            if not value:
+                return default
+            if value in ("y", "yes"):
+                return True
+            if value in ("n", "no"):
+                return False
+            print("  (please answer y or n)")
+
+    @staticmethod
+    def _prompt_choice(label, options):
+        # use first letter of each name as key, fall back to position number on collision
+        keys = []
+        used = set()
+        for name, _ in options:
+            k = name[0]
+            if k in used:
+                k = str(len(keys) + 1)
+            keys.append(k)
+            used.add(k)
+        print(f"\n{label}:")
+        for k, (name, desc) in zip(keys, options):
+            print(f"  [{k}] {name}: {desc}")
+        valid = dict(zip(keys, [name for name, _ in options]))
+        while True:
+            value = input("Choice: ").strip().lower()
+            if value in valid:
+                return valid[value]
+            print(f"  (please enter one of: {', '.join(sorted(valid))})")
+
+
+def _spec_by_name(name):
+    for s in ARG_SPECS:
+        if s.name == name:
+            return s
+    raise KeyError(name)

pywaybackup-4.2.0/pywaybackup/main.py

@@ -0,0 +1,32 @@
+import signal
+import sys
+
+from pywaybackup import PyWayBackup
+from pywaybackup.arg_parser import Arguments
+from pywaybackup.interactive import Interactive
+
+
+def cli():
+    # interactive only when launched with no args; scripts/cron without a tty get --help instead
+    interactive = len(sys.argv) <= 1 and sys.stdin is not None and sys.stdin.isatty()
+    try:
+        cli_input = Interactive() if interactive else Arguments()
+    except (KeyboardInterrupt, EOFError):
+        # ignore pyinstaller bl SIGINT while aborting
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+        print("\nAborted.")
+        sys.exit(130)
+    cli_args = cli_input.get_args()
+    config = PyWayBackup(**cli_args)
+    try:
+        config.run(daemon=False)
+    finally:
+        if interactive:
+            try:
+                input("\nPress Enter to exit...")
+            except (KeyboardInterrupt, EOFError):
+                pass
+
+
+if __name__ == "__main__":
+    cli()

{pywaybackup-4.1.6 → pywaybackup-4.2.0/pywaybackup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pywaybackup
-Version: 4.1.6
+Version: 4.2.0
 Summary: Query and download archive.org as simple as possible.
 Author-email: bitdruid <bitdruid@outlook.com>
 License: MIT License
@@ -26,11 +26,11 @@ License: MIT License
         SOFTWARE.
         
 Project-URL: homepage, https://github.com/bitdruid/python-wayback-machine-downloader
-Requires-Python: <3.14,>=3.8
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ruff
-Requires-Dist: SQLAlchemy==2.0.43
+Requires-Dist: SQLAlchemy==2.0.51
 Requires-Dist: requests==2.32.3
 Requires-Dist: tqdm==4.67.1
 Requires-Dist: python-magic-standalone==0.4.28
@@ -39,7 +39,7 @@ Requires-Dist: python-magic-standalone==0.4.28
 
 [![PyPI](https://img.shields.io/pypi/v/pywaybackup)](https://pypi.org/project/pywaybackup/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/pywaybackup)](https://pypi.org/project/pywaybackup/)
-![Python Version](https://img.shields.io/badge/Python-3.8-blue)
+![Python Version](https://img.shields.io/badge/Python-3.8%2B-blue)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 Downloading archived web pages from the [Wayback Machine](https://archive.org/web/).
@@ -68,6 +68,13 @@ This tool allows you to download content from the Wayback Machine (archive.org).
 2. Run the tool <br>
    `waybackup -h`
 
+### Standalone binary
+
+Prebuilt executables for Windows, Linux and macOS are attached to each [release](https://github.com/bitdruid/python-wayback-machine-downloader/releases). No Python required.
+
+- Run from a terminal with arguments like the pip version: `waybackup -h`
+- Or start it without arguments (e.g. double-click on Windows) to enter **interactive mode** — the tool will prompt you for URL, mode and optional settings.
+
 ### Manual
 
 1. Clone the repository <br>
@@ -155,8 +162,9 @@ output:
 
 ## cli
 
-- `-h`, `--help`: Show the help message and exit.
-- `-v`, `--version`: Show information about the tool and exit.
+- `-h`, `--help`: Show the help message and exit. Version info is shown in the help header.
+
+> **Interactive mode:** running `waybackup` without any arguments in a terminal starts a guided prompt for URL, mode and optional settings. Without a terminal (scripts/cron), the help is printed instead.
 
 #### Required
 
@@ -171,6 +179,8 @@ output:
   Last Version. Gives one folder containing the last version of each file of specified `--range`.
 - **`-f`**, **`--first`**:<br>
   First Version. Gives one folder containing the first version of each file of specified `--range`.
+- **`-s`**, **`--save`**:<br>
+  Save a page to the wayback machine (no download).
 
 #### Optional query parameters
 
@@ -219,7 +229,7 @@ Parameters will change the download behavior for snapshots.
   Set verbosity level. Available levels:
   - `low` (or `quiet`, `minimal`, `min`): Essential output only (same as no flag)
   - `default` (or `normal`, `verbose`): Standard verbose output (default when flag is set)
-  - `high` (or `debug`, `detailed`, `max`): Detailed verbose output
+  - `high` (or `detailed`, `max`): Detailed verbose output
   
   Examples: `--verbose`, `--verbose default`, `--verbose high`, `-v high`
 

{pywaybackup-4.1.6 → pywaybackup-4.2.0}/pywaybackup.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-pywaybackup/Arguments.py
 pywaybackup/Exception.py
 pywaybackup/PyWayBackup.py
 pywaybackup/Snapshot.py
@@ -11,9 +10,12 @@ pywaybackup/Worker.py
 pywaybackup/__init__.py
 pywaybackup/archive_download.py
 pywaybackup/archive_save.py
+pywaybackup/arg_parser.py
+pywaybackup/arg_specs.py
 pywaybackup/db.py
 pywaybackup/files.py
 pywaybackup/helper.py
+pywaybackup/interactive.py
 pywaybackup/main.py
 pywaybackup.egg-info/PKG-INFO
 pywaybackup.egg-info/SOURCES.txt

{pywaybackup-4.1.6 → pywaybackup-4.2.0}/pywaybackup.egg-info/requires.txt

@@ -1,5 +1,5 @@
 ruff
-SQLAlchemy==2.0.43
+SQLAlchemy==2.0.51
 requests==2.32.3
 tqdm==4.67.1
 python-magic-standalone==0.4.28

pywaybackup-4.1.6/pywaybackup/Arguments.py

@@ -1,71 +0,0 @@
-import sys
-import argparse
-
-from argparse import RawTextHelpFormatter
-
-from importlib.metadata import version
-
-
-class Arguments:
-    def __init__(self):
-        parser = argparse.ArgumentParser(
-            description=f"<<< python-wayback-machine-downloader v{version('pywaybackup')} >>>\nby @bitdruid -> https://github.com/bitdruid",
-            formatter_class=RawTextHelpFormatter,
-        )
-
-        required = parser.add_argument_group("required (one exclusive)")
-        required.add_argument("-u", "--url", type=str, metavar="", help="url (with subdir/subdomain) to download")
-        exclusive_required = required.add_mutually_exclusive_group(required=True)
-        exclusive_required.add_argument("-a", "--all", action="store_true", help="download snapshots of all timestamps")
-        exclusive_required.add_argument("-l", "--last", action="store_true", help="download the last version of each file snapshot")
-        exclusive_required.add_argument("-f", "--first", action="store_true", help="download the first version of each file snapshot")
-        exclusive_required.add_argument("-s", "--save", action="store_true", help="save a page to the wayback machine")
-
-        optional = parser.add_argument_group("optional query parameters")
-        optional.add_argument("-e", "--explicit", action="store_true", help="search only for the explicit given url")
-        optional.add_argument("-r", "--range", type=int, metavar="", help="range in years to search")
-        optional.add_argument("--start", type=int, metavar="", help="start timestamp format: YYYYMMDDHHMMSS")
-        optional.add_argument("--end", type=int, metavar="", help="end timestamp format: YYYYMMDDHHMMSS")
-        optional.add_argument("--limit", type=int, nargs="?", const=True, metavar="int", help="limit the number of snapshots to download")
-        optional.add_argument("--filetype", type=str, metavar="", help="filetypes to download comma separated (js,css,...)")
-        optional.add_argument("--statuscode", type=str, metavar="", help="statuscodes to download comma separated (200,404,...)")
-
-        behavior = parser.add_argument_group("manipulate behavior")
-        behavior.add_argument("-o", "--output", type=str, metavar="", help="output for all files - defaults to current directory")
-        behavior.add_argument("-m", "--metadata", type=str, metavar="", help="change directory for db/cdx/csv/log files")
-        behavior.add_argument(
-            "-v", "--verbose",
-            type=str,
-            nargs="?",
-            const="default",
-            metavar="",
-            help="verbosity level: low, default, high (default if flag set without value)",
-        )
-        behavior.add_argument("--log", action="store_true", help="save a log file into the output folder")
-        behavior.add_argument("--progress", action="store_true", help="show a progress bar")
-        behavior.add_argument("--no-redirect", action="store_true", help="do not follow redirects by archive.org")
-        behavior.add_argument("--retry", type=int, default=0, metavar="", help="retry failed downloads (opt tries as int, else infinite)")
-        behavior.add_argument("--workers", type=int, default=1, metavar="", help="number of workers (simultaneous downloads)")
-        behavior.add_argument("--delay", type=int, default=0, metavar="", help="delay between each download in seconds")
-        behavior.add_argument(
-            "--wait",
-            type=int,
-            default=15,
-            metavar="",
-            help="seconds to wait before renewing connection after HTTP errors or snapshot download errors (default: 15)",
-        )
-
-        special = parser.add_argument_group("special")
-        special.add_argument("--reset", action="store_true", help="reset the job and ignore existing cdx/db/csv files")
-        special.add_argument("--keep", action="store_true", help="keep all files after the job finished")
-
-        args = parser.parse_args(args=None if sys.argv[1:] else ["--help"])  # if no arguments are given, print help
-
-        args.silent = False
-        args.debug = True
-
-        self.args = args
-
-    def get_args(self) -> dict:
-        """Returns the parsed arguments as a dictionary."""
-        return vars(self.args)

pywaybackup-4.1.6/pywaybackup/main.py

@@ -1,13 +0,0 @@
-from pywaybackup import PyWayBackup
-from pywaybackup.Arguments import Arguments as args
-
-
-def cli():
-    cli_input = args()
-    cli_args = cli_input.get_args()
-    config = PyWayBackup(**cli_args)
-    config.run(daemon=False)
-
-
-if __name__ == "__main__":
-    cli()