Skip to content

Add initial no-tty implementation #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bulters wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add initial no-tty implementation #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ var (
smtpEncryption string
smtpInsecureSkipVerify bool
resendAPIKey string
noTTY bool
)

var rootCmd = &cobra.Command{
Expand Down Expand Up @@ -115,6 +116,30 @@ var rootCmd = &cobra.Command{
body += "\n\n" + signature
}

if noTTY && (len(to) == 0 || from == "" || subject == "" || body == "" || preview) {
var missing []string
if from == "" {
missing = append(missing, "--from")
}
if len(to) == 0 {
missing = append(missing, "--to")
}
if subject == "" {
missing = append(missing, "--subject")
}
if body == "" {
missing = append(missing, "--body")
}
if preview {
missing = append(missing, "(--preview is not supported with --no-tty)")
}
err := fmt.Errorf("missing required flags in --no-tty mode: %s", strings.Join(missing, ", "))
fmt.Fprintln(os.Stderr, err.Error())
cmd.SilenceUsage = true
cmd.SilenceErrors = true
return err
}

if len(to) > 0 && from != "" && subject != "" && body != "" && !preview {
var err error
switch deliveryMethod {
Expand All @@ -128,8 +153,12 @@ var rootCmd = &cobra.Command{
if err != nil {
cmd.SilenceUsage = true
cmd.SilenceErrors = true
if noTTY {
fmt.Fprintln(os.Stderr, err.Error())
} else {
fmt.Println(errorStyle.Render(err.Error()))
return err
}
return err
}
fmt.Print(emailSummary(to, subject))
return nil
Expand Down Expand Up @@ -226,6 +255,7 @@ func init() {
rootCmd.Flags().BoolVarP(&smtpInsecureSkipVerify, "smtp.insecure", "i", envInsecureSkipVerify, "Skip TLS verification with SMTP server"+commentStyle.Render("($"+PopSMTPInsecureSkipVerify+")"))
envResendAPIKey := os.Getenv(ResendAPIKey)
rootCmd.Flags().StringVarP(&resendAPIKey, "resend.key", "r", envResendAPIKey, "API key for the Resend.com"+commentStyle.Render("($"+ResendAPIKey+")"))
rootCmd.Flags().BoolVarP(&noTTY, "no-tty", "n", false, "Don't use the interactive TUI, errors are written to STDERR")

rootCmd.CompletionOptions.HiddenDefaultCmd = true

Expand Down