s2k-cli 0.1.0__tar.gz → 0.2.0__tar.gz

{s2k_cli-0.1.0 → s2k_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: s2k-cli
-Version: 0.1.0
+Version: 0.2.0
 Summary: Send local files to your Kindle from the command line.
 License: MIT
 Keywords: kindle,send-to-kindle,ebook,email,cli

{s2k_cli-0.1.0 → s2k_cli-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "s2k-cli"
-version = "0.1.0"
+version = "0.2.0"
 description = "Send local files to your Kindle from the command line."
 authors = [{ name = "Marco Fura", email = "mjfura27@gmail.com" }]
 readme = "README.md"

{s2k_cli-0.1.0 → s2k_cli-0.2.0}/src/send_2_kindle/config.py

@@ -33,8 +33,10 @@ def config_file_path() -> Path:
     override = os.environ.get(CONFIG_FILE_VARIABLE)
     if override:
         return Path(override).expanduser()
-    base = os.environ.get("XDG_CONFIG_HOME") or "~/.config"
-    return Path(base).expanduser() / "s2k" / "config.env"
+    xdg = os.environ.get("XDG_CONFIG_HOME", "")
+    # The XDG spec says relative values must be ignored.
+    base = Path(xdg) if xdg and Path(xdg).is_absolute() else Path("~/.config").expanduser()
+    return base / "s2k" / "config.env"
 
 
 class Settings(BaseSettings):

{s2k_cli-0.1.0 → s2k_cli-0.2.0}/src/send_2_kindle/mailer.py

@@ -43,6 +43,14 @@ def _auth_failure_message(settings: Settings) -> str:
     return message
 
 
+def _security_hint(settings: Settings) -> str:
+    if settings.smtp_port == 465 and settings.smtp_security == "starttls":
+        return " (port 465 normally needs S2K_SMTP_SECURITY=ssl)"
+    if settings.smtp_port == 587 and settings.smtp_security == "ssl":
+        return " (port 587 normally needs S2K_SMTP_SECURITY=starttls)"
+    return ""
+
+
 def _close_quietly(smtp: smtplib.SMTP | None) -> None:
     if smtp is not None:
         smtp.close()
@@ -112,6 +120,7 @@ class KindleMailer:
             _close_quietly(smtp)
             raise SmtpConnectionError(
                 f"could not connect to {settings.smtp_host}:{settings.smtp_port}: {error}"
+                f"{_security_hint(settings)}"
             ) from error
         self._smtp = smtp
         return self

{s2k_cli-0.1.0 → s2k_cli-0.2.0}/src/send_2_kindle/wizard.py

@@ -46,7 +46,11 @@ def _quote(value: str) -> str:
 
 
 def write_config(path: Path, values: dict[str, str]) -> None:
-    """Atomically write ``values`` as KEY="value" lines to ``path`` (mode 600, new dirs 700)."""
+    """Atomically write ``values`` as KEY="value" lines to ``path`` (mode 600, new dirs 700).
+
+    A symlinked config file (e.g. managed by a dotfiles repo) is kept: its target is rewritten.
+    """
+    path = path.resolve() if path.is_symlink() else path
     path.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
     content = HEADER + "".join(f"{key}={_quote(value)}\n" for key, value in values.items())
     fd, temp_name = tempfile.mkstemp(dir=path.parent, prefix=".config.env.")
@@ -79,16 +83,24 @@ def _ask(text: str, adapter: TypeAdapter[Any], default: str | None) -> str:
 
 
 def _ask_password(has_current: bool) -> str | None:
-    """Return the new password, or None to keep the current one."""
-    if has_current:
-        answer = typer.prompt(
-            "SMTP password (empty keeps the current one)",
-            default="",
-            hide_input=True,
-            show_default=False,
-        )
-        return str(answer) or None
-    return str(typer.prompt("SMTP password", hide_input=True))
+    """Return the new password (typed twice), or None to keep the current one."""
+    while True:
+        if has_current:
+            answer = str(
+                typer.prompt(
+                    "SMTP password (empty keeps the current one)",
+                    default="",
+                    hide_input=True,
+                    show_default=False,
+                )
+            )
+            if not answer:
+                return None
+        else:
+            answer = str(typer.prompt("SMTP password", hide_input=True))
+        if str(typer.prompt("Repeat the SMTP password", hide_input=True)) == answer:
+            return answer
+        typer.secho("  The passwords do not match; try again.", fg=typer.colors.YELLOW)
 
 
 def _collect(current: dict[str, str]) -> dict[str, str]: