zipline-cli 0.2.2__tar.gz → 0.3.0__tar.gz

{zipline_cli-0.2.2/src/zipline_cli.egg-info → zipline_cli-0.3.0}/PKG-INFO

@@ -1,31 +1,31 @@
 Metadata-Version: 2.4
 Name: zipline-cli
-Version: 0.2.2
+Version: 0.3.0
 Summary: Python 3 CLI File Uploader for Diced/Zipline v3/v4 Upload Server and Django Files.
 Author: Shane
 License: MIT License
-Project-URL: GitHub, https://github.com/cssnr/zipline-cli
-Project-URL: Issues, https://github.com/cssnr/zipline-cli/issues
 Project-URL: Changelog, https://github.com/cssnr/zipline-cli/releases
+Project-URL: Discord, https://discord.gg/wXy6m2X8wY
 Project-URL: Documentation, https://zipline-cli.cssnr.com/
-Project-URL: Homepage, https://cssnr.com/
 Project-URL: Funding, https://ko-fi.com/cssnr
-Project-URL: Discord, https://discord.gg/wXy6m2X8wY
+Project-URL: GitHub, https://github.com/cssnr/zipline-cli
+Project-URL: Homepage, https://cssnr.com/
+Project-URL: Issues, https://github.com/cssnr/zipline-cli/issues
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Typing :: Typed
 Classifier: Topic :: Communications :: File Sharing
 Classifier: Topic :: Terminals
+Classifier: Typing :: Typed
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: python-decouple
 Requires-Dist: python-dotenv
-Requires-Dist: requests
+Requires-Dist: requests<3,>=2
+Requires-Dist: typer
 Dynamic: license-file
 
 [![PyPI Version](https://img.shields.io/pypi/v/zipline-cli?logo=pypi&logoColor=white&label=pypi)](https://pypi.org/project/zipline-cli/)
@@ -55,7 +55,7 @@ Dynamic: license-file
 # Zipline CLI
 
 <a title="Zipline CLI" href="https://zipline-cli.cssnr.com/" target="_blank">
-<img alt="Zipline CLI" align="right" width="128" height="auto" src="https://raw.githubusercontent.com/smashedr/repo-images/refs/heads/master/zipline/cli/logo128.png"></a>
+<img alt="Zipline CLI" align="right" width="128" height="auto" src="https://zipline-cli.cssnr.com/assets/images/logo.png"></a>
 
 - [Quick Start](#quick-start)
 - [Install](#install)
@@ -75,6 +75,11 @@ Python 3 CLI File Uploader for [Diced/Zipline](https://github.com/diced/zipline)
 > You can also [request new features](https://github.com/cssnr/zipline-cli/discussions/new?category=feature-requests)
 > or report any [issues](https://github.com/cssnr/zipline-cli/issues/new).
 
+> [!IMPORTANT]  
+> A new app is in progress which supports ShareX Configurations.  
+> All new features will be added to this app.  
+> Please [let us know](https://github.com/cssnr/zipline-cli/discussions/new?category=feature-requests) what you want to see...
+
 ## Quick Start<a id="quick-start"></a>
 
 ```shell
@@ -153,13 +158,11 @@ Environment Variables are stored in the `.zipline` file in your home directory.
 
 - Location: `~/.zipline` or `$HOME/.zipline`
 
-| Variable         | Description                                                                                                                                                                                      |
-| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `ZIPLINE_URL`    | URL to your Zipline Instance                                                                                                                                                                     |
-| `ZIPLINE_TOKEN`  | Authorization Token from Zipline                                                                                                                                                                 |
-| `ZIPLINE_EMBED`  | Set this enable Embed on your uploads                                                                                                                                                            |
-| `ZIPLINE_FORMAT` | Output Format. Variables: `{filename}`, `{url}` and `{raw_url}`                                                                                                                                  |
-| `ZIPLINE_EXPIRE` | Reference: [Zipline](https://zipline.diced.sh/docs/guides/upload-options#image-expiration) / [Django Files](https://github.com/onegreyonewhite/pytimeparse2#pytimeparse2-time-expression-parser) |
+| Variable         | Description                                                     |
+| ---------------- | --------------------------------------------------------------- |
+| `ZIPLINE_URL`    | URL to your Zipline Instance                                    |
+| `ZIPLINE_TOKEN`  | Authorization Token from Zipline                                |
+| `ZIPLINE_FORMAT` | Output Format. Variables: `{filename}`, `{url}` and `{raw_url}` |
 
 See [.zipline.example](.zipline.example) for an example `.zipline` file.
 

{zipline_cli-0.2.2 → zipline_cli-0.3.0}/README.md

@@ -25,7 +25,7 @@
 # Zipline CLI
 
 <a title="Zipline CLI" href="https://zipline-cli.cssnr.com/" target="_blank">
-<img alt="Zipline CLI" align="right" width="128" height="auto" src="https://raw.githubusercontent.com/smashedr/repo-images/refs/heads/master/zipline/cli/logo128.png"></a>
+<img alt="Zipline CLI" align="right" width="128" height="auto" src="https://zipline-cli.cssnr.com/assets/images/logo.png"></a>
 
 - [Quick Start](#quick-start)
 - [Install](#install)
@@ -45,6 +45,11 @@ Python 3 CLI File Uploader for [Diced/Zipline](https://github.com/diced/zipline)
 > You can also [request new features](https://github.com/cssnr/zipline-cli/discussions/new?category=feature-requests)
 > or report any [issues](https://github.com/cssnr/zipline-cli/issues/new).
 
+> [!IMPORTANT]  
+> A new app is in progress which supports ShareX Configurations.  
+> All new features will be added to this app.  
+> Please [let us know](https://github.com/cssnr/zipline-cli/discussions/new?category=feature-requests) what you want to see...
+
 ## Quick Start<a id="quick-start"></a>
 
 ```shell
@@ -123,13 +128,11 @@ Environment Variables are stored in the `.zipline` file in your home directory.
 
 - Location: `~/.zipline` or `$HOME/.zipline`
 
-| Variable         | Description                                                                                                                                                                                      |
-| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `ZIPLINE_URL`    | URL to your Zipline Instance                                                                                                                                                                     |
-| `ZIPLINE_TOKEN`  | Authorization Token from Zipline                                                                                                                                                                 |
-| `ZIPLINE_EMBED`  | Set this enable Embed on your uploads                                                                                                                                                            |
-| `ZIPLINE_FORMAT` | Output Format. Variables: `{filename}`, `{url}` and `{raw_url}`                                                                                                                                  |
-| `ZIPLINE_EXPIRE` | Reference: [Zipline](https://zipline.diced.sh/docs/guides/upload-options#image-expiration) / [Django Files](https://github.com/onegreyonewhite/pytimeparse2#pytimeparse2-time-expression-parser) |
+| Variable         | Description                                                     |
+| ---------------- | --------------------------------------------------------------- |
+| `ZIPLINE_URL`    | URL to your Zipline Instance                                    |
+| `ZIPLINE_TOKEN`  | Authorization Token from Zipline                                |
+| `ZIPLINE_FORMAT` | Output Format. Variables: `{filename}`, `{url}` and `{raw_url}` |
 
 See [.zipline.example](.zipline.example) for an example `.zipline` file.
 

{zipline_cli-0.2.2 → zipline_cli-0.3.0}/pyproject.toml

@@ -3,80 +3,66 @@
 [project]
 name = "zipline-cli"
 description = "Python 3 CLI File Uploader for Diced/Zipline v3/v4 Upload Server and Django Files."
-authors = [{ name="Shane" }]
 readme = "README.md"
-dynamic = ["version"]
 requires-python = ">=3.9"
+license = { text = "MIT License" }
+authors = [{ name = "Shane" }]
 classifiers = [
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3 :: Only",
-    "Operating System :: OS Independent",
-    "License :: OSI Approved :: MIT License",
-    "Natural Language :: English",
-    "Typing :: Typed",
-    "Topic :: Communications :: File Sharing",
-    "Topic :: Terminals",
+  "License :: OSI Approved :: MIT License",
+  "Natural Language :: English",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3 :: Only",
+  "Topic :: Communications :: File Sharing",
+  "Topic :: Terminals",
+  "Typing :: Typed",
 ]
-license = { text = "MIT License" }
-#license = { file = "LICENSE" }
-
 dependencies = [
-    "python-decouple",
-    "python-dotenv",
-    "requests",
-]
-
-[dependency-groups]
-dev = [
-    "bandit",
-    "black",
-    "build",
-    "isort",
-    "mypy",
-    "python-decouple-typed",
-    "psycopg2",
-    "ruff",
-    "setuptools",
-    "ty",
-    "types-psycopg2",
-    "types-requests",
-    "validate-pyproject[all]",
-    "wheel",
+  "python-dotenv",
+  "requests>=2,<3",
+  "typer",
 ]
-
-[project.scripts]
-zipline = "zipline.zipline:main"
+dynamic = ["version"]
+# license = { file = "LICENSE" }
 
 [project.urls]
-GitHub = "https://github.com/cssnr/zipline-cli"
-Issues = "https://github.com/cssnr/zipline-cli/issues"
 Changelog = "https://github.com/cssnr/zipline-cli/releases"
+Discord = "https://discord.gg/wXy6m2X8wY"
 Documentation = "https://zipline-cli.cssnr.com/"
-
-Homepage = "https://cssnr.com/"
 Funding = "https://ko-fi.com/cssnr"
-Discord = "https://discord.gg/wXy6m2X8wY"
-
-# Setup Tools
-# https://setuptools.pypa.io/en/latest/
-#[tool.setuptools.package-data]
-#actions = ["py.typed"]
-[tool.setuptools.dynamic]
-version = { attr = "zipline.__version__" }
-#version = {file = "version.txt"}
+GitHub = "https://github.com/cssnr/zipline-cli"
+Homepage = "https://cssnr.com/"
+Issues = "https://github.com/cssnr/zipline-cli/issues"
 
-[tool.setuptools]
-py-modules = ["zipline"]
-include-package-data = true
+[project.scripts]
+zipline = "zipline.cli:app"
 
-[tool.setuptools.packages.find]
-where = ["src"]
+[dependency-groups]
+dev = [
+  "bandit",
+  "black",
+  "build",
+  "isort",
+  "mypy",
+  "psycopg2",
+  "python-dotenv",
+  "requests",
+  "ruff",
+  "setuptools",
+  "tombi",
+  "ty",
+  "typer",
+  "types-psycopg2",
+  "types-requests",
+  "validate-pyproject[all]",
+  "wheel",
+]
 
 # Build System
 [build-system]
-build-backend = "setuptools.build_meta"
 requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
 
 # Bandit
 # https://bandit.readthedocs.io/en/latest/config.html
@@ -107,7 +93,7 @@ skip = ["venv", ".github"]
 # Mypy
 # https://mypy.readthedocs.io/en/stable/config_file.html
 [tool.mypy]
-#ignore_missing_imports = true
+# ignore_missing_imports = true
 exclude = ["venv"]
 
 # Ruff
@@ -119,3 +105,19 @@ extend-exclude = [".github"]
 
 [tool.ruff.lint]
 select = ["E4", "E7", "E9", "F", "B", "Q"]
+
+# Setup Tools
+# https://setuptools.pypa.io/en/latest/
+[tool.setuptools]
+py-modules = ["zipline"]
+include-package-data = true
+
+[tool.setuptools.package-data]
+zipline = ["py.typed"]
+
+[tool.setuptools.dynamic]
+version = { attr = "zipline._version.__version__" }
+# version = {file = "version.txt"}
+
+[tool.setuptools.packages.find]
+where = ["src"]

zipline_cli-0.3.0/src/zipline/__init__.py

@@ -0,0 +1,10 @@
+"""
+██████ ▄▄ ▄▄▄▄  ▄▄    ▄▄ ▄▄  ▄▄ ▄▄▄▄▄   ▄█████ ██     ██
+ ▄▄▀▀  ██ ██▄█▀ ██    ██ ███▄██ ██▄▄    ██     ██     ██
+██████ ██ ██    ██▄▄▄ ██ ██ ▀██ ██▄▄▄   ▀█████ ██████ ██
+"""
+
+from .zipline import Zipline
+
+
+__all__ = ["Zipline"]

zipline_cli-0.3.0/src/zipline/_utils.py

@@ -0,0 +1,31 @@
+import os
+import secrets
+import string
+from pathlib import Path
+
+from dotenv import find_dotenv
+
+
+def get_env(file_name: str = ".zipline") -> Path:
+    # NOTE: Remove `find_dotenv` and use central config file...
+    env_file = Path(os.path.expanduser("~")) / file_name
+    if os.path.isfile(env_file):
+        return env_file
+    dotenv_file = find_dotenv(filename=file_name)
+    if dotenv_file:
+        dotenv_path = Path(dotenv_file)
+        return dotenv_path
+    return env_file
+
+
+def gen_rand(length: int = 4) -> str:
+    r = "".join(secrets.choice(string.ascii_letters) for _ in range(length))
+    return "".join(r)
+
+
+def bytes_to_human(num: float, suffix: str = "B") -> str:
+    for unit in ["", "K", "M", "G", "T", "P", "E", "Z"]:
+        if abs(num) < 1024.0:
+            return f"{num:3.1f} {unit}{suffix}"
+        num /= 1024.0
+    return f"{num:.1f} Yi{suffix}"

zipline_cli-0.2.2/src/zipline/__init__.py → zipline_cli-0.3.0/src/zipline/_version.py

@@ -2,19 +2,11 @@ import os
 import re
 
 
-try:
-    from .zipline import Zipline
-except ImportError:
-    Zipline = None  # type: ignore
-
-
 def get_version() -> str:
-    version = os.environ.get("GITHUB_REF_NAME", "0.0.1")
+    version = os.environ.get("GITHUB_REF_NAME", "")
     pattern = r"^\d+\.\d+\.\d+(?:[abc]\d*)?$"
     match = re.match(pattern, version)
     return version if match else "0.0.1"
 
 
 __version__ = get_version()
-
-__all__ = ["Zipline"]

zipline_cli-0.3.0/src/zipline/cli.py

@@ -0,0 +1,165 @@
+import os
+import sys
+from importlib.metadata import version
+from pathlib import Path
+from typing import Any, List, Optional
+
+import click
+import typer
+from dotenv import load_dotenv
+from rich import print
+from rich.console import Console
+from rich.progress import Progress, SpinnerColumn, TextColumn
+from rich.table import Table
+from typing_extensions import Annotated
+
+from . import __doc__ as package_doc
+from . import _utils as utils
+from .zipline import Zipline, ZipURL
+
+
+env_file = utils.get_env()
+dotenv_loaded = load_dotenv(dotenv_path=env_file)
+
+app = typer.Typer(
+    context_settings={"help_option_names": ["-h", "--help"]},
+    pretty_exceptions_show_locals=False,
+    rich_markup_mode="rich",
+)
+
+state = {"verbose": False}
+
+
+def vprint(*objects: Any, **kwargs):
+    if state.get("verbose"):
+        print(*objects, file=sys.stderr, **kwargs)
+
+
+def format_output(filename: str, url: ZipURL) -> str:
+    zipline_format = os.environ.get("ZIPLINE_FORMAT", "{filename}\n{url}\n{raw_url}")
+    return zipline_format.format(filename=filename, url=url, raw_url=url.raw)
+
+
+def run_setup(_url: str) -> None:
+    # NOTE: Overhaul and update to typer/click/rich methods...
+    env_file.touch()
+    print(f"Setting up Environment File: [bold cyan]{env_file.absolute()}")
+    url = typer.prompt("Zipline URL", default=_url).strip()
+    token = typer.prompt("Zipline Authorization Token").strip()
+    if not url or not token:
+        raise click.ClickException("Missing URL or Token.")
+    output = f"ZIPLINE_URL={url}\nZIPLINE_TOKEN={token}\n"
+    embed = typer.confirm("Enabled Embed?", default=True)
+    output += f"ZIPLINE_EMBED={embed}\n"
+    expire = typer.prompt("Default Expire?", default="").strip().lower()
+    if expire:
+        output += f"ZIPLINE_EXPIRE={expire}\n"
+    with open(env_file, "w") as f:
+        f.write(output)
+    print(f"Setup Complete. Variables Saved to: [bold green]{env_file.absolute()}")
+
+
+def info_callback(value: bool):
+    if value:
+        table = Table(title="App Information")
+        # Head
+        table.add_column("Item", style="bold magenta", no_wrap=True)
+        table.add_column("Value", style="bold cyan")
+        # Body
+        table.add_row("Zipline Version", version("zipline-cli"))
+        table.add_row("Config File", str(env_file.absolute()))
+        table.add_row("Config Loaded", str(dotenv_loaded))
+        table.add_row("Server URL", os.environ.get("ZIPLINE_URL", ""))
+        table.add_row("Token (ends in)", os.environ.get("ZIPLINE_TOKEN", "")[-10:])
+        table.add_row("Expire", os.environ.get("ZIPLINE_EXPIRE", ""))
+        table.add_row("Embed", os.environ.get("ZIPLINE_EMBED", ""))
+        table.add_row("Results Format", repr(os.environ.get("ZIPLINE_FORMAT", "{url}\n{raw_url}"))[1:-1])
+        console = Console()
+        console.print(table)
+        raise typer.Exit()
+
+
+def version_callback(value: bool):
+    if value:
+        print(f"[magenta bold]{package_doc}", file=sys.stderr)
+        version_string = version("zipline-cli")
+        print(f"[white bold]{version_string}")
+        raise typer.Exit()
+
+
+@app.command(epilog="Docs: https://zipline-cli.cssnr.com/")
+def main(
+    files: Annotated[Optional[List[Path]], typer.Argument(help="Files...", exists=True, dir_okay=False)] = None,
+    _name: Annotated[
+        Optional[str], typer.Option("-n", "--name", metavar="", help="File Name (sent with upload).")
+    ] = None,
+    # _embed: Annotated[
+    #     Optional[bool], typer.Option("-E", "--embed", help="Enable Embed.", envvar="ZIPLINE_EMBED")
+    # ] = False,
+    # _expire: Annotated[
+    #     str,
+    #     typer.Option(
+    #         "-e", "-x", "--expire", "--expires_at", metavar="", help="File Expiration.", envvar="ZIPLINE_EXPIRE"
+    #     ),
+    # ] = "",
+    _url: Annotated[str, typer.Option("-u", "--url", metavar="", help="Zipline URL.", envvar="ZIPLINE_URL")] = "",
+    _token: Annotated[
+        str,
+        typer.Option(
+            "-t",
+            "-a",
+            "--token",
+            "--authorization",
+            metavar="",
+            help="Zipline token.",
+            envvar=["ZIPLINE_TOKEN", "ZIPLINE_AUTHORIZATION"],
+        ),
+    ] = "",
+    _verbose: Annotated[
+        bool, typer.Option("-v", "--verbose", help="Verbose Output (jq safe).", envvar="ZIPLINE_VERBOSE")
+    ] = False,
+    _setup: Annotated[bool, typer.Option("-S", "--setup", help="Run interactive setup.")] = False,
+    _info: Annotated[
+        Optional[bool], typer.Option("-I", "--info", callback=info_callback, help="Show saved information.")
+    ] = None,
+    _version: Annotated[
+        Optional[bool], typer.Option("-V", "--version", callback=version_callback, help="Show installed version.")
+    ] = None,
+):
+    """Zipline CLI"""
+    if _verbose:
+        state["verbose"] = _verbose
+
+    vprint(f"{_url=}", f"{_token[-12:]=}", sep="\n")
+    # vprint(f"{_expire=}", f"{_embed=}", sep="\n")
+
+    if _setup or not _url and not _token:
+        print("[bold red]Error![/bold red] Missing --url or --token, Entering Setup.")
+        run_setup(_url)
+        raise typer.Exit()
+
+    zipline = Zipline(_url, authorization=_token)
+
+    if not files:
+        file_name: str = _name or f"{utils.gen_rand(8)}.txt"
+        zip_url: ZipURL = zipline.send_file(file_name, click.get_text_stream("stdin"))
+        print(format_output(file_name, zip_url))
+        raise typer.Exit()
+
+    exit_code = 1
+    for i, file in enumerate(files, 1):
+        size = utils.bytes_to_human(file.stat().st_size)
+        text_format = f"Uploading {i}/{len(files)}: " + "[progress.description]{task.description}"
+        with Progress(SpinnerColumn(), TextColumn(text_format), transient=True) as progress:
+            description = f"[green bold]{click.format_filename(file.name)}[/green bold] - [yellow bold]{size}"
+            progress.add_task(description=description, total=None)
+            file_name = _name if _name and len(files) == 1 else file.name
+            with open(file, "rb") as f:
+                zip_url_: ZipURL = zipline.send_file(file_name, f)
+            print(format_output(file.name, zip_url_))
+            exit_code = 0
+    raise typer.Exit(exit_code)
+
+
+if __name__ == "__main__":
+    app()

zipline_cli-0.3.0/src/zipline/zipline.py

@@ -0,0 +1,184 @@
+import mimetypes
+import warnings
+from pathlib import Path
+from typing import IO, Dict, Optional
+
+import requests
+
+
+class ZipURL(object):
+    """
+    Zipline URL Object
+    :param file_url: Zipline File Display URL
+    """
+
+    __slots__ = ["url", "raw"]
+
+    def __init__(self, file_url: str):
+        self.url: str = file_url
+        self.raw: str = self._get_raw(file_url)
+
+    def __repr__(self):
+        return f"<url={self.url} raw={self.raw}>"
+
+    def __str__(self):
+        return self.url
+
+    @staticmethod
+    def _get_raw(url: str) -> str:
+        try:
+            s = url.split("/", 4)
+            return f"{s[0]}//{s[2]}/r/{s[4]}"
+        except Exception:  # noqa
+            return ""
+
+
+class Zipline(object):
+    """
+    Zipline Python API
+    :param base_url: Zipline URL
+    :param kwargs: Zipline Headers
+    """
+
+    # noinspection SpellCheckingInspection
+    allowed_headers = [
+        # zipline v3
+        "format",
+        "image_compression_percent",
+        "expires_at",
+        "password",
+        "zws",
+        "embed",
+        "max_views",
+        "uploadtext",
+        "authorization",
+        "no_json",
+        "x_zipline_filename",
+        "original_name",
+        "override_domain",
+        # zipline v4
+        "x-zipline-deletes-at",
+        "x-zipline-format",
+        "x-zipline-image-compression-percent",
+        "x-zipline-password",
+        "x-zipline-max-views",
+        "x-zipline-no-json",
+        "x-zipline-original-name",
+        "x-zipline-folder",
+        "x-zipline-filename",
+        "x-zipline-domain",
+        "x-zipline-file-extension",
+    ]
+
+    def __init__(self, url: str, **kwargs):
+        self.base_url: str = url.rstrip("/")
+        self._headers: Dict[str, str] = {}
+        for header, value in kwargs.items():
+            if header.lower() not in self.allowed_headers:
+                continue
+            if value is None:
+                continue
+            key = header.replace("_", "-").title()
+            self._headers[key] = str(value)
+
+    def send_file(self, file_name: str, file_object: IO, overrides: Optional[dict] = None) -> ZipURL:
+        """
+        Upload File to Zipline
+        :param file_name: Name of File for files tuple
+        :param file_object: File to Upload
+        :param overrides: Header Overrides
+        :return: File URL
+        """
+        url = self.base_url + "/api/upload"
+        path = Path(file_name)
+        mime_type = get_type(path)
+        # print(f"mime_type: {mime_type}")
+        files = {"file": (file_name, file_object, mime_type)}
+        headers = self._headers | overrides if overrides else self._headers
+        r = requests.post(url, headers=headers, files=files)  # nosec
+        r.raise_for_status()
+        data = r.json()["files"][0]
+        if isinstance(data, dict):
+            return ZipURL(data["url"])
+        elif isinstance(data, list):
+            return ZipURL(data[0])
+        else:
+            return ZipURL(data)
+
+
+def get_type(file_path: Path) -> str:  # NOSONAR
+    """
+    Get MIME type from guess_type or by reading magic headers
+    https://en.wikipedia.org/wiki/List_of_file_signatures
+
+    Deprecated since version 3.13: Passing a file path instead of URL is soft deprecated. Use guess_file_type() for this.
+    https://docs.python.org/3/library/mimetypes.html#mimetypes.guess_type
+    """
+    mime_type, _ = mimetypes.guess_type(file_path, strict=False)
+    if mime_type:
+        return mime_type
+
+    if not file_path.is_file():
+        return "text/plain"
+
+    with open(file_path, "rb") as file:
+        chunk = file.read(512)
+
+    # print(f"chunk: {type(chunk)} - {chunk[:20]}")
+    # print(f"test chunk: {chunk[8:11]}")
+
+    if isinstance(chunk, str):  # pragma: no cover
+        warnings.warn("This condition should not be True...", stacklevel=2)
+        return "text/plain"
+
+    # Images
+    if chunk[0:3] == b"\xff\xd8\xff" or chunk[6:10] in (b"JFIF", b"Exif"):
+        return "image/jpeg"
+    elif chunk.startswith(b"\x89\x50\x4e\x47\x0d\x0a\x1a\x0a"):
+        return "image/png"
+    elif chunk.startswith(b"RIFF") and chunk[8:12] == b"WEBP":
+        return "image/webp"
+    elif chunk.startswith((b"\x47\x49\x46\x38\x37\x61", b"\x47\x49\x46\x38\x39\x61")):
+        return "image/gif"
+    elif chunk.startswith(b"\x66\x74\x79\x70\x68\x65\x69\x63\x66\x74\79\70\6d") or chunk[4:12] == b"ftypheic":
+        return "image/heic"
+    elif chunk.startswith(b"\x00\x00\x01\x00"):
+        return "image/ico"
+    elif chunk.startswith(b"II*") or chunk.startswith(b"II+") or chunk.startswith(b"MM"):
+        return "image/tiff"
+    elif chunk.startswith(b"BM"):
+        return "image/bmp"
+    elif chunk[4:12] == b"ftypavif":
+        return "image/avif"
+
+    # Video
+    elif chunk[4:12] == b"ftypisom" or chunk[4:12] == b"ftypMSNV" or chunk[4:12] == b"ftypmp42":
+        return "video/mp4"
+    elif chunk[3:11] in (b"\x66\x74\x79\x70\x4d\x53\x4e\x56", b"\x66\x74\x79\x70\x69\x73\x6f\x6d"):
+        return "video/mp4"
+    elif chunk.startswith(b"\x1a\x45\xdf\xa3"):
+        # https://www.loc.gov/preservation/digital/formats//fdd/fdd000342.shtml
+        return "video/x-matroska"
+    elif chunk.startswith(b"RIFF") and chunk[8:11] == b"AVI":
+        return "video/x-msvideo"
+    elif chunk.startswith(b"\x30\x26\xb2\x75\x8e\x66\xcf\x11\xa6\xd9\x00\xaa\x00\x62\xce\x6c"):
+        # https://www.loc.gov/preservation/digital/formats/fdd/fdd000091.shtml
+        return "video/x-ms-asf"
+    elif chunk.startswith(b"\x6d\x6f\x6f\x76") or chunk[4:10] == b"ftypqt":
+        # https://www.file-recovery.com/mov-signature-format.htm
+        return "video/quicktime"
+
+    # Audio
+    elif chunk.startswith((b"\xff\xfb", b"\xff\xfb", b"\xff\xfb", b"\x49\x44\x33")):
+        return "audio/mp3"
+    elif chunk.startswith(b"RIFF") and chunk[8:12] == b"WAVE":
+        return "audio/wav"
+    elif chunk.startswith(b"OggS"):
+        return "application/ogg"
+
+    # Fallback
+    try:
+        chunk.decode("utf-8")
+        return "text/plain"
+    except UnicodeDecodeError:
+        return "application/octet-stream"

{zipline_cli-0.2.2 → zipline_cli-0.3.0/src/zipline_cli.egg-info}/PKG-INFO

@@ -1,31 +1,31 @@
 Metadata-Version: 2.4
 Name: zipline-cli
-Version: 0.2.2
+Version: 0.3.0
 Summary: Python 3 CLI File Uploader for Diced/Zipline v3/v4 Upload Server and Django Files.
 Author: Shane
 License: MIT License
-Project-URL: GitHub, https://github.com/cssnr/zipline-cli
-Project-URL: Issues, https://github.com/cssnr/zipline-cli/issues
 Project-URL: Changelog, https://github.com/cssnr/zipline-cli/releases
+Project-URL: Discord, https://discord.gg/wXy6m2X8wY
 Project-URL: Documentation, https://zipline-cli.cssnr.com/
-Project-URL: Homepage, https://cssnr.com/
 Project-URL: Funding, https://ko-fi.com/cssnr
-Project-URL: Discord, https://discord.gg/wXy6m2X8wY
+Project-URL: GitHub, https://github.com/cssnr/zipline-cli
+Project-URL: Homepage, https://cssnr.com/
+Project-URL: Issues, https://github.com/cssnr/zipline-cli/issues
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Typing :: Typed
 Classifier: Topic :: Communications :: File Sharing
 Classifier: Topic :: Terminals
+Classifier: Typing :: Typed
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: python-decouple
 Requires-Dist: python-dotenv
-Requires-Dist: requests
+Requires-Dist: requests<3,>=2
+Requires-Dist: typer
 Dynamic: license-file
 
 [![PyPI Version](https://img.shields.io/pypi/v/zipline-cli?logo=pypi&logoColor=white&label=pypi)](https://pypi.org/project/zipline-cli/)
@@ -55,7 +55,7 @@ Dynamic: license-file
 # Zipline CLI
 
 <a title="Zipline CLI" href="https://zipline-cli.cssnr.com/" target="_blank">
-<img alt="Zipline CLI" align="right" width="128" height="auto" src="https://raw.githubusercontent.com/smashedr/repo-images/refs/heads/master/zipline/cli/logo128.png"></a>
+<img alt="Zipline CLI" align="right" width="128" height="auto" src="https://zipline-cli.cssnr.com/assets/images/logo.png"></a>
 
 - [Quick Start](#quick-start)
 - [Install](#install)
@@ -75,6 +75,11 @@ Python 3 CLI File Uploader for [Diced/Zipline](https://github.com/diced/zipline)
 > You can also [request new features](https://github.com/cssnr/zipline-cli/discussions/new?category=feature-requests)
 > or report any [issues](https://github.com/cssnr/zipline-cli/issues/new).
 
+> [!IMPORTANT]  
+> A new app is in progress which supports ShareX Configurations.  
+> All new features will be added to this app.  
+> Please [let us know](https://github.com/cssnr/zipline-cli/discussions/new?category=feature-requests) what you want to see...
+
 ## Quick Start<a id="quick-start"></a>
 
 ```shell
@@ -153,13 +158,11 @@ Environment Variables are stored in the `.zipline` file in your home directory.
 
 - Location: `~/.zipline` or `$HOME/.zipline`
 
-| Variable         | Description                                                                                                                                                                                      |
-| ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `ZIPLINE_URL`    | URL to your Zipline Instance                                                                                                                                                                     |
-| `ZIPLINE_TOKEN`  | Authorization Token from Zipline                                                                                                                                                                 |
-| `ZIPLINE_EMBED`  | Set this enable Embed on your uploads                                                                                                                                                            |
-| `ZIPLINE_FORMAT` | Output Format. Variables: `{filename}`, `{url}` and `{raw_url}`                                                                                                                                  |
-| `ZIPLINE_EXPIRE` | Reference: [Zipline](https://zipline.diced.sh/docs/guides/upload-options#image-expiration) / [Django Files](https://github.com/onegreyonewhite/pytimeparse2#pytimeparse2-time-expression-parser) |
+| Variable         | Description                                                     |
+| ---------------- | --------------------------------------------------------------- |
+| `ZIPLINE_URL`    | URL to your Zipline Instance                                    |
+| `ZIPLINE_TOKEN`  | Authorization Token from Zipline                                |
+| `ZIPLINE_FORMAT` | Output Format. Variables: `{filename}`, `{url}` and `{raw_url}` |
 
 See [.zipline.example](.zipline.example) for an example `.zipline` file.
 

{zipline_cli-0.2.2 → zipline_cli-0.3.0}/src/zipline_cli.egg-info/SOURCES.txt

@@ -3,6 +3,9 @@ MANIFEST.in
 README.md
 pyproject.toml
 src/zipline/__init__.py
+src/zipline/_utils.py
+src/zipline/_version.py
+src/zipline/cli.py
 src/zipline/py.typed
 src/zipline/zipline.py
 src/zipline_cli.egg-info/PKG-INFO

zipline_cli-0.3.0/src/zipline_cli.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+zipline = zipline.cli:app

zipline_cli-0.3.0/src/zipline_cli.egg-info/requires.txt

@@ -0,0 +1,3 @@
+python-dotenv
+requests<3,>=2
+typer

zipline_cli-0.2.2/src/zipline/zipline.py

@@ -1,349 +0,0 @@
-import argparse
-import io
-import mimetypes
-import os
-import re
-import secrets
-import string
-import sys
-from importlib.metadata import version
-from pathlib import Path
-from typing import IO, Any, Dict, List, Optional, TextIO
-
-import requests
-from decouple import config
-from dotenv import find_dotenv, load_dotenv
-
-
-class ZipURL(object):
-    """
-    Zipline URL Object
-    :param file_url: Zipline File Display URL
-    """
-
-    __slots__ = ["url", "raw"]
-
-    def __init__(self, file_url: str):
-        self.url: str = file_url
-        self.raw: str = self._get_raw(file_url)
-
-    def __repr__(self):
-        return f"<url={self.url} raw={self.raw}>"
-
-    def __str__(self):
-        return self.url
-
-    @staticmethod
-    def _get_raw(url: str) -> str:
-        try:
-            s = url.split("/", 4)
-            return f"{s[0]}//{s[2]}/r/{s[4]}"
-        except Exception:  # noqa
-            return ""
-
-
-class Zipline(object):
-    """
-    Zipline Python API
-    :param base_url: Zipline URL
-    :param kwargs: Zipline Headers
-    """
-
-    # noinspection SpellCheckingInspection
-    allowed_headers = [
-        # zipline v3
-        "format",
-        "image_compression_percent",
-        "expires_at",
-        "password",
-        "zws",
-        "embed",
-        "max_views",
-        "uploadtext",
-        "authorization",
-        "no_json",
-        "x_zipline_filename",
-        "original_name",
-        "override_domain",
-        # zipline v4
-        "x-zipline-deletes-at",
-        "x-zipline-format",
-        "x-zipline-image-compression-percent",
-        "x-zipline-password",
-        "x-zipline-max-views",
-        "x-zipline-no-json",
-        "x-zipline-original-name",
-        "x-zipline-folder",
-        "x-zipline-filename",
-        "x-zipline-domain",
-        "x-zipline-file-extension",
-    ]
-
-    def __init__(self, url: str, **kwargs):
-        self.base_url: str = url.rstrip("/")
-        self._headers: Dict[str, str] = {}
-        for header, value in kwargs.items():
-            if header.lower() not in self.allowed_headers:
-                continue
-            if value is None:
-                continue
-            key = header.replace("_", "-").title()
-            self._headers[key] = str(value)
-
-    def send_file(self, file_name: str, file_object: IO, overrides: Optional[dict] = None) -> ZipURL:
-        """
-        Upload File to Zipline
-        :param file_name: Name of File for files tuple
-        :param file_object: File to Upload
-        :param overrides: Header Overrides
-        :return: File URL
-        """
-        url = self.base_url + "/api/upload"
-
-        path = Path(file_name)
-        if not path.is_file():
-            raise ValueError(f"Not a File: {path.resolve()}")
-
-        mime_type = get_type(path)
-        # print(f"mime_type: {mime_type}")
-        files = {"file": (file_name, file_object, mime_type)}
-        headers = self._headers | overrides if overrides else self._headers
-        r = requests.post(url, headers=headers, files=files)  # nosec
-        r.raise_for_status()
-        data = r.json()["files"][0]
-        if isinstance(data, dict):
-            return ZipURL(data["url"])
-        elif isinstance(data, list):
-            return ZipURL(data[0])
-        else:
-            return ZipURL(data)
-
-
-def get_type(file_path: Path) -> str:
-    # Deprecated since version 3.13: Passing a file path instead of URL is soft deprecated. Use guess_file_type() for this.
-    # https://docs.python.org/3/library/mimetypes.html#mimetypes.guess_type
-    mime_type, _ = mimetypes.guess_type(file_path, strict=False)
-    if mime_type:
-        return mime_type
-    return magic_type(file_path)
-
-
-def magic_type(file_path: Path) -> str:  # NOSONAR
-    try:
-        with open(file_path, "rb") as file:
-            chunk = file.read(512)
-        # print(chunk)
-        if chunk[0:3] == b"\xff\xd8\xff" or chunk[6:10] in (b"JFIF", b"Exif"):
-            return "image/jpeg"
-        elif chunk.startswith(b"\x89\x50\x4e\x47\x0d\x0a\x1a\x0a"):
-            return "image/png"
-        elif chunk.startswith(b"RIFF") and chunk[8:12] == b"WEBP":
-            return "image/webp"
-        elif chunk.startswith((b"\x47\x49\x46\x38\x37\x61", b"\x47\x49\x46\x38\x39\x61")):
-            return "image/gif"
-        elif chunk.startswith(b"\x66\x74\x79\x70\x68\x65\x69\x63\x66\x74\79\70\6d"):
-            return "image/heic"
-        elif chunk.startswith(b"\x00\x00\x01\x00"):
-            return "image/ico"
-
-        elif chunk[3:11] in (b"\x66\x74\x79\x70\x4d\x53\x4e\x56", b"\x66\x74\x79\x70\x69\x73\x6f\x6d"):
-            return "video/mp4"
-        elif chunk[4:12] == b"ftypisom" or chunk[4:12] == b"ftypMSNV" or chunk[4:12] == b"ftypmp42":
-            return "video/mp4"
-        elif chunk.startswith(b"\x1a\x45\xdf\xa3"):
-            return "video/x-matroska"
-        elif chunk.startswith(b"\x6d\x6f\x6f\x76"):
-            return "video/quicktime"
-
-        elif chunk.startswith((b"\xff\xfb", b"\xff\xfb", b"\xff\xfb", b"\x49\x44\x33")):
-            return "audio/mp3"
-        elif chunk.startswith(b"RIFF") and chunk[8:12] == b"WAVE":
-            return "audio/wav"
-        elif chunk.startswith(b"OggS"):
-            return "application/ogg"
-
-        chunk.decode("utf-8")
-        return "text/plain"
-    except UnicodeDecodeError:
-        return "application/octet-stream"
-
-
-def format_output(filename: str, url: ZipURL) -> str:
-    """
-    Format URL Output
-    :param filename: Original or File Name
-    :param url: ZipURL to Format
-    :return: Formatted Output
-    """
-    zipline_format = config("ZIPLINE_FORMAT", "{filename}\n{url}\n{raw_url}")
-    return zipline_format.format(filename=filename, url=url, raw_url=url.raw)
-
-
-def gen_rand(length: int = 4) -> str:
-    """
-    Generate Random Streng
-    :param length: Length of String
-    :return: Random String
-    """
-    r = "".join(secrets.choice(string.ascii_letters) for _ in range(length))
-    return "".join(r)
-
-
-def get_default(
-    values: List[str],
-    default: Optional[Any] = None,
-    cast: type = str,
-    pre: str = "ZIPLINE_",
-    suf: str = "",
-) -> Optional[str]:
-    """
-    Get Default Environment Variable from List of values
-    :param values: List of Values to Check
-    :param default: Default Value if None
-    :param cast: Type to Cast Value
-    :param pre: Environment Variable Prefix
-    :param suf: Environment Variable Suffix
-    :return: Environment Variable or None
-    """
-    for value in values:
-        result = config(f"{pre}{value.upper()}{suf}", "", cast)
-        if result:
-            return result
-    return default
-
-
-def setup(env_file: Path) -> None:
-    print("Setting up Environment File...")
-    url = input("Zipline URL: ").strip()
-    token = input("Zipline Authorization Token: ").strip()
-    if not url or not token:
-        raise ValueError("Missing URL or Token.")
-    output = f"ZIPLINE_URL={url}\nZIPLINE_TOKEN={token}\n"
-    embed = input("Enabled Embed? [Yes]/No: ").strip()
-    if not embed or embed.lower() not in ["n", "o", "no", "noo"]:
-        output += "ZIPLINE_EMBED=true\n"
-    expire = input("Default Expire? [Blank for None]: ").strip().lower()
-    if expire:
-        match = re.search(r"^(\d+)(?:ms|s|m|h|d|w|y)$", expire)
-        if not match:
-            print(f"Warning: invalid expire format: {expire}. See --help")
-        else:
-            output += f"ZIPLINE_EXPIRE={expire}\n"
-    with open(env_file, "w") as f:
-        f.write(output)
-    print(f"Setup Complete. Variables Saved to: {env_file}")
-    sys.exit(0)
-
-
-def run() -> None:
-    zipline_file = ".zipline"
-    env_file = Path(os.path.expanduser("~")) / zipline_file
-    dotenv_path = env_file if os.path.isfile(env_file) else find_dotenv(filename=zipline_file)
-    env = load_dotenv(dotenv_path=dotenv_path)
-
-    parser = argparse.ArgumentParser(description="Zipline CLI.")
-    parser.add_argument("files", metavar="Files", type=str, nargs="*", help="Files to Upload.")
-    parser.add_argument("-s", "--setup", action="store_true", default=False, help="run the interactive setup")
-    parser.add_argument("-i", "--info", action="store_true", help="show application information")
-    parser.add_argument("-V", "--version", action="store_true", help="show the installed version")
-    parser.add_argument("-u", "--url", type=str, default=get_default(["url"]), help="Zipline URL")
-    parser.add_argument(
-        "-a",
-        "-t",
-        "--authorization",
-        "--token",
-        type=str,
-        default=get_default(["token", "authorization"]),
-        help="Zipline Access Token for Authorization or ZIPLINE_TOKEN",
-    )
-    parser.add_argument(
-        "-e",
-        "-x",
-        "--expires_at",
-        "--expire",
-        type=str,
-        default=get_default(["expire", "expire_at"]),
-        help="Ex: 1d, 2w. See: https://zipline.diced.sh/docs/guides/upload-options#image-expiration",
-    )
-    parser.add_argument(
-        "--embed", action="store_true", default=get_default(["embed"], False, bool), help="Enable Embeds on Uploads."
-    )
-    args = parser.parse_args()
-
-    if args.version:
-        print(version("zipline-cli"))
-        return
-
-    if args.info:
-        print(f"Zipline Version:  {version('zipline-cli')}")
-        print(f"Config File:      {env_file.absolute()}")
-        print(f"Server URL:       {config('ZIPLINE_URL', '')}")
-        print(f"Token (ends in):  {config('ZIPLINE_TOKEN', '')[-10:]}")
-        print(f"Expire:           {config('ZIPLINE_EXPIRE', '')}")
-        print(f"Embed:            {config('ZIPLINE_EMBED', '')}")
-        zipline_format = config("ZIPLINE_FORMAT", "{url}\n{raw_url}")
-        print(f"URL Format::\n{zipline_format}")
-        return
-
-    if args.setup:
-        setup(env_file)
-
-    if not env and not args.url and not args.authorization and not os.path.isfile(env_file):
-        env_file.touch()
-        print("First Run Detected, Entering Setup.")
-        setup(env_file)
-
-    if not args.url:
-        parser.print_help()
-        raise ValueError("Missing URL. Use --setup or specify --url")
-
-    if not args.authorization:
-        parser.print_help()
-        raise ValueError("Missing Token. Use --setup or specify --token")
-
-    if args.expires_at:
-        args.expires_at = args.expires_at.strip().lower()
-        match = re.search(r"^(\d+)(?:ms|s|m|h|d|w|y)$", args.expires_at)
-        if not match:
-            parser.print_help()
-            raise ValueError(f"Invalid Expire Format: {args.expires_at}.")
-
-    zipline = Zipline(**vars(args))
-
-    if not args.files:
-        content: str = sys.stdin.read().rstrip("\n") + "\n"
-        text_f: TextIO = io.StringIO(content)
-        name = f"{gen_rand(8)}.txt"
-        url: ZipURL = zipline.send_file(name, text_f)
-        print(format_output(name, url))
-        sys.exit(0)
-
-    exit_code = 1
-    for name in args.files:
-        if not os.path.isfile(name):
-            print(f"Warning: File Not Found: {name}")
-            continue
-        # mode: Literal["r", "rb"] = get_mode(name)
-        with open(name, "rb") as f:
-            # name, ext = os.path.splitext(os.path.basename(filename))
-            # ext = f'.{ext}' if ext else ''
-            # name = f'{name}-{gen_rand(8)}{ext}'
-            # url: str = zipline.send_file(name, f)
-            zip_url: ZipURL = zipline.send_file(name, f)
-            print(format_output(name, zip_url))
-            exit_code = 0
-    sys.exit(exit_code)
-
-
-def main() -> None:
-    try:
-        run()
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except Exception as error:
-        print("\nError: {}".format(str(error)))
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()

zipline_cli-0.2.2/src/zipline_cli.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-zipline = zipline.zipline:main

zipline_cli-0.2.2/src/zipline_cli.egg-info/requires.txt

@@ -1,3 +0,0 @@
-python-decouple
-python-dotenv
-requests