myl 0.8.6__tar.gz → 0.9.2__tar.gz

{myl-0.8.6 → myl-0.9.2}/.github/workflows/lint.yaml

@@ -10,10 +10,10 @@ jobs:
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
 

{myl-0.8.6 → myl-0.9.2}/.github/workflows/pypi.yaml

@@ -17,10 +17,10 @@ jobs:
     permissions:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
 

{myl-0.8.6 → myl-0.9.2}/.github/workflows/release.yaml

@@ -13,7 +13,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -40,6 +40,6 @@ jobs:
           echo "$EOF" >> $GITHUB_OUTPUT
 
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           body: ${{ steps.changelog.outputs.changelog }}

{myl-0.8.6 → myl-0.9.2}/.gitignore

@@ -3,3 +3,5 @@
 *.egg-info
 build/
 dist/
+result
+_version.py

{myl-0.8.6 → myl-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myl
-Version: 0.8.6
+Version: 0.9.2
 Summary: Dead simple IMAP CLI client
 Author-email: Philipp Schmitt <philipp@schmitt.co>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -678,11 +678,19 @@ License:                     GNU GENERAL PUBLIC LICENSE
         Public License instead of this License.  But first, please read
         <https://www.gnu.org/licenses/why-not-lgpl.html>.
         
+Project-URL: homepage, https://github.com/pschmitt/myl
+Project-URL: documentation, https://github.com/pschmitt/myl/blob/head/readme.md
+Project-URL: repository, https://github.com/pschmitt/myl
+Project-URL: issues, https://github.com/pschmitt/myl/issues
 Keywords: imap,email
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: imap-tools<2.0.0,>=1.5.0
+Requires-Dist: myl-discovery>=0.6.1.dev0
+Requires-Dist: rich<14.0.0,>=13.0.0
+Requires-Dist: html2text>=2024.2.26
 
 # 📧 myl
 
@@ -713,15 +721,23 @@ straightforward way to interact with IMAP servers.
 
 To install myl, follow these steps:
 
-```bash
+```shell
 pipx install myl
+# or:
+pip install --user myl
+```
+
+on nix you can do this:
+
+```shell
+nix run github:pschmitt/myl -- --help
 ```
 
 ## 🛠️ Usage
 
 Here's how you can use myl:
 
-```bash
+```shell
 myl --help
 ```
 
@@ -729,7 +745,7 @@ This command will display the help information for the `myl` command.
 
 Here are some examples of using flags with the `myl` command:
 
-```bash
+```shell
 # Connect to an IMAP server
 myl --server imap.example.com --port 143 --starttls --username "$username" --password "$password"
 

{myl-0.8.6 → myl-0.9.2}/README.md

@@ -27,15 +27,23 @@ straightforward way to interact with IMAP servers.
 
 To install myl, follow these steps:
 
-```bash
+```shell
 pipx install myl
+# or:
+pip install --user myl
+```
+
+on nix you can do this:
+
+```shell
+nix run github:pschmitt/myl -- --help
 ```
 
 ## 🛠️ Usage
 
 Here's how you can use myl:
 
-```bash
+```shell
 myl --help
 ```
 
@@ -43,7 +51,7 @@ This command will display the help information for the `myl` command.
 
 Here are some examples of using flags with the `myl` command:
 
-```bash
+```shell
 # Connect to an IMAP server
 myl --server imap.example.com --port 143 --starttls --username "$username" --password "$password"
 

myl-0.9.2/flake.lock

@@ -0,0 +1,116 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "myl-discovery": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730392848,
+        "narHash": "sha256-7RBwu5zJXV+90NBwGZwO459FswogX1zcgsEuOi2Eqlc=",
+        "owner": "pschmitt",
+        "repo": "myl-discovery",
+        "rev": "6cc8eab2e61efbf17ab48356282d35a11b9dd7a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pschmitt",
+        "repo": "myl-discovery",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1730200266,
+        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "myl-discovery": "myl-discovery",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

myl-0.9.2/flake.nix

@@ -0,0 +1,105 @@
+{
+  description = "Flake for myl IMAP CLI client and myl-discovery, compatible with multiple systems";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    myl-discovery = {
+      url = "github:pschmitt/myl-discovery";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      myl-discovery,
+      ...
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+
+        myl = pkgs.python3Packages.buildPythonApplication {
+          pname = "myl";
+          version = builtins.readFile ./version.txt;
+          pyproject = true;
+
+          src = ./.;
+
+          buildInputs = [
+            pkgs.python3Packages.setuptools
+            pkgs.python3Packages.setuptools-scm
+          ];
+
+          propagatedBuildInputs = with pkgs.python3Packages; [
+            html2text
+            imap-tools
+            myl-discovery.packages.${system}.myl-discovery
+            rich
+          ];
+
+          meta = {
+            description = "Dead simple IMAP CLI client";
+            homepage = "https://pypi.org/project/myl/";
+            license = pkgs.lib.licenses.gpl3Only;
+            maintainers = with pkgs.lib.maintainers; [ pschmitt ];
+            platforms = pkgs.lib.platforms.all;
+          };
+        };
+
+        devShell = pkgs.mkShell {
+          name = "myl-devshell";
+
+          buildInputs = [
+            pkgs.python3
+            pkgs.python3Packages.setuptools
+            pkgs.python3Packages.setuptools-scm
+            pkgs.python3Packages.html2text
+            pkgs.python3Packages.imap-tools
+            self.packages.${system}.myl-discovery
+            pkgs.python3Packages.rich
+          ];
+
+          # Additional development tools
+          nativeBuildInputs = [
+            pkgs.gh # GitHub CLI
+            pkgs.git
+            pkgs.python3Packages.ipython
+            pkgs.neovim
+          ];
+
+          # Environment variables and shell hooks
+          shellHook = ''
+            export PYTHONPATH=${self.packages.${system}.myl}/lib/python3.x/site-packages
+            echo -e "\e[34mWelcome to the myl development shell!\e[0m"
+            # Activate a virtual environment if desired
+            # source .venv/bin/activate
+          '';
+
+          # Optional: Set up a Python virtual environment
+          # if you prefer using virtualenv or similar tools
+          # you can uncomment and configure the following lines
+          # shellHook = ''
+          #   if [ ! -d .venv ]; then
+          #     python3 -m venv .venv
+          #     source .venv/bin/activate
+          #     pip install --upgrade pip
+          #   else
+          #     source .venv/bin/activate
+          #   fi
+          # '';
+        };
+      in
+      {
+        # pkgs
+        packages.myl = myl;
+        defaultPackage = myl;
+
+        devShells.default = devShell;
+      }
+    );
+}

{myl-0.8.6 → myl-0.9.2}/myl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myl
-Version: 0.8.6
+Version: 0.9.2
 Summary: Dead simple IMAP CLI client
 Author-email: Philipp Schmitt <philipp@schmitt.co>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -678,11 +678,19 @@ License:                     GNU GENERAL PUBLIC LICENSE
         Public License instead of this License.  But first, please read
         <https://www.gnu.org/licenses/why-not-lgpl.html>.
         
+Project-URL: homepage, https://github.com/pschmitt/myl
+Project-URL: documentation, https://github.com/pschmitt/myl/blob/head/readme.md
+Project-URL: repository, https://github.com/pschmitt/myl
+Project-URL: issues, https://github.com/pschmitt/myl/issues
 Keywords: imap,email
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: imap-tools<2.0.0,>=1.5.0
+Requires-Dist: myl-discovery>=0.6.1.dev0
+Requires-Dist: rich<14.0.0,>=13.0.0
+Requires-Dist: html2text>=2024.2.26
 
 # 📧 myl
 
@@ -713,15 +721,23 @@ straightforward way to interact with IMAP servers.
 
 To install myl, follow these steps:
 
-```bash
+```shell
 pipx install myl
+# or:
+pip install --user myl
+```
+
+on nix you can do this:
+
+```shell
+nix run github:pschmitt/myl -- --help
 ```
 
 ## 🛠️ Usage
 
 Here's how you can use myl:
 
-```bash
+```shell
 myl --help
 ```
 
@@ -729,7 +745,7 @@ This command will display the help information for the `myl` command.
 
 Here are some examples of using flags with the `myl` command:
 
-```bash
+```shell
 # Connect to an IMAP server
 myl --server imap.example.com --port 143 --starttls --username "$username" --password "$password"
 

{myl-0.8.6 → myl-0.9.2}/myl.egg-info/SOURCES.txt

@@ -1,8 +1,11 @@
 .gitignore
 LICENSE
 README.md
+flake.lock
+flake.nix
 myl.py
 pyproject.toml
+version.txt
 .github/dependabot.yml
 .github/workflows/lint.yaml
 .github/workflows/pypi.yaml

myl-0.9.2/myl.egg-info/requires.txt

@@ -0,0 +1,4 @@
+imap-tools<2.0.0,>=1.5.0
+myl-discovery>=0.6.1.dev0
+rich<14.0.0,>=13.0.0
+html2text>=2024.2.26

myl-0.9.2/myl.py

@@ -0,0 +1,508 @@
+#!/usr/bin/env python3
+# coding: utf-8
+
+from importlib.metadata import version, PackageNotFoundError
+import argparse
+import logging
+import ssl
+import sys
+from json import dumps as json_dumps
+
+import html2text
+from imap_tools.consts import MailMessageFlags
+from imap_tools.mailbox import (
+    BaseMailBox,
+    MailBox,
+    MailBoxTls,
+    MailBoxUnencrypted,
+)
+from imap_tools.query import AND
+from myldiscovery import autodiscover
+from rich import print, print_json
+from rich.console import Console
+from rich.logging import RichHandler
+from rich.table import Table
+
+try:
+    __version__ = version("myl")
+except PackageNotFoundError:
+    pass
+
+LOGGER = logging.getLogger(__name__)
+IMAP_PORT = 993
+GMAIL_IMAP_SERVER = "imap.gmail.com"
+GMAIL_IMAP_PORT = IMAP_PORT
+GMAIL_SENT_FOLDER = "[Gmail]/Sent Mail"
+# GMAIL_ALL_FOLDER = "[Gmail]/All Mail"
+
+
+class MissingServerException(Exception):
+    pass
+
+
+def error_msg(msg):
+    print(f"[red]{msg}[/red]", file=sys.stderr)
+
+
+def mail_to_dict(msg, date_format="%Y-%m-%d %H:%M:%S"):
+    return {
+        "uid": msg.uid,
+        "subject": msg.subject,
+        "from": msg.from_,
+        "to": msg.to,
+        "date": msg.date.strftime(date_format),
+        "timestamp": str(int(msg.date.timestamp())),
+        "unread": mail_is_unread(msg),
+        "flags": msg.flags,
+        "content": {
+            "raw": msg.obj.as_string(),
+            "html": msg.html,
+            "text": msg.text,
+        },
+        "attachments": msg.attachments,
+    }
+
+
+def mail_to_json(msg, date_format="%Y-%m-%d %H:%M:%S"):
+    return json_dumps(mail_to_dict(msg, date_format))
+
+
+def mail_is_unread(msg):
+    return MailMessageFlags.SEEN not in msg.flags
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    subparsers = parser.add_subparsers(
+        dest="command", help="Available commands"
+    )
+    parser.add_argument(
+        "-V",
+        "--version",
+        action="version",
+        version=f"%(prog)s {__version__}",
+    )
+
+    # Default command: list all emails
+    subparsers.add_parser("list", help="List all emails")
+
+    # Get/show email command
+    get_parser = subparsers.add_parser(
+        "get", help="Retrieve a specific email or attachment"
+    )
+    get_parser.add_argument("MAILID", help="Mail ID to fetch", type=int)
+    get_parser.add_argument(
+        "ATTACHMENT",
+        help="Name of the attachment to fetch",
+        nargs="?",
+        default=None,
+    )
+
+    # Delete email command
+    delete_parser = subparsers.add_parser("delete", help="Delete an email")
+    delete_parser.add_argument(
+        "MAILIDS", help="Mail ID(s) to delete", type=int, nargs="+"
+    )
+
+    # Mark email as read/unread
+    mark_read_parser = subparsers.add_parser(
+        "read", help="mark an email as read"
+    )
+    mark_read_parser.add_argument(
+        "MAILIDS", help="Mail ID(s) to mark as read", type=int, nargs="+"
+    )
+    mark_unread_parser = subparsers.add_parser(
+        "unread", help="mark an email as unread"
+    )
+    mark_unread_parser.add_argument(
+        "MAILIDS", help="Mail ID(s) to mark as unread", type=int, nargs="+"
+    )
+
+    # Optional arguments
+    parser.add_argument(
+        "-d", "--debug", help="Enable debug mode", action="store_true"
+    )
+
+    # IMAP connection settings
+    parser.add_argument(
+        "-s", "--server", help="IMAP server address", required=False
+    )
+    parser.add_argument(
+        "--google",
+        "--gmail",
+        help="Use Google IMAP settings (overrides --port, --server etc.)",
+        action="store_true",
+        default=False,
+    )
+    parser.add_argument(
+        "-a",
+        "--auto",
+        help="Autodiscovery of the required server and port",
+        action="store_true",
+        default=True,
+    )
+    parser.add_argument(
+        "-P", "--port", help="IMAP server port", default=IMAP_PORT
+    )
+    parser.add_argument("--ssl", help="SSL", action="store_true", default=True)
+    parser.add_argument(
+        "--starttls", help="STARTTLS", action="store_true", default=False
+    )
+    parser.add_argument(
+        "--insecure",
+        help="Disable cert validation",
+        action="store_true",
+        default=False,
+    )
+
+    # Credentials
+    parser.add_argument(
+        "-u", "--username", help="IMAP username", required=True
+    )
+    password_group = parser.add_mutually_exclusive_group(required=True)
+    password_group.add_argument("-p", "--password", help="IMAP password")
+    password_group.add_argument(
+        "--password-file",
+        help="IMAP password (file path)",
+        type=argparse.FileType("r"),
+    )
+
+    # Display preferences
+    parser.add_argument(
+        "-c",
+        "--count",
+        help="Number of messages to fetch",
+        default=10,
+        type=int,
+    )
+    parser.add_argument(
+        "-t", "--no-title", help="Do not show title", action="store_true"
+    )
+    parser.add_argument(
+        "--date-format", help="Date format", default="%H:%M %d/%m/%Y"
+    )
+
+    # IMAP actions
+    parser.add_argument(
+        "-m",
+        "--mark-seen",
+        help="Mark seen",
+        action="store_true",
+        default=False,
+    )
+
+    # Email filtering
+    parser.add_argument("-f", "--folder", help="IMAP folder", default="INBOX")
+    parser.add_argument(
+        "--sent",
+        help="Sent email",
+        action="store_true",
+    )
+    parser.add_argument("-S", "--search", help="Search string", default="ALL")
+    parser.add_argument(
+        "--unread",
+        help="Limit to unread emails",
+        action="store_true",
+        default=False,
+    )
+
+    # Output preferences
+    parser.add_argument(
+        "-H",
+        "--html",
+        help="Show HTML email",
+        action="store_true",
+        default=False,
+    )
+    parser.add_argument(
+        "-j",
+        "--json",
+        help="JSON output",
+        action="store_true",
+        default=False,
+    )
+    parser.add_argument(
+        "-r",
+        "--raw",
+        help="Show the raw email",
+        action="store_true",
+        default=False,
+    )
+
+    return parser.parse_args()
+
+
+def mb_connect(console, args) -> BaseMailBox:
+    imap_password = args.password or (
+        args.password_file and args.password_file.read()
+    )
+
+    if args.google:
+        args.server = GMAIL_IMAP_SERVER
+        args.port = GMAIL_IMAP_PORT
+        args.starttls = False
+
+        if args.sent or args.folder == "Sent":
+            args.folder = GMAIL_SENT_FOLDER
+        # elif args.folder == "INBOX":
+        #     args.folder = GMAIL_ALL_FOLDER
+    else:
+        if args.auto:
+            try:
+                settings = autodiscover(
+                    args.username,
+                    password=imap_password,
+                    insecure=args.insecure,
+                ).get("imap", {})
+            except Exception:
+                error_msg("Failed to autodiscover IMAP settings")
+                if args.debug:
+                    console.print_exception(show_locals=True)
+                raise
+
+            LOGGER.debug(f"Discovered settings: {settings})")
+            args.server = settings.get("server")
+            args.port = settings.get("port", IMAP_PORT)
+            args.starttls = settings.get("starttls")
+            args.ssl = settings.get("ssl")
+
+        if args.sent:
+            args.folder = "Sent"
+
+    if not args.server:
+        error_msg(
+            "No server specified\n"
+            "You need to either:\n"
+            "- specify a server using --server HOSTNAME\n"
+            "- set --google if you are using a Gmail account\n"
+            "- use --auto to attempt autodiscovery"
+        )
+        raise MissingServerException()
+
+    ssl_context = ssl.create_default_context()
+    if args.insecure:
+        ssl_context.check_hostname = False
+        ssl_context.verify_mode = ssl.CERT_NONE
+
+    mb_kwargs = {"host": args.server, "port": args.port}
+    if args.ssl:
+        mb = MailBox
+        mb_kwargs["ssl_context"] = ssl_context
+    elif args.starttls:
+        mb = MailBoxTls
+        mb_kwargs["ssl_context"] = ssl_context
+    else:
+        mb = MailBoxUnencrypted
+
+    mailbox = mb(**mb_kwargs)
+    mailbox.login(args.username, imap_password, args.folder)
+    return mailbox
+
+
+def display_single_mail(
+    mailbox: BaseMailBox,
+    mail_id: int,
+    attachment: str | None = None,
+    mark_seen: bool = False,
+    raw: bool = False,
+    html: bool = False,
+    json: bool = False,
+):
+    LOGGER.debug("Fetch mail %s", mail_id)
+    msg = next(mailbox.fetch(f"UID {mail_id}", mark_seen=mark_seen))
+    LOGGER.debug("Fetched mail %s", msg)
+
+    if attachment:
+        for att in msg.attachments:
+            if att.filename == attachment:
+                sys.stdout.buffer.write(att.payload)
+                return 0
+        print(
+            f"attachment {attachment} not found",
+            file=sys.stderr,
+        )
+        return 1
+
+    if html:
+        output = msg.text
+        if raw:
+            output = msg.html
+        else:
+            output = html2text.html2text(msg.html)
+        print(output)
+    elif raw:
+        print(msg.obj.as_string())
+        return 0
+    elif json:
+        print_json(mail_to_json(msg))
+        return 0
+    else:
+        print(msg.text)
+
+    for att in msg.attachments:
+        print(f"📎 Attachment: {att.filename}", file=sys.stderr)
+    return 0
+
+
+def display_emails(
+    mailbox,
+    console,
+    no_title=False,
+    search="ALL",
+    unread_only=False,
+    count=10,
+    mark_seen=False,
+    json=False,
+    date_format="%H:%M %d/%m/%Y",
+):
+    json_data = []
+    table = Table(
+        show_header=not no_title,
+        header_style="bold",
+        expand=True,
+        show_lines=False,
+        show_edge=False,
+        pad_edge=False,
+        box=None,
+        row_styles=["", "dim"],
+    )
+    table.add_column("ID", style="red", no_wrap=True)
+    table.add_column("Subject", style="green", no_wrap=True, ratio=3)
+    table.add_column("From", style="blue", no_wrap=True, ratio=2)
+    table.add_column("Date", style="cyan", no_wrap=True)
+
+    if unread_only:
+        search = AND(seen=False)
+
+    for msg in mailbox.fetch(
+        criteria=search,
+        reverse=True,
+        bulk=True,
+        limit=count,
+        mark_seen=mark_seen,
+        headers_only=False,  # required for attachments
+    ):
+        subj_prefix = "🆕 " if mail_is_unread(msg) else ""
+        subj_prefix += "📎 " if len(msg.attachments) > 0 else ""
+        subject = (
+            msg.subject.replace("\n", "") if msg.subject else "<no-subject>"
+        )
+        if json:
+            json_data.append(mail_to_dict(msg))
+        else:
+            table.add_row(
+                msg.uid if msg.uid else "???",
+                f"{subj_prefix}{subject}",
+                msg.from_,
+                (msg.date.strftime(date_format) if msg.date else "???"),
+            )
+        if table.row_count >= count:
+            break
+
+    if json:
+        print_json(json_dumps(json_data))
+    else:
+        console.print(table)
+        if table.row_count == 0:
+            print(
+                "[yellow italic]No messages[/yellow italic]",
+                file=sys.stderr,
+            )
+    return 0
+
+
+def delete_emails(mailbox: BaseMailBox, mail_ids: list):
+    LOGGER.warning("Deleting mails %s", mail_ids)
+    mailbox.delete([str(x) for x in mail_ids])
+    return 0
+
+
+def set_seen(mailbox: BaseMailBox, mail_ids: list, value=True):
+    LOGGER.info(
+        "Marking mails as %s: %s", "read" if value else "unread", mail_ids
+    )
+    mailbox.flag(
+        [str(x) for x in mail_ids],
+        flag_set=(MailMessageFlags.SEEN),
+        value=value,
+    )
+    return 0
+
+
+def mark_read(mailbox: BaseMailBox, mail_ids: list):
+    return set_seen(mailbox, mail_ids, value=True)
+
+
+def mark_unread(mailbox: BaseMailBox, mail_ids: list):
+    return set_seen(mailbox, mail_ids, value=False)
+
+
+def main() -> int:
+    console = Console()
+    args = parse_args()
+    logging.basicConfig(
+        format="%(message)s",
+        handlers=[RichHandler(console=console)],
+        level=logging.DEBUG if args.debug else logging.INFO,
+    )
+    LOGGER.debug(args)
+
+    try:
+        with mb_connect(console, args) as mailbox:
+            # inbox display
+            if args.command in ["list", None]:
+                return display_emails(
+                    mailbox=mailbox,
+                    console=console,
+                    no_title=args.no_title,
+                    search=args.search,
+                    unread_only=args.unread,
+                    count=args.count,
+                    mark_seen=args.mark_seen,
+                    json=args.json,
+                    date_format=args.date_format,
+                )
+
+            # single email
+            # FIXME $ myl 219 raises an argparse error
+            elif args.command in ["get", "show", "display"]:
+                return display_single_mail(
+                    mailbox=mailbox,
+                    mail_id=args.MAILID,
+                    attachment=args.ATTACHMENT,
+                    mark_seen=args.mark_seen,
+                    raw=args.raw,
+                    html=args.html,
+                    json=args.json,
+                )
+
+            # mark emails as read
+            elif args.command in ["read"]:
+                return mark_read(
+                    mailbox=mailbox,
+                    mail_ids=args.MAILIDS,
+                )
+
+            elif args.command in ["unread"]:
+                return mark_unread(
+                    mailbox=mailbox,
+                    mail_ids=args.MAILIDS,
+                )
+
+            # delete email
+            elif args.command in ["delete", "remove"]:
+                return delete_emails(
+                    mailbox=mailbox,
+                    mail_ids=args.MAILIDS,
+                )
+            else:
+                error_msg(f"Unknown command: {args.command}")
+                return 1
+
+    except Exception:
+        console.print_exception(show_locals=True)
+        return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{myl-0.8.6 → myl-0.9.2}/pyproject.toml

@@ -16,11 +16,23 @@ classifiers = [
   "Programming Language :: Python :: 3",
 ]
 dependencies = [
-  "imap-tools == 1.0.0",
-  "myl-discovery == 0.5.6",
-  "rich == 13.4.2",
+  "imap-tools >= 1.5.0, < 2.0.0",
+  "myl-discovery >= 0.6.1.dev0",
+  "rich >= 13.0.0, <14.0.0",
+  "html2text >= 2024.2.26"
 ]
-version = "0.8.6"
+dynamic = ["version"]
+
+[tool.setuptools_scm]
+version_file = "version.txt"
+version_scheme = "only-version"
+local_scheme = "no-local-version"
+
+[project.urls]
+homepage = "https://github.com/pschmitt/myl"
+documentation = "https://github.com/pschmitt/myl/blob/head/readme.md"
+repository = "https://github.com/pschmitt/myl"
+issues = "https://github.com/pschmitt/myl/issues"
 
 [tool.black]
 line-length = 79

myl-0.9.2/version.txt

@@ -0,0 +1 @@
+0.9.2

myl-0.8.6/myl.egg-info/requires.txt

@@ -1,3 +0,0 @@
-imap-tools==1.0.0
-myl-discovery==0.5.6
-rich==13.4.2

myl-0.8.6/myl.py

@@ -1,213 +0,0 @@
-import argparse
-import logging
-import sys
-
-import imap_tools
-from myldiscovery import autodiscover
-from rich import print
-from rich.console import Console
-from rich.logging import RichHandler
-from rich.table import Table
-
-LOGGER = logging.getLogger(__name__)
-IMAP_PORT = 993
-GMAIL_IMAP_SERVER = "imap.gmail.com"
-GMAIL_IMAP_PORT = IMAP_PORT
-GMAIL_SENT_FOLDER = "[Gmail]/Sent Mail"
-# GMAIL_ALL_FOLDER = "[Gmail]/All Mail"
-
-
-def error_msg(msg):
-    print(f"[red]{msg}[/red]", file=sys.stderr)
-
-
-def parse_args():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-d", "--debug", help="Debug", action="store_true")
-    parser.add_argument(
-        "-s", "--server", help="IMAP server address", required=False
-    )
-    parser.add_argument(
-        "--google",
-        "--gmail",
-        help="Use Google IMAP settings (overrides --port, --server etc.)",
-        action="store_true",
-        default=False,
-    )
-    parser.add_argument(
-        "-a",
-        "--auto",
-        help="Autodiscovery of the required server and port",
-        action="store_true",
-        default=False,
-    )
-    parser.add_argument(
-        "-P", "--port", help="IMAP server port", default=IMAP_PORT
-    )
-    parser.add_argument(
-        "--starttls", help="Start TLS", action="store_true", default=False
-    )
-    parser.add_argument(
-        "-c",
-        "--count",
-        help="Number of messages to fetch",
-        default=10,
-        type=int,
-    )
-    parser.add_argument(
-        "-m", "--mark-seen", help="Mark seen", action="store_true"
-    )
-    parser.add_argument(
-        "-u", "--username", help="IMAP username", required=True
-    )
-    parser.add_argument(
-        "-p", "--password", help="IMAP password", required=True
-    )
-    parser.add_argument(
-        "-t", "--no-title", help="Do not show title", action="store_true"
-    )
-    parser.add_argument("-f", "--folder", help="IMAP folder", default="INBOX")
-    parser.add_argument(
-        "--sent",
-        help="Sent email",
-        action="store_true",
-    )
-    parser.add_argument("-S", "--search", help="Search string", default="ALL")
-    parser.add_argument("-w", "--wrap", help="Wrap text", action="store_true")
-    parser.add_argument("-H", "--html", help="Show HTML", action="store_true")
-    parser.add_argument(
-        "-r",
-        "--raw",
-        help="Show the raw email",
-        action="store_true",
-        default=False,
-    )
-    parser.add_argument("MAILID", help="Mail ID to fetch", nargs="?")
-    parser.add_argument(
-        "ATTACHMENT", help="Name of the attachment to fetch", nargs="?"
-    )
-
-    return parser.parse_args()
-
-
-def main():
-    console = Console()
-    args = parse_args()
-    logging.basicConfig(
-        format="%(message)s",
-        handlers=[RichHandler(console=console)],
-        level=logging.DEBUG if args.debug else logging.INFO,
-    )
-    LOGGER.debug(args)
-
-    if args.google:
-        args.server = GMAIL_IMAP_SERVER
-        args.port = GMAIL_IMAP_PORT
-        args.starttls = False
-
-        if args.sent or args.folder == "Sent":
-            args.folder = GMAIL_SENT_FOLDER
-        # elif args.folder == "INBOX":
-        #     args.folder = GMAIL_ALL_FOLDER
-    else:
-        if args.auto:
-            try:
-                settings = autodiscover(
-                    args.username, password=args.password
-                ).get("imap")
-            except Exception:
-                error_msg("Failed to autodiscover IMAP settings")
-                if args.debug:
-                    console.print_exception(show_locals=True)
-                return 1
-            LOGGER.debug(f"Discovered settings: {settings})")
-            args.server = settings.get("server")
-            args.port = settings.get("port", IMAP_PORT)
-            args.starttls = settings.get("starttls")
-
-        if args.sent:
-            args.folder = "Sent"
-
-    if not args.server:
-        error_msg(
-            "No server specified\n"
-            "You need to either:\n"
-            "- specify a server using --server HOSTNAME\n"
-            "- set --google if you are using a Gmail account\n"
-            "- use --auto to attempt autodiscovery"
-        )
-        return 2
-
-    table = Table(
-        expand=True,
-        show_header=not args.no_title,
-        header_style="bold",
-        show_lines=False,
-        box=None,
-    )
-    table.add_column("ID", style="red", no_wrap=not args.wrap, max_width=10)
-    table.add_column(
-        "Subject", style="green", no_wrap=not args.wrap, max_width=30
-    )
-    table.add_column("From", style="blue", no_wrap=not args.wrap, max_width=30)
-    table.add_column("Date", style="cyan", no_wrap=not args.wrap)
-
-    mb = imap_tools.MailBoxTls if args.starttls else imap_tools.MailBox
-
-    try:
-        with mb(args.server, port=args.port).login(
-            args.username, args.password, args.folder
-        ) as mailbox:
-            if args.MAILID:
-                msg = next(
-                    mailbox.fetch(
-                        f"UID {args.MAILID}", mark_seen=args.mark_seen
-                    )
-                )
-                if args.ATTACHMENT:
-                    for att in msg.attachments:
-                        if att.filename == args.ATTACHMENT:
-                            sys.stdout.buffer.write(att.payload)
-                            return 0
-                    print(
-                        f"Attachment {args.ATTACHMENT} not found",
-                        file=sys.stderr,
-                    )
-                    return 1
-                else:
-                    if args.raw:
-                        print(msg.obj.as_string())
-                        return 0
-                    print(msg.text if not args.html else msg.html)
-                    for att in msg.attachments:
-                        print(f"📎 Attachment: {att.filename}", file=sys.stderr)
-                return 0
-
-            for msg in mailbox.fetch(
-                criteria=args.search,
-                reverse=True,
-                bulk=True,
-                limit=args.count,
-                mark_seen=args.mark_seen,
-                headers_only=False,  # required for attachments
-            ):
-                subj_prefix = "📎 " if len(msg.attachments) > 0 else ""
-                table.add_row(
-                    msg.uid if msg.uid else "???",
-                    subj_prefix
-                    + (msg.subject if msg.subject else "<no-subject>"),
-                    msg.from_,
-                    msg.date.strftime("%H:%M %d/%m/%Y") if msg.date else "???",
-                )
-                if len(table.rows) >= args.count:
-                    break
-
-        console.print(table)
-        return 0
-    except Exception:
-        console.print_exception(show_locals=True)
-        return 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())