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

move some functions out of main into packages

Browse source 
- confirm functions into files package
- newpath prompter into promt package
This commit is contained in:
Lilian Jónsdóttir 2024-07-27 16:42:23 -07:00
parent 095f59babb
commit 7fade0ce4c
3 changed files with 130 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
internal/files/trash.go
View file

@ -13,7 +13,6 @@ import (
"git.burning.moe/celediel/gt/internal/filter"
"git.burning.moe/celediel/gt/internal/prompt"
"github.com/charmbracelet/huh"
"github.com/charmbracelet/log"
"github.com/dustin/go-humanize"
"gitlab.com/tymonx/go-formatter/formatter"
@ -130,7 +129,7 @@ func Restore(files Files) (restored int, err error) {
var cancel bool
log.Infof("restoring %s back to %s\n", file.name, outpath)
if _, e := os.Lstat(outpath); e == nil {
outpath, cancel = promptNewPath(outpath)
outpath, cancel = prompt.NewPath(outpath)
}
if cancel {
@ -157,6 +156,20 @@ func Restore(files Files) (restored int, err error) {
return restored, err
}
func ConfirmRestore(confirm bool, fs Files) error {
if !confirm || prompt.YesNo(fmt.Sprintf("restore %d selected files?", len(fs))) {
log.Info("doing the thing")
restored, err := Restore(fs)
if err != nil {
return fmt.Errorf("restored %d files before error %s", restored, err)
}
fmt.Printf("restored %d files\n", restored)
} else {
fmt.Printf("not doing anything\n")
}
return nil
}
func Remove(files Files) (removed int, err error) {
for _, maybeFile := range files {
file, ok := maybeFile.(TrashInfo)
@ -183,6 +196,21 @@ func Remove(files Files) (removed int, err error) {
return removed, err
}
func ConfirmClean(confirm bool, fs Files) error {
if prompt.YesNo(fmt.Sprintf("remove %d selected files permanently from the trash?", len(fs))) &&
(!confirm || prompt.YesNo(fmt.Sprintf("really remove all these %d selected files permanently from the trash forever??", len(fs)))) {
log.Info("gonna remove some files forever")
removed, err := Remove(fs)
if err != nil {
return fmt.Errorf("removed %d files before error %s", removed, err)
}
fmt.Printf("removed %d files\n", removed)
} else {
fmt.Printf("not doing anything\n")
}
return nil
}
func TrashFile(trashDir, name string) error {
trashinfo_filename, out_path := ensureUniqueName(filepath.Base(name), trashDir)
@ -218,6 +246,32 @@ func TrashFiles(trashDir string, files ...string) (trashed int, err error) {
return trashed, err
}
func ConfirmTrash(confirm bool, fs Files, trashDir string) error {
if !confirm || prompt.YesNo(fmt.Sprintf("trash %d selected files?", len(fs))) {
tfs := make([]string, 0, len(fs))
for _, file := range fs {
log.Debugf("gonna trash %s", file.Path())
tfs = append(tfs, file.Path())
}
trashed, err := TrashFiles(trashDir, tfs...)
if err != nil {
return err
}
var f string
if trashed == 1 {
f = "file"
} else {
f = "files"
}
fmt.Printf("trashed %d %s\n", trashed, f)
} else {
fmt.Printf("not doing anything\n")
return nil
}
return nil
}
func randomFilename(length int) string {
out := strings.Builder{}
for range length {
@ -258,25 +312,3 @@ func ensureUniqueName(filename, trashDir string) (string, string) {
}
}
}
func promptNewPath(path string) (string, bool) {
for {
answer := prompt.AskRune(fmt.Sprintf("file %s exists, overwrite, rename, or cancel?", path), "o/r/c")
switch answer {
case 'o', 'O':
return path, false
case 'r', 'R':
if err := huh.NewInput().
Title("input a new filename").
Value(&path).
Run(); err != nil {
return path, false
}
if _, e := os.Stat(path); e != nil {
return path, false
}
default:
return path, true
}
}
}

23
internal/prompt/prompt.go
View file

@ -6,6 +6,7 @@ import (
"log"
"os"
"github.com/charmbracelet/huh"
"golang.org/x/term"
)
@ -38,3 +39,25 @@ func AskRune(prompt, options string) byte {
return bytes.ToLower(b)[0]
}
func NewPath(path string) (string, bool) {
for {
answer := AskRune(fmt.Sprintf("file %s exists, overwrite, rename, or cancel?", path), "o/r/c")
switch answer {
case 'o', 'O':
return path, false
case 'r', 'R':
if err := huh.NewInput().
Title("input a new filename").
Value(&path).
Run(); err != nil {
return path, false
}
if _, e := os.Stat(path); e != nil {
return path, false
}
default:
return path, true
}
}
}

165
main.go
View file

@ -6,13 +6,11 @@ import (
"os"
"path/filepath"
"slices"
"strconv"
"time"
"git.burning.moe/celediel/gt/internal/filemode"
"git.burning.moe/celediel/gt/internal/files"
"git.burning.moe/celediel/gt/internal/filter"
"git.burning.moe/celediel/gt/internal/prompt"
"git.burning.moe/celediel/gt/internal/tables"
"git.burning.moe/celediel/gt/internal/tables/modes"
@ -102,6 +100,7 @@ var (
}
if len(ctx.Args().Slice()) != 0 {
// args, so try to trash files
var files_to_trash files.Files
for _, arg := range ctx.Args().Slice() {
file, e := files.NewDisk(arg)
@ -110,9 +109,54 @@ var (
}
files_to_trash = append(files_to_trash, file)
}
return confirmTrash(askconfirm, files_to_trash)
return files.ConfirmTrash(askconfirm, files_to_trash, trashDir)
} else {
return interactiveMode()
// no ags, so do interactive mode
var (
infiles files.Files
selected files.Files
mode modes.Mode
err error
)
infiles, err = files.FindTrash(trashDir, ogdir, f)
if err != nil {
return err
}
if len(infiles) <= 0 {
var msg string
if f.Blank() {
msg = "trash is empty"
} else {
msg = "no files to show"
}
fmt.Println(msg)
return nil
}
selected, mode, err = tables.Select(infiles, termwidth, termheight, false, false, false, workdir, modes.Interactive)
if err != nil {
return err
}
switch mode {
case modes.Cleaning:
for _, file := range selected {
log.Debugf("gonna clean %s", file.Name())
}
if err := files.ConfirmClean(askconfirm, selected); err != nil {
return err
}
case modes.Restoring:
for _, file := range selected {
log.Debugf("gonna restore %s", file.Name())
}
if err := files.ConfirmRestore(askconfirm, selected); err != nil {
return err
}
case modes.Interactive:
return nil
default:
return fmt.Errorf("got bad mode %s", mode)
}
return nil
}
}
@ -188,7 +232,7 @@ var (
return nil
}
return confirmTrash(askconfirm, selected)
return files.ConfirmTrash(askconfirm, selected, trashDir)
},
}
@ -253,7 +297,7 @@ var (
return nil
}
return confirmRestore(askconfirm || all, selected)
return files.ConfirmRestore(askconfirm || all, selected)
},
}
@ -281,7 +325,7 @@ var (
return nil
}
return confirmClean(askconfirm, selected)
return files.ConfirmClean(askconfirm, selected)
},
}
@ -452,110 +496,3 @@ func main() {
log.Fatal(err)
}
}
func interactiveMode() error {
var (
infiles files.Files
selected files.Files
mode modes.Mode
err error
)
infiles, err = files.FindTrash(trashDir, ogdir, f)
if err != nil {
return err
}
if len(infiles) <= 0 {
var msg string
if f.Blank() {
msg = "trash is empty"
} else {
msg = "no files to show"
}
fmt.Println(msg)
return nil
}
selected, mode, err = tables.Select(infiles, termwidth, termheight, false, false, false, workdir, modes.Interactive)
if err != nil {
return err
}
switch mode {
case modes.Cleaning:
for _, file := range selected {
log.Debugf("gonna clean %s", file.Name())
}
if err := confirmClean(askconfirm, selected); err != nil {
return err
}
case modes.Restoring:
for _, file := range selected {
log.Debugf("gonna restore %s", file.Name())
}
if err := confirmRestore(askconfirm, selected); err != nil {
return err
}
case modes.Interactive:
return nil
default:
return fmt.Errorf("got bad mode %s", mode)
}
return nil
}
func confirmRestore(confirm bool, fs files.Files) error {
if !confirm || prompt.YesNo(fmt.Sprintf("restore %d selected files?", len(fs))) {
log.Info("doing the thing")
restored, err := files.Restore(fs)
if err != nil {
return fmt.Errorf("restored %d files before error %s", restored, err)
}
fmt.Printf("restored %d files\n", restored)
} else {
fmt.Printf("not doing anything\n")
}
return nil
}
func confirmClean(confirm bool, fs files.Files) error {
if prompt.YesNo(fmt.Sprintf("remove %d selected files permanently from the trash?", len(fs))) &&
(!confirm || prompt.YesNo(fmt.Sprintf("really remove all these %d selected files permanently from the trash forever??", len(fs)))) {
log.Info("gonna remove some files forever")
removed, err := files.Remove(fs)
if err != nil {
return fmt.Errorf("removed %d files before error %s", removed, err)
}
fmt.Printf("removed %d files\n", removed)
} else {
fmt.Printf("not doing anything\n")
}
return nil
}
func confirmTrash(confirm bool, fs files.Files) error {
if !confirm || prompt.YesNo(fmt.Sprintf("trash %d selected files?", len(fs))) {
tfs := make([]string, 0, len(fs))
for _, file := range fs {
log.Debugf("gonna trash %s", file.Path())
tfs = append(tfs, file.Path())
}
trashed, err := files.TrashFiles(trashDir, tfs...)
if err != nil {
return err
}
var f string
if trashed == 1 {
f = "file"
} else {
f = "files"
}
fmt.Printf("trashed %d %s\n", trashed, f)
} else {
fmt.Printf("not doing anything\n")
return nil
}
return nil
}