mirror of https://github.com/schollz/croc.git
prompt user if its okay to receive file
This commit is contained in:
parent
1add7e94c9
commit
6d9c829579
|
@ -10,6 +10,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/briandowns/spinner"
|
"github.com/briandowns/spinner"
|
||||||
|
humanize "github.com/dustin/go-humanize"
|
||||||
"github.com/schollz/croc/src/zipper"
|
"github.com/schollz/croc/src/zipper"
|
||||||
|
|
||||||
log "github.com/cihub/seelog"
|
log "github.com/cihub/seelog"
|
||||||
|
@ -93,11 +94,34 @@ func receive(c *websocket.Conn, codephrase string) (err error) {
|
||||||
case 2:
|
case 2:
|
||||||
spin.Stop()
|
spin.Stop()
|
||||||
|
|
||||||
|
// unmarshal the file info
|
||||||
log.Debugf("[%d] recieve file info", step)
|
log.Debugf("[%d] recieve file info", step)
|
||||||
err = json.Unmarshal(message, &fstats)
|
err = json.Unmarshal(message, &fstats)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// prompt user if its okay to receive file
|
||||||
|
overwritingOrReceiving := "Receiving"
|
||||||
|
if utils.Exists(fstats.Name) {
|
||||||
|
overwritingOrReceiving = "Overwriting"
|
||||||
|
}
|
||||||
|
fileOrFolder := "file"
|
||||||
|
if fstats.IsDir {
|
||||||
|
fileOrFolder = "folder"
|
||||||
|
}
|
||||||
|
if "y" != utils.GetInput(fmt.Sprintf(
|
||||||
|
`%s %s (%s) into: %s
|
||||||
|
ok? (y/N): `,
|
||||||
|
overwritingOrReceiving,
|
||||||
|
fileOrFolder,
|
||||||
|
humanize.Bytes(uint64(fstats.Size)),
|
||||||
|
fstats.Name,
|
||||||
|
)) {
|
||||||
|
fmt.Fprintf(os.Stderr, "cancelling request")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// await file
|
// await file
|
||||||
f, err := os.Create(fstats.SentName)
|
f, err := os.Create(fstats.SentName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue