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

play nice with other implementations that replace " " with "%20"

Browse source
This commit is contained in:
Lilian Jónsdóttir 2024-06-28 10:45:44 -07:00
parent f9232a095b
commit a3ff94ec8e
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/trash/trash.go
View file

@ -10,6 +10,7 @@ import (
"strings"
"time"
"git.burning.moe/celediel/gt/internal/dirs"
"git.burning.moe/celediel/gt/internal/filter"
"github.com/charmbracelet/log"
"github.com/dustin/go-humanize"
@ -111,8 +112,9 @@ func FindFiles(trashdir, ogdir string, f *filter.Filter) (files Infos, outerr er
func Restore(files []Info) (restored int, err error) {
for _, file := range files {
log.Infof("restoring %s back to %s\n", file.name, file.ogpath)
if err = os.Rename(file.path, file.ogpath); err != nil {
var outpath string = dirs.UnEscape(file.ogpath)
log.Infof("restoring %s back to %s\n", file.name, outpath)
if err = os.Rename(file.path, outpath); err != nil {
return restored, err
}
if err = os.Remove(file.trashinfo); err != nil {