sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errors alias name

Browse Source
This commit is contained in:
Ilja Neumann
2020-10-14 18:03:52 +02:00
parent 1c3e47c018
commit 683138fb6e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accounts/pkg/indexer/index/unique.go
+6 -6
View File
@@ -3,7 +3,7 @@ package index
import ( import (
"errors" "errors"
"fmt" "fmt"
errors2 "github.com/owncloud/ocis/accounts/pkg/indexer/errors" idxerrs "github.com/owncloud/ocis/accounts/pkg/indexer/errors"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
@@ -67,7 +67,7 @@ func (idx Unique) Add(id, v string) (string, error) {
newName := path.Join(idx.indexRootDir, v) newName := path.Join(idx.indexRootDir, v)
err := os.Symlink(oldName, newName) err := os.Symlink(oldName, newName)
if errors.Is(err, os.ErrExist) { if errors.Is(err, os.ErrExist) {
return "", &errors2.AlreadyExistsErr{idx.typeName, idx.indexBy, v} return "", &idxerrs.AlreadyExistsErr{idx.typeName, idx.indexBy, v}
} }
return newName, err return newName, err
@@ -88,7 +88,7 @@ func (idx Unique) Lookup(v string) (resultPath []string, err error) {
searchPath := path.Join(idx.indexRootDir, v) searchPath := path.Join(idx.indexRootDir, v)
if err = isValidSymlink(searchPath); err != nil { if err = isValidSymlink(searchPath); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
err = &errors2.NotFoundErr{idx.typeName, idx.indexBy, v} err = &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, v}
} }
return return
@@ -107,7 +107,7 @@ func (idx Unique) Update(id, oldV, newV string) (err error) {
oldPath := path.Join(idx.indexRootDir, oldV) oldPath := path.Join(idx.indexRootDir, oldV)
if err = isValidSymlink(oldPath); err != nil { if err = isValidSymlink(oldPath); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return &errors2.NotFoundErr{idx.TypeName(), idx.IndexBy(), oldV} return &idxerrs.NotFoundErr{idx.TypeName(), idx.IndexBy(), oldV}
} }
return return
@@ -115,7 +115,7 @@ func (idx Unique) Update(id, oldV, newV string) (err error) {
newPath := path.Join(idx.indexRootDir, newV) newPath := path.Join(idx.indexRootDir, newV)
if err = isValidSymlink(newPath); err == nil { if err = isValidSymlink(newPath); err == nil {
return &errors2.AlreadyExistsErr{idx.typeName, idx.indexBy, newV} return &idxerrs.AlreadyExistsErr{idx.typeName, idx.indexBy, newV}
} }
if os.IsNotExist(err) { if os.IsNotExist(err) {
@@ -132,7 +132,7 @@ func (idx Unique) Search(pattern string) ([]string, error) {
} }
if len(paths) == 0 { if len(paths) == 0 {
return nil, &errors2.NotFoundErr{idx.typeName, idx.indexBy, pattern} return nil, &idxerrs.NotFoundErr{idx.typeName, idx.indexBy, pattern}
} }
res := make([]string, 0, 0) res := make([]string, 0, 0)