extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-26 02:14:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmd/ncdu: display correct path in delete confirmation dialog

Browse Source 
If the remote on the command line is "remote:subdir", when
deleting "filename", the confirmation message shows the path
"remote:subdirfilename".
Using fspath.JoinRootPath() fixes this. Also use this function
and fs.ConfigString() in other parts of the file, since they
are more appropriate.
This commit is contained in:
Roberto Ricci 2021-11-09 16:09:12 +01:00 committed by Nick Craig-Wood
parent 3a20929db4
commit 0f41e91d41
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/ncdu/ncdu.go
View File

@ -19,6 +19,7 @@ import (
"github.com/rclone/rclone/cmd" "github.com/rclone/rclone/cmd"
"github.com/rclone/rclone/cmd/ncdu/scan" "github.com/rclone/rclone/cmd/ncdu/scan"
"github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fs/fspath"
"github.com/rclone/rclone/fs/operations" "github.com/rclone/rclone/fs/operations"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -529,7 +530,7 @@ func (u *UI) delete() {
} }
u.popupBox([]string{ u.popupBox([]string{
"Delete this file?", "Delete this file?",
u.fsName + dirEntry.String()}) fspath.JoinRootPath(u.fsName, dirEntry.String())})
} else { } else {
u.boxMenuHandler = func(f fs.Fs, p string, o int) (string, error) { u.boxMenuHandler = func(f fs.Fs, p string, o int) (string, error) {
if o != 1 { if o != 1 {
@ -548,7 +549,7 @@ func (u *UI) delete() {
u.popupBox([]string{ u.popupBox([]string{
"Purge this directory?", "Purge this directory?",
"ALL files in it will be deleted", "ALL files in it will be deleted",
u.fsName + dirEntry.String()}) fspath.JoinRootPath(u.fsName, dirEntry.String())})
} }
} }
@ -659,7 +660,7 @@ func (u *UI) sortCurrentDir() {
func (u *UI) setCurrentDir(d *scan.Dir) { func (u *UI) setCurrentDir(d *scan.Dir) {
u.d = d u.d = d
u.entries = d.Entries() u.entries = d.Entries()
u.path = path.Join(u.fsName, d.Path()) u.path = fspath.JoinRootPath(u.fsName, d.Path())
u.sortCurrentDir() u.sortCurrentDir()
} }
@ -742,7 +743,7 @@ func NewUI(f fs.Fs) *UI {
f: f, f: f,
path: "Waiting for root...", path: "Waiting for root...",
dirListHeight: 20, // updated in Draw dirListHeight: 20, // updated in Draw
fsName: f.Name() + ":" + f.Root(), fsName: fs.ConfigString(f),
showGraph: true, showGraph: true,
showCounts: false, showCounts: false,
showDirAverageSize: false, showDirAverageSize: false,