jarno
/
hydroxide-push
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Allow import-messages to read from stdin

This commit is contained in:
Simon Ser 2021-11-10 14:36:47 +01:00
parent 9876df6309
commit eed76df6b5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/hydroxide/main.go
View File

@ -175,7 +175,7 @@ Commands:
carddav Run hydroxide as a CardDAV server
export-secret-keys <username> Export secret keys
imap Run hydroxide as an IMAP server
import-messages <username> <file> Import messages
import-messages <username> [file] Import messages
export-messages [options...] <username> Export messages
sendmail <username> -- <args...> sendmail(1) interface
serve Run all servers
@ -398,15 +398,18 @@ func main() {
importMessagesCmd.Parse(flag.Args()[1:])
username := importMessagesCmd.Arg(0)
archivePath := importMessagesCmd.Arg(1)
if username == "" || archivePath == "" {
log.Fatal("usage: hydroxide import-messages <username> <file>")
if username == "" {
log.Fatal("usage: hydroxide import-messages <username> [file]")
}
f, err := os.Open(archivePath)
if err != nil {
log.Fatal(err)
f := os.Stdin
if archivePath != "" {
f, err = os.Open(archivePath)
if err != nil {
log.Fatal(err)
}
defer f.Close()
}
defer f.Close()
bridgePassword, err := askBridgePass()
if err != nil {