diff --git a/backend/utils/files/fileinfo.go b/backend/utils/files/fileinfo.go index 098ff4732..d33558bdb 100644 --- a/backend/utils/files/fileinfo.go +++ b/backend/utils/files/fileinfo.go @@ -9,7 +9,6 @@ import ( "path" "path/filepath" "strings" - "syscall" "time" "github.com/spf13/afero" @@ -74,8 +73,6 @@ func NewFileInfo(op FileOption) (*FileInfo, error) { Extension: filepath.Ext(info.Name()), IsHidden: IsHidden(op.Path), Mode: fmt.Sprintf("%04o", info.Mode().Perm()), - User: GetUsername(info.Sys().(*syscall.Stat_t).Uid), - Group: GetGroup(info.Sys().(*syscall.Stat_t).Gid), MimeType: GetMimeType(op.Path), } if file.IsSymlink { @@ -204,8 +201,6 @@ func (f *FileInfo) listChildren(dir, showHidden, containSub bool, search string, Extension: filepath.Ext(name), Path: fPath, Mode: fmt.Sprintf("%04o", df.Mode().Perm()), - User: GetUsername(df.Sys().(*syscall.Stat_t).Uid), - Group: GetGroup(df.Sys().(*syscall.Stat_t).Gid), MimeType: GetMimeType(fPath), } diff --git a/backend/utils/files/utils.go b/backend/utils/files/utils.go index 717c11457..92282b1ac 100644 --- a/backend/utils/files/utils.go +++ b/backend/utils/files/utils.go @@ -4,9 +4,7 @@ import ( "github.com/gabriel-vasile/mimetype" "github.com/spf13/afero" "os" - "os/user" "path/filepath" - "strconv" "sync" ) @@ -14,22 +12,6 @@ func IsSymlink(mode os.FileMode) bool { return mode&os.ModeSymlink != 0 } -func GetUsername(uid uint32) string { - usr, err := user.LookupId(strconv.Itoa(int(uid))) - if err != nil { - return "" - } - return usr.Username -} - -func GetGroup(gid uint32) string { - usr, err := user.LookupGroupId(strconv.Itoa(int(gid))) - if err != nil { - return "" - } - return usr.Name -} - func GetMimeType(path string) string { mime, err := mimetype.DetectFile(path) if err != nil { diff --git a/go.mod b/go.mod index 3542fe8b9..4ddcad067 100644 --- a/go.mod +++ b/go.mod @@ -49,8 +49,8 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - gorm.io/driver/sqlite v1.3.6 - gorm.io/gorm v1.23.8 + gorm.io/driver/sqlite v1.4.4 + gorm.io/gorm v1.24.0 ) require ( diff --git a/go.sum b/go.sum index b47dc9daa..8e0a1fc6d 100644 --- a/go.sum +++ b/go.sum @@ -676,7 +676,7 @@ github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vq github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -1438,12 +1438,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.3.3 h1:jXG9ANrwBc4+bMvBcSl8zCfPBaVoPyBEBshA8dA93X8= gorm.io/driver/postgres v1.3.7 h1:FKF6sIMDHDEvvMF/XJvbnCl0nu6KSKUaPXevJ4r+VYQ= -gorm.io/driver/sqlite v1.3.6 h1:Fi8xNYCUplOqWiPa3/GuCeowRNBRGTf62DEmhMDHeQQ= -gorm.io/driver/sqlite v1.3.6/go.mod h1:Sg1/pvnKtbQ7jLXxfZa+jSHvoX8hoZA8cn4xllOMTgE= +gorm.io/driver/sqlite v1.4.4 h1:gIufGoR0dQzjkyqDyYSCvsYR6fba1Gw5YKDqKeChxFc= +gorm.io/driver/sqlite v1.4.4/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI= gorm.io/driver/sqlserver v1.3.2 h1:yYt8f/xdAKLY7lCCyXxIUEgZ/WsURos3dHrx8MKFGAk= -gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= -gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE= -gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= +gorm.io/gorm v1.24.0 h1:j/CoiSm6xpRpmzbFJsQHYj+I8bGYWLXVHeYEyyKlF74= +gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=