Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #390 from wamserma/patch-1 

Distinguish text message from file in receipient dialog
This commit is contained in:
Zack 2021-05-07 10:20:53 -07:00 committed by GitHub
parent bd4886ae3c d5fd2060dd
commit 422f099e5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/croc/croc.go
View File

@ -804,18 +804,17 @@ func (c *Client) processMessageFileInfo(m message.Message) (done bool, err error
}
}
// c.spinner.Stop()
if strings.HasPrefix(fname, "'croc-stdin") {
fname = "'stdin'"
if c.Options.SendingText {
fname = "'text'"
}
action = "Accept"
if c.Options.SendingText {
action = "Display"
fname = "text message"
}
if !c.Options.NoPrompt || c.Options.Ask || senderInfo.Ask {
if c.Options.Ask || senderInfo.Ask {
machID, _ := machineid.ID()
fmt.Fprintf(os.Stderr, "\rYour machine id is '%s'.\nAccept %s (%s) from '%s'? (y/n) ", machID, fname, utils.ByteCountDecimal(totalSize), senderInfo.MachineID)
fmt.Fprintf(os.Stderr, "\rYour machine id is '%s'.\n%s %s (%s) from '%s'? (y/n) ", machID, action, fname, utils.ByteCountDecimal(totalSize), senderInfo.MachineID)
} else {
fmt.Fprintf(os.Stderr, "\rAccept %s (%s)? (y/n) ", fname, utils.ByteCountDecimal(totalSize))
fmt.Fprintf(os.Stderr, "\r%s %s (%s)? (y/n) ", action, fname, utils.ByteCountDecimal(totalSize))
}
if strings.ToLower(strings.TrimSpace(utils.GetInput(""))) != "y" {
err = message.Send(c.conn[0], c.Key, message.Message{