IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

* migrate to idiomatic handling the Reader method of LocalFileBackend (#9959)

Browse Source 
* migrate to idiomatic handling the ReadFile method of LocalFileBackend

* migrate to idiomatic handling the ListDirectory method of LocalFileBackend

* gofmt done

* migrate to idiomatic handling the FileExists method of LocalFileBackend
This commit is contained in:
Mukul Rawat
2018-12-05 15:40:54 +05:30
committed by Jesús Espino
parent d3c55b8a02
commit 56937b0e8b
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/filesstore/localstore.go
View File

@@ -35,19 +35,19 @@ func (b *LocalFileBackend) TestConnection() *model.AppError {
}
func (b *LocalFileBackend) Reader(path string) (io.ReadCloser, *model.AppError) {
if f, err := os.Open(filepath.Join(b.directory, path)); err != nil {
f, err := os.Open(filepath.Join(b.directory, path))
if err != nil {
return nil, model.NewAppError("Reader", "api.file.reader.reading_local.app_error", nil, err.Error(), http.StatusInternalServerError)
} else {
return f, nil
}
return f, nil
}
func (b *LocalFileBackend) ReadFile(path string) ([]byte, *model.AppError) {
if f, err := ioutil.ReadFile(filepath.Join(b.directory, path)); err != nil {
f, err := ioutil.ReadFile(filepath.Join(b.directory, path))
if err != nil {
return nil, model.NewAppError("ReadFile", "api.file.read_file.reading_local.app_error", nil, err.Error(), http.StatusInternalServerError)
} else {
return f, nil
}
return f, nil
}
func (b *LocalFileBackend) FileExists(path string) (bool, *model.AppError) {
@@ -55,11 +55,12 @@ func (b *LocalFileBackend) FileExists(path string) (bool, *model.AppError) {
if os.IsNotExist(err) {
return false, nil
} else if err == nil {
return true, nil
}
return false, model.NewAppError("ReadFile", "api.file.file_exists.exists_local.app_error", nil, err.Error(), http.StatusInternalServerError)
if err != nil {
return false, model.NewAppError("ReadFile", "api.file.file_exists.exists_local.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return true, nil
}
func (b *LocalFileBackend) CopyFile(oldPath, newPath string) *model.AppError {
@@ -111,13 +112,13 @@ func (b *LocalFileBackend) RemoveFile(path string) *model.AppError {
func (b *LocalFileBackend) ListDirectory(path string) (*[]string, *model.AppError) {
var paths []string
if fileInfos, err := ioutil.ReadDir(filepath.Join(b.directory, path)); err != nil {
fileInfos, err := ioutil.ReadDir(filepath.Join(b.directory, path))
if err != nil {
return nil, model.NewAppError("ListDirectory", "utils.file.list_directory.local.app_error", nil, err.Error(), http.StatusInternalServerError)
} else {
for _, fileInfo := range fileInfos {
if fileInfo.IsDir() {
paths = append(paths, filepath.Join(path, fileInfo.Name()))
}
}
for _, fileInfo := range fileInfos {
if fileInfo.IsDir() {
paths = append(paths, filepath.Join(path, fileInfo.Name()))
}
}
return &paths, nil