github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-06 04:52:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

caplets: Swap Error Returns

Browse source
This commit is contained in:
Lars Lehtonen 2019-11-13 15:39:20 -08:00
parent 63d5ce7118
commit 07459424fb
No known key found for this signature in database
GPG key ID: 8137D474EBCB04F2
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
caplets/manager.go
View file

@ -28,7 +28,7 @@ func List() []*Caplet {
base := strings.Replace(fileName, searchPath+string(os.PathSeparator), "", -1) base := strings.Replace(fileName, searchPath+string(os.PathSeparator), "", -1)
base = strings.Replace(base, Suffix, "", -1) base = strings.Replace(base, Suffix, "", -1)
if err, caplet := Load(base); err != nil { if caplet, err := Load(base); err != nil {
fmt.Fprintf(os.Stderr, "wtf: %v\n", err) fmt.Fprintf(os.Stderr, "wtf: %v\n", err)
} else { } else {
caplets = append(caplets, caplet) caplets = append(caplets, caplet)
@ -44,12 +44,12 @@ func List() []*Caplet {
return caplets return caplets
} }
func Load(name string) (error, *Caplet) { func Load(name string) (*Caplet, error) {
cacheLock.Lock() cacheLock.Lock()
defer cacheLock.Unlock() defer cacheLock.Unlock()
if caplet, found := cache[name]; found { if caplet, found := cache[name]; found {
return nil, caplet return caplet, nil
} }
baseName := name baseName := name
@ -76,7 +76,7 @@ func Load(name string) (error, *Caplet) {
cache[name] = cap cache[name] = cap
if reader, err := fs.LineReader(fileName); err != nil { if reader, err := fs.LineReader(fileName); err != nil {
return fmt.Errorf("error reading caplet %s: %v", fileName, err), nil return nil, fmt.Errorf("error reading caplet %s: %v", fileName, err)
} else { } else {
for line := range reader { for line := range reader {
cap.Code = append(cap.Code, line) cap.Code = append(cap.Code, line)
@ -103,9 +103,8 @@ func Load(name string) (error, *Caplet) {
} }
} }
return nil, cap return cap, nil
} }
} }
return nil, fmt.Errorf("caplet %s not found", name)
return fmt.Errorf("caplet %s not found", name), nil
} }

4
session/session.go
View file

@ -361,7 +361,7 @@ func (s *Session) ReadLine() (string, error) {
} }
func (s *Session) RunCaplet(filename string) error { func (s *Session) RunCaplet(filename string) error {
err, caplet := caplets.Load(filename) caplet, err := caplets.Load(filename)
if err != nil { if err != nil {
return err return err
} }
@ -382,7 +382,7 @@ func parseCapletCommand(line string) (is bool, caplet *caplets.Caplet, argv []st
argv = parts[1:] argv = parts[1:]
} }
if err, cap := caplets.Load(file); err == nil { if cap, err := caplets.Load(file); err == nil {
return true, cap, argv return true, cap, argv
} }