diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-10-14 21:07:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 21:07:51 +0800 |
| commit | 80a6b0f5bce15a641fc75f5f1ef6e42ef54424bc (patch) | |
| tree | 504c7ccdc9cb42e0e282abdd8dbb75c4b24e9f5b /models/migrations/v115.go | |
| parent | 93f7525061bc9e6f5be734aba0de31b64c63d7a8 (diff) | |
| download | gitea-80a6b0f5bce15a641fc75f5f1ef6e42ef54424bc.tar.gz gitea-80a6b0f5bce15a641fc75f5f1ef6e42ef54424bc.zip | |
Avatars and Repo avatars support storing in minio (#12516)
* Avatar support minio
* Support repo avatar minio storage
* Add missing migration
* Fix bug
* Fix test
* Add test for minio store type on avatars and repo avatars; Add documents
* Fix bug
* Fix bug
* Add back missed avatar link method
* refactor codes
* Simplify the codes
* Code improvements
* Fix lint
* Fix test mysql
* Fix test mysql
* Fix test mysql
* Fix settings
* Fix test
* fix test
* Fix bug
Diffstat (limited to 'models/migrations/v115.go')
| -rw-r--r-- | models/migrations/v115.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/migrations/v115.go b/models/migrations/v115.go index fe3b086119..fcec1f5495 100644 --- a/models/migrations/v115.go +++ b/models/migrations/v115.go @@ -61,7 +61,7 @@ func renameExistingUserAvatarName(x *xorm.Engine) error { for _, user := range users { oldAvatar := user.Avatar - if stat, err := os.Stat(filepath.Join(setting.AvatarUploadPath, oldAvatar)); err != nil || !stat.Mode().IsRegular() { + if stat, err := os.Stat(filepath.Join(setting.Avatar.Path, oldAvatar)); err != nil || !stat.Mode().IsRegular() { if err == nil { err = fmt.Errorf("Error: \"%s\" is not a regular file", oldAvatar) } @@ -86,7 +86,7 @@ func renameExistingUserAvatarName(x *xorm.Engine) error { return fmt.Errorf("[user: %s] user table update: %v", user.LowerName, err) } - deleteList[filepath.Join(setting.AvatarUploadPath, oldAvatar)] = struct{}{} + deleteList[filepath.Join(setting.Avatar.Path, oldAvatar)] = struct{}{} migrated++ select { case <-ticker.C: @@ -135,7 +135,7 @@ func renameExistingUserAvatarName(x *xorm.Engine) error { // copyOldAvatarToNewLocation copies oldAvatar to newAvatarLocation // and returns newAvatar location func copyOldAvatarToNewLocation(userID int64, oldAvatar string) (string, error) { - fr, err := os.Open(filepath.Join(setting.AvatarUploadPath, oldAvatar)) + fr, err := os.Open(filepath.Join(setting.Avatar.Path, oldAvatar)) if err != nil { return "", fmt.Errorf("os.Open: %v", err) } @@ -151,7 +151,7 @@ func copyOldAvatarToNewLocation(userID int64, oldAvatar string) (string, error) return newAvatar, nil } - if err := ioutil.WriteFile(filepath.Join(setting.AvatarUploadPath, newAvatar), data, 0666); err != nil { + if err := ioutil.WriteFile(filepath.Join(setting.Avatar.Path, newAvatar), data, 0666); err != nil { return "", fmt.Errorf("ioutil.WriteFile: %v", err) } |