myl 0.8.8__tar.gz → 0.8.10__tar.gz

{myl-0.8.8 → myl-0.8.10}/.github/workflows/release.yaml

@@ -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.8 → myl-0.8.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myl
-Version: 0.8.8
+Version: 0.8.10
 Summary: Dead simple IMAP CLI client
 Author-email: Philipp Schmitt <philipp@schmitt.co>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -688,7 +688,7 @@ 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.5.7
+Requires-Dist: myl-discovery>=0.6.0
 Requires-Dist: rich<14.0.0,>=13.0.0
 
 # 📧 myl

{myl-0.8.8 → myl-0.8.10}/myl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myl
-Version: 0.8.8
+Version: 0.8.10
 Summary: Dead simple IMAP CLI client
 Author-email: Philipp Schmitt <philipp@schmitt.co>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -688,7 +688,7 @@ 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.5.7
+Requires-Dist: myl-discovery>=0.6.0
 Requires-Dist: rich<14.0.0,>=13.0.0
 
 # 📧 myl

{myl-0.8.8 → myl-0.8.10}/myl.egg-info/requires.txt

@@ -1,3 +1,3 @@
 imap-tools<2.0.0,>=1.5.0
-myl-discovery>=0.5.7
+myl-discovery>=0.6.0
 rich<14.0.0,>=13.0.0

{myl-0.8.8 → myl-0.8.10}/myl.py

@@ -1,10 +1,12 @@
 import argparse
+import json
 import logging
+import ssl
 import sys
 
 import imap_tools
 from myldiscovery import autodiscover
-from rich import print
+from rich import print, print_json
 from rich.console import Console
 from rich.logging import RichHandler
 from rich.table import Table
@@ -44,8 +46,15 @@ def parse_args():
     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="Start TLS", action="store_true", default=False
+        "--starttls", help="STARTTLS", action="store_true", default=False
+    )
+    parser.add_argument(
+        "--insecure",
+        help="Disable cert validation",
+        action="store_true",
+        default=False,
     )
     parser.add_argument(
         "-c",
@@ -73,8 +82,14 @@ def parse_args():
         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(
+        "-j",
+        "--json",
+        help="JSON output",
+        action="store_true",
+        default=False,
+    )
     parser.add_argument(
         "-r",
         "--raw",
@@ -124,6 +139,7 @@ def main():
             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"
@@ -138,24 +154,39 @@ def main():
         )
         return 2
 
+    json_data = []
     table = Table(
-        expand=True,
         show_header=not args.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=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)
+    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)
+
+    ssl_context = ssl.create_default_context()
+    if args.insecure:
+        ssl_context.check_hostname = False
+        ssl_context.verify_mode = ssl.CERT_NONE
 
-    mb = imap_tools.MailBoxTls if args.starttls else imap_tools.MailBox
+    mb_kwargs = {"host": args.server, "port": args.port}
+    if args.ssl:
+        mb = imap_tools.MailBox
+        mb_kwargs["ssl_context"] = ssl_context
+    elif args.starttls:
+        mb = imap_tools.MailBoxTls
+        mb_kwargs["ssl_context"] = ssl_context
+    else:
+        mb = imap_tools.MailBoxUnencrypted
 
     try:
-        with mb(args.server, port=args.port).login(
+        with mb(**mb_kwargs).login(
             args.username, args.password, args.folder
         ) as mailbox:
             if args.MAILID:
@@ -178,6 +209,31 @@ def main():
                     if args.raw:
                         print(msg.obj.as_string())
                         return 0
+                    elif args.json:
+                        print_json(
+                            json.dumps(
+                                {
+                                    "uid": msg.uid,
+                                    "subject": msg.subject,
+                                    "from": msg.from_,
+                                    "to": msg.to,
+                                    "date": msg.date.strftime(
+                                        "%Y-%m-%d %H:%M:%S"
+                                    ),
+                                    "timestamp": str(
+                                        int(msg.date.timestamp())
+                                    ),
+                                    "content": {
+                                        "raw": msg.obj.as_string(),
+                                        "html": msg.html,
+                                        "text": msg.text,
+                                    },
+                                    "attachments": msg.attachments,
+                                }
+                            )
+                        )
+                        return 0
+
                     print(msg.text if not args.html else msg.html)
                     for att in msg.attachments:
                         print(
@@ -194,17 +250,46 @@ def main():
                 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 "???",
+                subject = (
+                    msg.subject.replace("\n", "")
+                    if msg.subject
+                    else "<no-subject>"
                 )
+                if args.json:
+                    json_data.append(
+                        {
+                            "uid": msg.uid,
+                            "subject": msg.subject,
+                            "from": msg.from_,
+                            "to": msg.to,
+                            "date": msg.date.strftime("%Y-%m-%d %H:%M:%S"),
+                            "timestamp": str(int(msg.date.timestamp())),
+                            "content": {
+                                "raw": msg.obj.as_string(),
+                                "html": msg.html,
+                                "text": msg.text,
+                            },
+                            "attachments": msg.attachments,
+                        }
+                    )
+                else:
+                    table.add_row(
+                        msg.uid if msg.uid else "???",
+                        f"{subj_prefix}{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)
+        if args.json:
+            print_json(json.dumps(json_data))
+        else:
+            console.print(table)
         return 0
     except Exception:
         console.print_exception(show_locals=True)

{myl-0.8.8 → myl-0.8.10}/pyproject.toml

@@ -17,10 +17,10 @@ classifiers = [
 ]
 dependencies = [
   "imap-tools >= 1.5.0, < 2.0.0",
-  "myl-discovery >= 0.5.7",
+  "myl-discovery >= 0.6.0",
   "rich >= 13.0.0, <14.0.0",
 ]
-version = "0.8.8"
+version = "0.8.10"
 
 [project.urls]
 homepage = "https://github.com/pschmitt/myl"