celediel/gt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 2 Wiki Activity

always confirm once when permanently removing from trash

Browse source 
otherwise, askconfirm is respected
when askconfirm is true, trash cleaning requires two confirms
This commit is contained in:
Lilian Jónsdóttir 2024-06-20 11:37:48 -07:00
parent 285969a269
commit 7b4751c1ae
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
main.go
View file

@ -418,7 +418,7 @@ func interactive_mode() error {
} }
func confirm_restore(is trash.Infos) error { func confirm_restore(is trash.Infos) error {
if confirm(fmt.Sprintf("restore %d selected files?", len(is))) { if !askconfirm || confirm(fmt.Sprintf("restore %d selected files?", len(is))) {
log.Info("doing the thing") log.Info("doing the thing")
restored, err := trash.Restore(is) restored, err := trash.Restore(is)
if err != nil { if err != nil {
@ -433,7 +433,7 @@ func confirm_restore(is trash.Infos) error {
func confirm_clean(is trash.Infos) error { func confirm_clean(is trash.Infos) error {
if confirm(fmt.Sprintf("remove %d selected files permanently from the trash?", len(is))) && if confirm(fmt.Sprintf("remove %d selected files permanently from the trash?", len(is))) &&
confirm(fmt.Sprintf("really remove all these %d selected files permanently from the trash forever??", len(is))) { (!askconfirm || confirm(fmt.Sprintf("really remove all these %d selected files permanently from the trash forever??", len(is)))) {
log.Info("gonna remove some files forever") log.Info("gonna remove some files forever")
removed, err := trash.Remove(is) removed, err := trash.Remove(is)
if err != nil { if err != nil {
@ -447,7 +447,7 @@ func confirm_clean(is trash.Infos) error {
} }
func confirm_trash(fs files.Files) error { func confirm_trash(fs files.Files) error {
if confirm(fmt.Sprintf("trash %d selected files?", len(fs))) { if !askconfirm || confirm(fmt.Sprintf("trash %d selected files?", len(fs))) {
tfs := make([]string, 0, len(fs)) tfs := make([]string, 0, len(fs))
for _, file := range fs { for _, file := range fs {
log.Debugf("gonna trash %s", file.Filename()) log.Debugf("gonna trash %s", file.Filename())
@ -467,9 +467,6 @@ func confirm_trash(fs files.Files) error {
} }
func confirm(prompt string) bool { func confirm(prompt string) bool {
if !askconfirm {
return true
}
// TODO: handle errors better // TODO: handle errors better
// switch stdin into 'raw' mode // switch stdin into 'raw' mode
oldState, err := term.MakeRaw(int(os.Stdin.Fd())) oldState, err := term.MakeRaw(int(os.Stdin.Fd()))