util/bb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ls: fixed way of handling hidden but pointed as an argument files.

Browse source
This commit is contained in:
k1574 2020-12-31 19:39:03 +05:00
parent f7fb263f8b
commit 5ee07e0dd4
1 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
ls/ls.go
View file

@ -10,8 +10,13 @@ import(
var( var(
listHidden bool listHidden bool
args []string
arg0 string
flagSet *flag.FlagSet
) )
var slashRegexp = regexp.MustCompile("/+")
func IsDir(p string) (bool, error) { func IsDir(p string) (bool, error) {
finfo, e := os.Stat(p) finfo, e := os.Stat(p)
if e != nil { if e != nil {
@ -34,7 +39,8 @@ func ReadDir(p string) ([]os.FileInfo, error) {
return l, nil return l, nil
} }
func Stat(p string) (os.FileInfo, error) { func
Stat(p string) (os.FileInfo, error) {
f, e := os.Open(p) f, e := os.Open(p)
if e != nil { if e != nil {
return nil, e return nil, e
@ -44,29 +50,55 @@ func Stat(p string) (os.FileInfo, error) {
return s, nil return s, nil
} }
func findString(slice []string, val string) (int, bool) {
for i, v := range slice {
if v == val {
return i, true
}
}
return -1, false
}
func
isHidden(p string) bool {
if path.Base(p)[0] == '.' {
return true
}
return false
}
func shouldList(p string) bool { func shouldList(p string) bool {
if !listHidden && path.Base(p)[0]=='.' { if _, found := findString(args, p) ; found {
return true
}
if !listHidden && isHidden(p) {
return false return false
} }
return true return true
} }
func ls(p string, fold int) error { func
deleteExceedSlashes(p string) string {
p = slashRegexp.ReplaceAllString(p, "/")
if p != "/" { // Do not trim if it is root dir.
p = strings.TrimRight(p, "/")
}
return p
}
func
ls(p string, fold int) error {
if !shouldList(p) { if !shouldList(p) {
return nil return nil
} }
p = deleteExceedSlashes(p)
isDir, e := IsDir(p) isDir, e := IsDir(p)
if e != nil { if e != nil {
return e return e
} }
// Delete repeating slashes.
slash := regexp.MustCompile("/+")
p = slash.ReplaceAllString(p, "/")
if p != "/" { // Do not trim if it is root dir.
p = strings.TrimRight(p, "/")
}
if !isDir { if !isDir {
fmt.Println(p) fmt.Println(p)
@ -94,16 +126,16 @@ func ls(p string, fold int) error {
return nil return nil
} }
func Run(args []string) int { func Run(argv []string) int {
status := 0 status := 0
arg0 := args[0] arg0 = argv[0]
args = args[1:] args = argv[1:]
flagSet := flag.NewFlagSet(arg0, flag.ExitOnError) flagSet = flag.NewFlagSet(arg0, flag.ExitOnError)
var foldLvl int var foldLvl int
flagSet.IntVar(&foldLvl, "r", 1, "List recursively with choosing deepness, can't be negative or zero.") flagSet.IntVar(&foldLvl, "r", 1, "List recursively with choosing deepness, can't be negative or zero.")
flagSet.BoolVar(&listHidden, "a", false, "List hidden files.") flagSet.BoolVar(&listHidden, "a", false, "List hidden files.")
flagSet.Usage = func() { flagSet.Usage = func() {
fmt.Fprintf(os.Stderr, "Usage of %s: %s [files]\n", arg0, arg0) fmt.Fprintf(os.Stderr, "usage: %s [files]\n", arg0, arg0)
flagSet.PrintDefaults() flagSet.PrintDefaults()
} }
flagSet.Parse(args) flagSet.Parse(args)
@ -136,7 +168,9 @@ func Run(args []string) int {
e := ls(f.Name(), foldLvl) e := ls(f.Name(), foldLvl)
if e!=nil { if e!=nil {
status = 1 status = 1
fmt.Fprintf(os.Stderr, "%s: %s.\n", arg0, e) fmt.Fprintf(os.Stderr,
"%s: %s\n",
arg0, e)
} }
} }
} }
@ -146,7 +180,7 @@ func Run(args []string) int {
e := ls(p, foldLvl) e := ls(p, foldLvl)
if e != nil { if e != nil {
status = 1 status = 1
fmt.Fprintf(os.Stderr, "%s: %s.\n", arg0, e) fmt.Fprintf(os.Stderr, "%s: %s\n", arg0, e)
} }
} }